fix: revert #6928 (#7089)

.env

@@ -4,6 +4,8 @@ REACT_APP_AMPLITUDE_PROXY_URL="https://api.uniswap.org/v1/amplitude-proxy"
 REACT_APP_AWS_API_REGION="us-east-2"
 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_BASE_GOERLI_RPC_URL="https://wiser-compatible-mansion.base-goerli.quiknode.pro/5874f36248e17020a1006149e7f68c63967e1f45/"
+REACT_APP_BASE_MAINNET_RPC_URL="https://cool-white-diagram.base-mainnet.quiknode.pro/d8f036f35dfab2c68f32dfa822cd971e7a25a117/"
 REACT_APP_INFURA_KEY="4bf032f2d38a4ed6bb975b80d6340847"
 REACT_APP_MOONPAY_API="https://api.moonpay.com"
 REACT_APP_MOONPAY_LINK="https://us-central1-uniswap-mobile.cloudfunctions.net/signMoonpayLinkV2?platform=web&env=staging"

.env.production

@@ -12,4 +12,4 @@ REACT_APP_MOONPAY_PUBLISHABLE_KEY="pk_live_uQG4BJC4w3cxnqpcSqAfohdBFDTsY6E"
 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"
-THE_GRAPH_SCHEMA_ENDPOINT="https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3?source=uniswap"
+THE_GRAPH_SCHEMA_ENDPOINT="https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3"

.eslintrc.js

@@ -1,6 +1,5 @@
 /* eslint-env node */
 
-const { node: restrictedImports } = require('@uniswap/eslint-config/restrictedImports')
 require('@uniswap/eslint-config/load')
 
 const rulesDirPlugin = require('eslint-plugin-rulesdir')
@@ -28,20 +27,6 @@ module.exports = {
     {
       files: ['**/*.ts', '**/*.tsx'],
       rules: {
-        '@typescript-eslint/no-restricted-imports': [
-          'error',
-          {
-            ...restrictedImports,
-            paths: [
-              ...restrictedImports.paths,
-              {
-                name: '@uniswap/smart-order-router',
-                message: 'Only import types, unless you are in the client-side SOR, to preserve lazy-loading.',
-                allowTypeImports: true,
-              },
-            ],
-          },
-        ],
         'import/no-restricted-paths': [
           'error',
           {
@@ -70,13 +55,6 @@ module.exports = {
             ],
           },
         ],
-        'no-restricted-syntax': [
-          'error',
-          {
-            selector: ':matches(ExportAllDeclaration)',
-            message: 'Barrel exports bloat the bundle size by preventing tree-shaking.',
-          },
-        ],
       },
     },
     {

.github/CODEOWNERS

@@ -1 +1 @@
-* @uniswap/web-reviewers
+@uniswap/web-admins

.github/actions/cache-on-main/action.yml

@@ -0,0 +1,32 @@
+name: Cache on main
+description: caches node_modules/.cache, but only saves from main
+inputs:
+  path:
+    description: 'A list of files, directories, and wildcard patterns to cache and store'
+    required: true
+  key:
+    description: 'An explicit key for restoring and saving the cache'
+    required: true
+  restore-keys:
+    description: 'An ordered list of keys to use for restoring stale cache if no cache hit occured for key. Note `cache-hit` returns false in this case.'
+    required: false
+
+# Many build steps have their own caches to improve subsequent build times.
+# Build tools are configured to cache to node_modules/.cache, so they are cached independently of node_modules.
+# Caches are saved every run *on main* (by keying on github.run_id), and the most recent available cache is loaded.
+# Caches are not saved on feature branches because they have limited utility, and extend the runtime of the workflow.
+# See https://jongleberry.medium.com/speed-up-your-ci-and-dx-with-node-modules-cache-ac8df82b7bb0.
+
+runs:
+  using: composite
+  steps:
+    - uses: actions/cache/restore@v3
+      with:
+        path: ${{ inputs.path }}
+        key: ${{ inputs.key }}
+        restore-keys: ${{ inputs.restore-keys }}
+    - if: github.ref_name == 'main'
+      uses: actions/cache/save@v3
+      with:
+        path: ${{ inputs.path }}
+        key: ${{ inputs.key }}

.github/actions/setup/action.yml

@@ -23,9 +23,9 @@ runs:
     - if: steps.install-cache.outputs.cache-hit != 'true'
       run: yarn install --frozen-lockfile --ignore-scripts
       shell: bash
-    
-    # Run patch-package to apply patches to dependencies.
-    - run: yarn patch-package
+
+    # Validators compile quickly, so caching can be omitted.
+    - run: yarn ajv
       shell: bash
 
     # Contracts are compiled from source. If source hasn't changed, the contracts do not need to be re-compiled.
@@ -40,10 +40,30 @@ runs:
       run: yarn contracts
       shell: bash
 
-    # These operations cannot be cached, so they are run concurrently
-    # - ajv: Validators compile quickly, so caching can be omitted.
-    # - graphql: GraphQL is generated from schema and client-side graphql queries. The schema is always fetched and
-    #   changes to client-side queries are hard to detect, so it is always re-generated.
-    # - i18n: Messages are extracted from source and compiled. No caching extractor is available (out-of-the-box).
-    - run: yarn concurrently --max-processes=100% npm:ajv npm:graphql npm:i18n
+    # GraphQL is generated from schema and client-side graphql queries. The schema is always fetched and changes to
+    # client-side queries are hard to detect, so it is always re-generated.
+    # TODO(WEB-2498): Cache based on both fetched schema and client-side graphql queries.
+    # This will require some processing: cp all literal graphql tags into a separate file and hash it?
+    - run: yarn graphql
+      shell: bash
+
+    # Messages are extracted from source.
+    # A record of source file content hashes and catalogs is maintained in node_modules/.cache/lingui.
+    # Messages are always extracted, but extraction may short-circuit from the custom extractor's cache.
+    - uses: ./.github/actions/cache-on-main
+      with:
+        path: node_modules/.cache
+        key: ${{ runner.os }}-i18n-extract-${{ github.run_id }}
+        restore-keys: ${{ runner.os }}-i18n-extract-
+    - run: yarn i18n:extract
+      shell: bash
+
+    # Translations are compiled from messages. If messages haven't changed, the translations do not need to be re-compiled.
+    - uses: actions/cache@v3
+      id: i18n-compile-cache
+      with:
+        path: src/locales/*.js
+        key: ${{ runner.os }}-i18n-compile-${{ hashFiles('src/locales/*.po') }}
+    - if: steps.i18n-compile-cache.outputs.cache-hit !='true'
+      run: yarn i18n:compile
       shell: bash

.github/workflows/1-main-to-staging.yml

@@ -64,7 +64,7 @@ jobs:
 
       - name: Add CODEOWNERS
         run: |
-          echo '* @uniswap/web-admins' > CODEOWNERS
+          echo '@uniswap/web-admins' > CODEOWNERS
           git add CODEOWNERS
           git commit -m 'ci: add global CODEOWNERS'
 

.github/workflows/test.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup
-      - uses: actions/cache@v3
+      - uses: ./.github/actions/cache-on-main
         with:
           path: node_modules/.cache
           key: ${{ runner.os }}-eslint-${{ github.run_id }}
@@ -35,7 +35,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup
-      - uses: actions/cache@v3
+      - uses: ./.github/actions/cache-on-main
         with:
           path: node_modules/.cache
           key: ${{ runner.os }}-tsc-${{ github.run_id }}
@@ -64,7 +64,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup
-      - uses: actions/cache@v3
+      - uses: ./.github/actions/cache-on-main
         with:
           path: node_modules/.cache
           key: ${{ runner.os }}-jest-${{ github.run_id }}
@@ -81,20 +81,22 @@ jobs:
           name: Unit tests
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_TEST_REPORTER_WEBHOOK }}
 
-  build:
+  build-e2e:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup
-      - uses: actions/cache@v3
+      - uses: ./.github/actions/cache-on-main
         with:
-          path: node_modules/.swc
-          key: ${{ runner.os }}-swc-${{ github.run_id }}
-          restore-keys: ${{ runner.os }}-swc-
-      - run: yarn build
+          path: node_modules/.cache
+          key: ${{ runner.os }}-build-e2e-${{ github.run_id }}
+          restore-keys: ${{ runner.os }}-build-e2e-
+      - run: yarn build:e2e
+        env:
+          NODE_OPTIONS: "--max_old_space_size=4096"
       - uses: actions/upload-artifact@v3
         with:
-          name: build
+          name: build-e2e
           path: build
           if-no-files-found: error
 
@@ -103,7 +105,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup
-      - uses: actions/cache@v3
+      - uses: ./.github/actions/cache-on-main
         with:
           path: node_modules/.cache
           key: ${{ runner.os }}-cypress-tsc-${{ github.run_id }}
@@ -122,7 +124,7 @@ jobs:
       - run: exit 0
 
   cypress-test-matrix:
-    needs: [build, cypress-rerun]
+    needs: [build-e2e, cypress-rerun]
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -131,7 +133,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup
-      - uses: actions/cache@v3
+      - uses: ./.github/actions/cache-on-main
         with:
           path: /root/.cache/Cypress
           key: ${{ runner.os }}-cypress-${{ hashFiles('**/node_modules/cypress/package.json') }}
@@ -141,10 +143,10 @@ jobs:
 
       - uses: actions/download-artifact@v3
         with:
-          name: build
+          name: build-e2e
           path: build
 
-      - uses: actions/cache/restore@v3
+      - uses: ./.github/actions/cache-on-main
         with:
           path: cache
           key: ${{ runner.os }}-hardhat-${{ hashFiles('hardhat.config.js') }}-${{ github.run_id }}
@@ -173,36 +175,23 @@ jobs:
           COMMIT_INFO_TIMESTAMP: ${{ github.event.pull_request.updated_at || github.event.head_commit.timestamp }}
           CYPRESS_PULL_REQUEST_ID: ${{ github.event.pull_request.number }}
           CYPRESS_PULL_REQUEST_URL: ${{ github.event.pull_request.html_url }}
+      - uses: codecov/codecov-action@v3
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          fail_ci_if_error: false
+          flags: e2e-tests
       - if: failure() && github.ref_name == 'main'
         uses: ./.github/actions/report
         with:
           name: Cypress tests
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_TEST_REPORTER_WEBHOOK }}
 
-      - uses: actions/upload-artifact@v3
-        with:
-          name: hardhat-cache
-          path: cache
-
-  hardhat-cache:
-    needs: [cypress-test-matrix]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/download-artifact@v3
-        with:
-          name: hardhat-cache
-          path: cache
-      - uses: actions/cache/save@v3
-        with:
-          path: cache
-          key: ${{ runner.os }}-hardhat-${{ hashFiles('hardhat.config.js') }}-${{ github.run_id }}
-
   cloud-typecheck:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup
-      - uses: actions/cache@v3
+      - uses: ./.github/actions/cache-on-main
         with:
           path: node_modules/.cache
           key: ${{ runner.os }}-cloud-tsc-${{ github.run_id }}
@@ -214,24 +203,23 @@ jobs:
           name: Cloud typecheck
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_TEST_REPORTER_WEBHOOK }}
 
+  # TODO(WEB-2537): Setup CodeCOV
   cloud-tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: ./.github/actions/setup
-      - uses: actions/cache@v3
+      - uses: ./.github/actions/cache-on-main
         with:
           path: node_modules/.cache
           key: ${{ runner.os }}-cloud-jest-${{ github.run_id }}
           restore-keys: ${{ runner.os }}-cloud-jest-
-      # Ignore start:cloud output so it doesn't flood the test output.
-      # Only use 1 worker for testing, as the other is used to run start:cloud (the proxy server under test).
-      - run: yarn start-server-and-test 'yarn start:cloud >/dev/null' 3000 'yarn test:cloud --coverage --maxWorkers=1'
-      - uses: codecov/codecov-action@v3
+      - run: yarn test:cloud --coverage --maxWorkers=100%
+      - if: failure() && github.ref_name == 'main'
+        uses: ./.github/actions/report
         with:
-          token: ${{ secrets.CODECOV_TOKEN }}
-          fail_ci_if_error: false
-          flags: cloud-tests
+          name: Cloud tests
+          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_TEST_REPORTER_WEBHOOK }}
         
   pre:
     if: ${{ github.ref_name == 'main' || github.ref_name == 'releases/staging' }}
@@ -252,7 +240,7 @@ jobs:
 
   post:
     if: ${{ github.ref_name == 'main' || github.ref_name == 'releases/staging' }}
-    needs: [pre, lint, typecheck, deps-tests, unit-tests, cypress-test-matrix, cloud-tests]
+    needs: [pre, lint, typecheck, deps-tests, unit-tests, cypress-test-matrix]
     runs-on: ubuntu-latest
     steps:
       - uses: actions/github-script@v6.4.1
@@ -273,5 +261,4 @@ jobs:
             ${{ needs.typecheck.result == 'success' }} &&
             ${{ needs.deps-tests.result == 'success' }} &&
             ${{ needs.unit-tests.result == 'success' }} &&
-            ${{ needs.cypress-test-matrix.result == 'success' }} &&
-            ${{ needs.cloud-tests.result == 'success' }}
+            ${{ needs.cypress-test-matrix.result == 'success' }}

.gitignore

@@ -20,7 +20,6 @@ schema.graphql
 /coverage
 /cache
 /functions/coverage
-/.swc
 
 # builds
 /build
@@ -53,5 +52,3 @@ cypress/videos
 cypress/screenshots
 
 .vercel
-
-.wrangler

.husky/pre-commit

@@ -1,4 +0,0 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
-npx lint-staged

.swcrc

@@ -1,36 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/swcrc",
-  // has to duplicate from package.json, see swc issue: https://swc.rs/docs/configuration/compilation#env
-  // this breaks jest because jest is setting target for some reason
-  // "env": {
-  //   "targets": "> 0.5%, not dead"
-  // },
-  "jsc": {
-    // without this swc breaks WalletConnect class super() call
-    "target": "es2020",
-    "keepClassNames": true,
-    "experimental": {
-      "plugins": [
-        [
-          "@lingui/swc-plugin",
-          {}
-        ],
-        [
-          "@swc/plugin-styled-components",
-          {
-            "displayName": true
-          }
-        ]
-      ]
-    },
-    "parser": {
-      "syntax": "typescript",
-      "tsx": true
-    },
-    "transform": {
-      "react": {
-        "runtime": "automatic"
-      }
-    }
-  }
-}

CODEOWNERS

@@ -1 +1 @@
-* @uniswap/web-admins
+@uniswap/web-admins

README.md

@@ -69,10 +69,10 @@ Other things to note:
 
 The Uniswap Interface supports swapping, adding liquidity, removing liquidity and migrating liquidity for Uniswap protocol V2.
 
-- Swap on Uniswap V2: <https://app.uniswap.org/swap?use=v2>
-- View V2 liquidity: <https://app.uniswap.org/pools/v2>
-- Add V2 liquidity: <https://app.uniswap.org/add/v2>
-- Migrate V2 liquidity to V3: <https://app.uniswap.org/migrate/v2>
+- Swap on Uniswap V2: <https://app.uniswap.org/#/swap?use=v2>
+- View V2 liquidity: <https://app.uniswap.org/#/pools/v2>
+- Add V2 liquidity: <https://app.uniswap.org/#/add/v2>
+- Migrate V2 liquidity to V3: <https://app.uniswap.org/#/migrate/v2>
 
 ## Accessing Uniswap V1
 

babel-plugin-macros.config.js

@@ -0,0 +1,10 @@
+/* eslint-env node */
+
+const isDev = process.env.NODE_ENV === 'development'
+
+module.exports = {
+  styledComponents: {
+    fileName: isDev,
+    displayName: isDev,
+  },
+}

codecov.yml

@@ -6,12 +6,12 @@ ignore:
   - "**/instrumented/**/*"
   - "**/styles/**/*"
   - "styles/**/*"
-  - "**/styled.tsx"
   - "**/constants/**/*"
   - "constants/**/*"
 
 coverage:
   status:
+    # Omit merging unit/e2e reports into the defaults, as it is nonsensical.
     project: off
     patch: off
 
@@ -25,16 +25,20 @@ flag_management:
         removed_code_behavior: adjust_base
         if_ci_failed: error
       - type: patch
-        target: 50%
+        target: 80%
   individual_flags:
     - name: unit-tests
-    - name: cloud-tests
+    - name: e2e-tests
+      # Wait until all machines have reported coverage - e2e tests run across 4 machines.
+      after_n_builds: 4
       statuses:
-        - type: project
-          target: 80%
+        - type: patch
+          target: 0%
 
 comment:
   layout: flags
+  # Wait until all machines have reported coverage - e2e tests run across 4 machines + unit tests across 1.
+  after_n_builds: 5
   hide_comment_details: false
 
 github_checks:

codegen.yml

@@ -1,5 +1,5 @@
 overrideExisting: true
-schema: 'https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3?source=uniswap'
+schema: 'https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3'
 generates:
   ./src/graphql/thegraph/schema/schema.graphql:
     plugins:

craco.config.cjs

@@ -5,14 +5,12 @@ const { execSync } = require('child_process')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const path = require('path')
 const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin')
-const { IgnorePlugin, ProvidePlugin } = require('webpack')
+const { DefinePlugin, IgnorePlugin, ProvidePlugin } = require('webpack')
 const { RetryChunkLoadPlugin } = require('webpack-retry-chunk-load-plugin')
 
 const commitHash = execSync('git rev-parse HEAD').toString().trim()
 const isProduction = process.env.NODE_ENV === 'production'
 
-process.env.REACT_APP_GIT_COMMIT_HASH = commitHash
-
 // Linting and type checking are only necessary as part of development and testing.
 // Omit them from production builds, as they slow down the feedback loop.
 const shouldLintOrTypeCheck = !isProduction
@@ -23,6 +21,32 @@ function getCacheDirectory(cacheName) {
 }
 
 module.exports = {
+  babel: {
+    plugins: [
+      '@vanilla-extract/babel-plugin',
+      ...(process.env.REACT_APP_ADD_COVERAGE_INSTRUMENTATION
+        ? [
+            [
+              'istanbul',
+              {
+                all: true,
+                include: ['src/**/*.tsx', 'src/**/*.ts'],
+                exclude: [
+                  'src/**/*.css',
+                  'src/**/*.css.ts',
+                  'src/**/*.test.ts',
+                  'src/**/*.test.tsx',
+                  'src/**/*.spec.ts',
+                  'src/**/*.spec.tsx',
+                  'src/**/graphql/**/*',
+                  'src/**/*.d.ts',
+                ],
+              },
+            ],
+          ]
+        : []),
+    ],
+  },
   eslint: {
     enable: shouldLintOrTypeCheck,
     pluginOptions(eslintConfig) {
@@ -45,20 +69,16 @@ module.exports = {
     configure(jestConfig) {
       return Object.assign(jestConfig, {
         cacheDirectory: getCacheDirectory('jest'),
-        transform: {
-          ...Object.entries(jestConfig.transform).reduce((transform, [key, value]) => {
-            if (value.match(/babel/)) return transform
-            return { ...transform, [key]: value }
-          }, {}),
+        transform: Object.assign(jestConfig.transform, {
           // Transform vanilla-extract using its own transformer.
           // See https://sandroroth.com/blog/vanilla-extract-cra#jest-transform.
           '\\.css\\.ts$': '@vanilla-extract/jest-transform',
-          '\\.(t|j)sx?$': '@swc/jest',
-        },
-        // Use d3-arrays's build directly, as jest does not support its exports.
-        transformIgnorePatterns: ['d3-array'],
+        }),
+        // Use @uniswap/conedison's build directly, as jest does not support its exports.
+        transformIgnorePatterns: ['@uniswap/conedison/format', '@uniswap/conedison/provider'],
         moduleNameMapper: {
-          'd3-array': 'd3-array/dist/d3-array.min.js',
+          '@uniswap/conedison/format': '@uniswap/conedison/dist/format',
+          '@uniswap/conedison/provider': '@uniswap/conedison/dist/provider',
         },
       })
     },
@@ -68,9 +88,12 @@ module.exports = {
       // Webpack 5 does not polyfill node globals, so we do so for those necessary:
       new ProvidePlugin({
         // - react-markdown requires process.cwd
-        process: 'process/browser.js',
+        process: 'process/browser',
       }),
-      new VanillaExtractPlugin(),
+      // vanilla-extract has poor performance on M1 machines with 'debug' identifiers, so we use 'short' instead.
+      // See https://vanilla-extract.style/documentation/integrations/webpack/#identifiers for docs.
+      // See https://github.com/vanilla-extract-css/vanilla-extract/issues/771#issuecomment-1249524366.
+      new VanillaExtractPlugin({ identifiers: 'short' }),
       new RetryChunkLoadPlugin({
         cacheBust: `function() {
           return 'cache-bust=' + Date.now();
@@ -86,6 +109,14 @@ module.exports = {
       // Configure webpack plugins:
       webpackConfig.plugins = webpackConfig.plugins
         .map((plugin) => {
+          // Extend process.env with dynamic values (eg commit hash).
+          // This will make dynamic values available to JavaScript only, not to interpolated HTML (ie index.html).
+          if (plugin instanceof DefinePlugin) {
+            Object.assign(plugin.definitions['process.env'], {
+              REACT_APP_GIT_COMMIT_HASH: JSON.stringify(commitHash),
+            })
+          }
+
           // CSS ordering is mitigated through scoping / naming conventions, so we can ignore order warnings.
           // See https://webpack.js.org/plugins/mini-css-extract-plugin/#remove-order-warnings.
           if (plugin instanceof MiniCssExtractPlugin) {
@@ -130,32 +161,19 @@ module.exports = {
         },
       })
 
-      // Retain source maps for node_modules packages:
-      webpackConfig.module.rules[0] = {
-        ...webpackConfig.module.rules[0],
-        exclude: /node_modules/,
-      }
-
       // Configure webpack transpilation (create-react-app specifies transpilation rules in a oneOf):
       webpackConfig.module.rules[1].oneOf = webpackConfig.module.rules[1].oneOf.map((rule) => {
-        if (rule.loader && rule.loader.match(/babel-loader/)) {
-          rule.loader = 'swc-loader'
-          delete rule.options
+        // The fallback rule (eg for dependencies).
+        if (rule.loader && rule.loader.match(/babel-loader/) && !rule.include) {
+          // Allow not-fully-specified modules so that legacy packages are still able to build.
+          rule.resolve = { fullySpecified: false }
+
+          // The class properties transform is required for @uniswap/analytics to build.
+          rule.options.plugins.push('@babel/plugin-proposal-class-properties')
         }
         return rule
       })
 
-      // Run terser compression on node_modules before tree-shaking, so that tree-shaking is more effective.
-      // This works by eliminating dead code, so that webpack can identify unused imports and tree-shake them;
-      // it is only necessary for node_modules - it is done through linting for our own source code -
-      // see https://medium.com/engineering-housing/dead-code-elimination-and-tree-shaking-at-housing-part-1-307a94b30f23#7e03:
-      webpackConfig.module.rules.push({
-        enforce: 'post',
-        test: /node_modules.*\.(js)$/,
-        loader: path.join(__dirname, 'scripts/terser-loader.js'),
-        options: { compress: true, mangle: false },
-      })
-
       // Configure webpack optimization:
       webpackConfig.optimization = Object.assign(
         webpackConfig.optimization,
@@ -174,8 +192,16 @@ module.exports = {
           : {}
       )
 
-      // Configure webpack resolution. webpackConfig.cache is unused with swc-loader, but the resolver can still cache:
-      webpackConfig.resolve = Object.assign(webpackConfig.resolve, { unsafeCache: true })
+      // Configure webpack caching:
+      webpackConfig.cache = Object.assign(webpackConfig.cache, {
+        cacheDirectory: getCacheDirectory('webpack'),
+      })
+
+      // Ignore failed source mappings to avoid spamming the console.
+      // Source mappings for a package will fail if the package does not provide them, but the build will still succeed,
+      // so it is unnecessary (and bothersome) to log it. This should be turned off when debugging missing sourcemaps.
+      // See https://webpack.js.org/loaders/source-map-loader#ignoring-warnings.
+      webpackConfig.ignoreWarnings = [/Failed to parse source map/]
 
       return webpackConfig
     },

cypress.config.ts

@@ -1,3 +1,4 @@
+import codeCoverageTask from '@cypress/code-coverage/task'
 import { defineConfig } from 'cypress'
 import { setupHardhatEvents } from 'cypress-hardhat'
 
@@ -6,11 +7,12 @@ export default defineConfig({
   defaultCommandTimeout: 24000, // 2x average block time
   chromeWebSecurity: false,
   experimentalMemoryManagement: true, // better memory management, see https://github.com/cypress-io/cypress/pull/25462
-  retries: { runMode: process.env.CYPRESS_RETRIES ? +process.env.CYPRESS_RETRIES : 2 },
+  retries: { runMode: 2 },
   video: false, // GH provides 2 CPUs, and cypress video eats one up, see https://github.com/cypress-io/cypress/issues/20468#issuecomment-1307608025
   e2e: {
     async setupNodeEvents(on, config) {
       await setupHardhatEvents(on, config)
+      codeCoverageTask(on, config)
       return config
     },
     baseUrl: 'http://localhost:3000',

cypress/e2e/add-liquidity.test.ts

@@ -4,7 +4,7 @@ import { aliasQuery, hasQuery } from '../utils/graphql-test-utils'
 
 describe('Add Liquidity', () => {
   beforeEach(() => {
-    cy.intercept('POST', '/subgraphs/name/uniswap/uniswap-v3?source=uniswap', (req) => {
+    cy.intercept('POST', '/subgraphs/name/uniswap/uniswap-v3', (req) => {
       aliasQuery(req, 'feeTierDistribution')
     })
   })
@@ -29,26 +29,22 @@ describe('Add Liquidity', () => {
 
   it('loads fee tier distribution', () => {
     cy.fixture('feeTierDistribution.json').then((feeTierDistribution) => {
-      cy.intercept(
-        'POST',
-        '/subgraphs/name/uniswap/uniswap-v3?source=uniswap',
-        (req: CyHttpMessages.IncomingHttpRequest) => {
-          if (hasQuery(req, 'FeeTierDistribution')) {
-            req.alias = 'FeeTierDistribution'
+      cy.intercept('POST', '/subgraphs/name/uniswap/uniswap-v3', (req: CyHttpMessages.IncomingHttpRequest) => {
+        if (hasQuery(req, 'FeeTierDistribution')) {
+          req.alias = 'FeeTierDistribution'
 
-            req.reply({
-              body: {
-                data: {
-                  ...feeTierDistribution,
-                },
+          req.reply({
+            body: {
+              data: {
+                ...feeTierDistribution,
               },
-              headers: {
-                'access-control-allow-origin': '*',
-              },
-            })
-          }
+            },
+            headers: {
+              'access-control-allow-origin': '*',
+            },
+          })
         }
-      )
+      })
 
       cy.visit('/add/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984/ETH')
       cy.wait('@FeeTierDistribution')

cypress/e2e/buy-crypto-modal.test.ts

@@ -1,8 +1,9 @@
+import { FeatureFlag } from '../../src/featureFlags'
 import { getTestSelector } from '../utils'
 
 describe('Buy Crypto Modal', () => {
   it('should open and close', () => {
-    cy.visit('/')
+    cy.visit('/', { featureFlags: [FeatureFlag.fiatOnRampButtonOnSwap] })
 
     // Open the fiat onramp modal
     cy.get(getTestSelector('buy-fiat-button')).click()
@@ -15,7 +16,7 @@ describe('Buy Crypto Modal', () => {
 
   it('should open and close, mobile viewport', () => {
     cy.viewport('iphone-6')
-    cy.visit('/')
+    cy.visit('/', { featureFlags: [FeatureFlag.fiatOnRampButtonOnSwap] })
 
     // Open the fiat onramp modal
     cy.get(getTestSelector('buy-fiat-button')).click()

cypress/e2e/mini-portfolio/accounts.test.ts

@@ -2,48 +2,30 @@ import { getTestSelector } from '../../utils'
 
 describe('Mini Portfolio account drawer', () => {
   beforeEach(() => {
-    const portfolioSpy = cy.spy().as('portfolioSpy')
-    cy.intercept(/api.uniswap.org\/v1\/graphql/, (req) => {
-      if (req.body.operationName === 'PortfolioBalances') {
-        portfolioSpy(req)
-      }
-    })
+    cy.intercept(/api.uniswap.org\/v1\/graphql/, cy.spy().as('gqlSpy'))
     cy.visit('/swap')
   })
 
   it('fetches balances when account button is first hovered', () => {
     // The balances should not be fetched before the account button is hovered
-    cy.get('@portfolioSpy').should('not.have.been.called')
+    cy.get('@gqlSpy').should('not.have.been.called')
 
     // Balances should have been fetched once after hover
     cy.get(getTestSelector('web3-status-connected')).trigger('mouseover')
-    cy.get('@portfolioSpy').should('have.been.calledOnce')
-  })
-
-  it('should not re-fetch balances on second hover', () => {
-    // The balances should not be fetched before the account button is hovered
-    cy.get('@portfolioSpy').should('not.have.been.called')
-
-    // Balances should have been fetched once after hover
-    cy.get(getTestSelector('web3-status-connected')).trigger('mouseover')
-    cy.get('@portfolioSpy').should('have.been.calledOnce')
+    cy.get('@gqlSpy').should('have.been.calledOnce')
 
     // Balances should not be refetched upon second hover
     cy.get(getTestSelector('web3-status-connected')).trigger('mouseover')
-    cy.get('@portfolioSpy').should('have.been.calledOnce')
-  })
-
-  it('should not re-fetch balances when the account drawer is opened', () => {
-    // The balances should not be fetched before the account button is hovered
-    cy.get('@portfolioSpy').should('not.have.been.called')
-
-    // Balances should have been fetched once after hover
-    cy.get(getTestSelector('web3-status-connected')).trigger('mouseover')
-    cy.get('@portfolioSpy').should('have.been.calledOnce')
+    cy.get('@gqlSpy').should('have.been.calledOnce')
 
     // Balances should not be refetched upon opening drawer
     cy.get(getTestSelector('web3-status-connected')).click()
-    cy.get('@portfolioSpy').should('have.been.calledOnce')
+    cy.get('@gqlSpy').should('have.been.calledOnce')
+
+    // Balances should not be refetched upon closing & reopening drawer
+    cy.get(getTestSelector('close-account-drawer')).click()
+    cy.get(getTestSelector('web3-status-connected')).click()
+    cy.get('@gqlSpy').should('have.been.calledOnce')
   })
 
   it('fetches account information', () => {
@@ -63,7 +45,7 @@ describe('Mini Portfolio account drawer', () => {
     cy.get(getTestSelector('mini-portfolio-navbar')).contains('Pools').click()
     cy.get(getTestSelector('mini-portfolio-page')).contains('No pools yet')
 
-    cy.intercept(/graphql/, { fixture: 'mini-portfolio/full_activity.json' })
+    cy.intercept(/graphql/, { fixture: 'mini-portfolio/activity.json' })
     cy.get(getTestSelector('mini-portfolio-navbar')).contains('Activity').click()
     cy.get(getTestSelector('mini-portfolio-page')).contains('Contract Interaction')
   })

cypress/e2e/nfts.test.ts

@@ -12,7 +12,7 @@ describe('Testing nfts', () => {
   })
 
   it('should load pudgy penguin collection page', () => {
-    cy.visit(`/nfts/collection/${PUDGY_COLLECTION_ADDRESS}`)
+    cy.visit(`/#/nfts/collection/${PUDGY_COLLECTION_ADDRESS}`)
     cy.get(getTestSelector('nft-collection-asset')).should('exist')
     cy.get(getTestSelector('nft-collection-filter-buy-now')).should('not.exist')
     cy.get(getTestSelector('nft-filter')).first().click()
@@ -20,13 +20,13 @@ describe('Testing nfts', () => {
   })
 
   it('should be able to navigate to activity', () => {
-    cy.visit(`/nfts/collection/${PUDGY_COLLECTION_ADDRESS}`)
+    cy.visit(`/#/nfts/collection/${PUDGY_COLLECTION_ADDRESS}`)
     cy.get(getTestSelector('nft-activity')).first().click()
     cy.get(getTestSelector('nft-activity-row')).should('exist')
   })
 
   it('should go to the details page', () => {
-    cy.visit(`/nfts/collection/${PUDGY_COLLECTION_ADDRESS}`)
+    cy.visit(`/#/nfts/collection/${PUDGY_COLLECTION_ADDRESS}`)
     cy.get(getTestSelector('nft-filter')).first().click()
     cy.get(getTestSelector('nft-collection-filter-buy-now')).click()
     cy.get(getTestSelector('nft-collection-asset')).first().click()
@@ -37,7 +37,7 @@ describe('Testing nfts', () => {
   })
 
   it('should toggle buy now on details page', () => {
-    cy.visit(`/nfts/collection/${PUDGY_COLLECTION_ADDRESS}`)
+    cy.visit(`/#/nfts/collection/${PUDGY_COLLECTION_ADDRESS}`)
     cy.get(getTestSelector('nft-filter')).first().click()
     cy.get(getTestSelector('nft-collection-filter-buy-now')).click()
     cy.get(getTestSelector('nft-collection-asset')).first().click()

cypress/e2e/permit2.test.ts

@@ -146,26 +146,6 @@ describe('Permit2', () => {
       cy.contains('Swap success!')
       cy.get(getTestSelector('popups')).contains('Swapped')
     })
-
-    it('swaps USDT with existing permit, and existing and sufficient token approval', () => {
-      cy.hardhat().then(async (hardhat) => {
-        await hardhat.fund(hardhat.wallet, CurrencyAmount.fromRawAmount(USDT, 2e6))
-        await hardhat.mine()
-        await hardhat.approval.setTokenAllowanceForPermit2({ owner: hardhat.wallet, token: USDT }, 1e6)
-        await hardhat.mine()
-        await hardhat.approval.setPermit2Allowance({ owner: hardhat.wallet, token: USDT })
-        await hardhat.mine()
-      })
-      setupInputs(USDT, USDC_MAINNET)
-      cy.get('#swap-currency-input .token-amount-input').clear().type('1')
-      initiateSwap()
-
-      // Verify transaction
-      cy.wait('@eth_sendRawTransaction')
-      cy.hardhat().then((hardhat) => hardhat.mine())
-      cy.contains('Swap success!')
-      cy.get(getTestSelector('popups')).contains('Swapped')
-    })
   })
 
   it('swaps when user has already approved token and permit2', () => {

cypress/e2e/remove-liquidity.test.ts

@@ -1,33 +1,7 @@
-import { ChainId, MaxUint256, UNI_ADDRESSES } from '@uniswap/sdk-core'
-
-const UNI_MAINNET = UNI_ADDRESSES[ChainId.MAINNET]
-
 describe('Remove Liquidity', () => {
-  it('loads the token pair in v2', () => {
-    cy.visit(`/remove/v2/ETH/${UNI_MAINNET}`)
+  it('loads the token pair', () => {
+    cy.visit('/remove/v2/ETH/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984')
     cy.get('#remove-liquidity-tokena-symbol').should('contain.text', 'ETH')
     cy.get('#remove-liquidity-tokenb-symbol').should('contain.text', 'UNI')
   })
-
-  it('loads the token pair in v3', () => {
-    cy.visit(`/remove/1`)
-    cy.get('#remove-liquidity-tokens').should('contain.text', 'UNI/ETH')
-
-    cy.get('#remove-pooled-tokena-symbol').should('contain.text', 'Pooled UNI')
-    cy.get('#remove-pooled-tokenb-symbol').should('contain.text', 'Pooled ETH')
-  })
-
-  it('should redirect to error pages if pool does not exist', () => {
-    // Duplicate-token v2 pools redirect to position unavailable
-    cy.visit(`/remove/v2/ETH/ETH`)
-    cy.contains('Position unavailable')
-
-    // Single-token pools don't exist
-    cy.visit('/remove/v2/ETH')
-    cy.url().should('match', /\/not-found/)
-
-    // Nonexistent v3 pool
-    cy.visit(`/remove/${MaxUint256}`)
-    cy.contains('Position unavailable')
-  })
 })

cypress/e2e/swap/settings.test.ts

@@ -1,11 +1,11 @@
+import { FeatureFlag } from '../../../src/featureFlags'
 import { getTestSelector } from '../../utils'
 
 describe('Swap settings', () => {
   it('Opens and closes the settings menu', () => {
-    cy.visit('/swap')
+    cy.visit('/swap', { featureFlags: [FeatureFlag.uniswapXEnabled] })
     cy.contains('Settings').should('not.exist')
     cy.get(getTestSelector('open-settings-dialog-button')).click()
-    cy.get(getTestSelector('mobile-settings-menu')).should('not.exist')
     cy.contains('Max slippage').should('exist')
     cy.contains('Transaction deadline').should('exist')
     cy.contains('UniswapX').should('exist')
@@ -13,24 +13,4 @@ describe('Swap settings', () => {
     cy.get(getTestSelector('open-settings-dialog-button')).click()
     cy.contains('Settings').should('not.exist')
   })
-
-  it('should open the mobile settings menu', () => {
-    // Set viewport to iPhone 6
-    cy.viewport('iphone-6')
-    cy.visit('/swap')
-
-    // Click the button to open the settings dialog
-    cy.get(getTestSelector('open-settings-dialog-button')).click({ waitForAnimations: true })
-
-    // Verify the mobile settings menu and its contents
-    cy.get(getTestSelector('mobile-settings-menu'))
-      .should('exist')
-      .within(() => {
-        cy.contains('Max slippage').should('exist')
-        cy.contains('UniswapX').should('exist')
-        cy.contains('Local routing').should('exist')
-        cy.contains('Transaction deadline').should('exist')
-        cy.get(getTestSelector('mobile-settings-close')).click()
-      })
-  })
 })

cypress/e2e/swap/swap.test.ts

@@ -1,4 +1,3 @@
-import { SwapEventName } from '@uniswap/analytics-events'
 import { ChainId } from '@uniswap/sdk-core'
 
 import { UNI, USDC_MAINNET } from '../../../src/constants/tokens'
@@ -65,13 +64,6 @@ describe('Swap', () => {
         cy.get('#swap-currency-output .token-amount-input').type('1').should('have.value', '1')
         cy.get('#swap-currency-input .token-amount-input').should('not.have.value', '')
 
-        // Verify logging
-        cy.waitForAmplitudeEvent(SwapEventName.SWAP_QUOTE_RECEIVED).then((event: any) => {
-          cy.wrap(event.event_properties).should('have.property', 'quote_latency_milliseconds')
-          cy.wrap(event.event_properties.quote_latency_milliseconds).should('be.a', 'number')
-          cy.wrap(event.event_properties.quote_latency_milliseconds).should('be.gte', 0)
-        })
-
         // Submit transaction
         cy.get('#swap-button').click()
         cy.contains('Review swap')

cypress/e2e/swap/swapFlowLogging.test.ts

@@ -1,76 +0,0 @@
-import { SwapEventName } from '@uniswap/analytics-events'
-
-import { USDC_MAINNET } from '../../../src/constants/tokens'
-import { getTestSelector } from '../../utils'
-
-describe('swap flow logging', () => {
-  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()
-
-    // First swap in the session:
-    // Enter amount to swap
-    cy.get('#swap-currency-output .token-amount-input').type('1').should('have.value', '1')
-    cy.get('#swap-currency-input .token-amount-input').should('not.have.value', '')
-
-    // Verify first swap action
-    cy.waitForAmplitudeEvent(SwapEventName.SWAP_FIRST_ACTION).then((event: any) => {
-      cy.wrap(event.event_properties).should('have.property', 'time_to_first_swap_action')
-      cy.wrap(event.event_properties.time_to_first_swap_action).should('be.a', 'number')
-      cy.wrap(event.event_properties.time_to_first_swap_action).should('be.gte', 0)
-    })
-
-    // Verify Swap Quote
-    cy.waitForAmplitudeEvent(SwapEventName.SWAP_QUOTE_FETCH).then((event: any) => {
-      // Price quotes don't include these values, so we only verify the types if they exist
-      if (event.event_properties.time_to_first_quote_request) {
-        cy.wrap(event.event_properties.time_to_first_quote_request).should('be.a', 'number')
-        cy.wrap(event.event_properties.time_to_first_quote_request).should('be.gte', 0)
-        cy.wrap(event.event_properties.time_to_first_quote_request_since_first_input).should('be.a', 'number')
-        cy.wrap(event.event_properties.time_to_first_quote_request_since_first_input).should('be.gte', 0)
-      }
-    })
-
-    // Submit transaction
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-    cy.get(getTestSelector('confirmation-close-icon')).click()
-
-    cy.get(getTestSelector('popups')).contains('Swapped')
-
-    // Verify logging
-    cy.waitForAmplitudeEvent(SwapEventName.SWAP_TRANSACTION_COMPLETED).then((event: any) => {
-      cy.wrap(event.event_properties).should('have.property', 'time_to_swap')
-      cy.wrap(event.event_properties.time_to_swap).should('be.a', 'number')
-      cy.wrap(event.event_properties.time_to_swap).should('be.gte', 0)
-      cy.wrap(event.event_properties).should('have.property', 'time_to_swap_since_first_input')
-      cy.wrap(event.event_properties.time_to_swap_since_first_input).should('be.a', 'number')
-      cy.wrap(event.event_properties.time_to_swap_since_first_input).should('be.gte', 0)
-    })
-
-    // Second swap in the session:
-    // Enter amount to swap (different from first trade, to trigger a new quote request)
-    cy.get('#swap-currency-output .token-amount-input').clear().type('10').should('have.value', '10')
-    cy.get('#swap-currency-input .token-amount-input').should('not.have.value', '')
-
-    // Verify second Swap Quote
-    cy.waitForAmplitudeEvent(SwapEventName.SWAP_QUOTE_FETCH).then((event: any) => {
-      // Price quotes don't include these values, so we only verify the types if they exist
-      if (event.event_properties.time_to_first_quote_request) {
-        cy.wrap(event.event_properties.time_to_first_quote_request).should('be.undefined')
-        cy.wrap(event.event_properties.time_to_first_quote_request_since_first_input).should('be.undefined')
-      }
-    })
-
-    // Submit transaction
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-    cy.get(getTestSelector('confirmation-close-icon')).click()
-
-    cy.get(getTestSelector('popups')).contains('Swapped')
-    cy.waitForAmplitudeEvent(SwapEventName.SWAP_TRANSACTION_COMPLETED).then((event: any) => {
-      cy.wrap(event.event_properties).should('not.have.property', 'time_to_swap')
-      cy.wrap(event.event_properties).should('not.have.property', 'time_to_swap_since_first_input')
-    })
-  })
-})

cypress/e2e/swap/timeToSwap.test.ts

@@ -0,0 +1,45 @@
+import { SwapEventName } from '@uniswap/analytics-events'
+
+import { USDC_MAINNET } from '../../../src/constants/tokens'
+import { getTestSelector } from '../../utils'
+
+describe('time-to-swap logging', () => {
+  it('completes two swaps and verifies the TTS logging for the first', () => {
+    cy.visit(`/swap?inputCurrency=ETH&outputCurrency=${USDC_MAINNET.address}`)
+    cy.hardhat()
+
+    // First swap in the session:
+    // Enter amount to swap
+    cy.get('#swap-currency-output .token-amount-input').type('1').should('have.value', '1')
+    cy.get('#swap-currency-input .token-amount-input').should('not.have.value', '')
+
+    // Submit transaction
+    cy.get('#swap-button').click()
+    cy.contains('Confirm swap').click()
+    cy.get(getTestSelector('confirmation-close-icon')).click()
+
+    cy.get(getTestSelector('popups')).contains('Swapped')
+
+    // Verify logging
+    cy.waitForAmplitudeEvent(SwapEventName.SWAP_TRANSACTION_COMPLETED).then((event: any) => {
+      cy.wrap(event.event_properties).should('have.property', 'time_to_swap')
+      cy.wrap(event.event_properties.time_to_swap).should('be.a', 'number')
+      cy.wrap(event.event_properties.time_to_swap).should('be.gte', 0)
+    })
+
+    // Second swap in the session:
+    // Enter amount to swap
+    cy.get('#swap-currency-output .token-amount-input').clear().type('1').should('have.value', '1')
+    cy.get('#swap-currency-input .token-amount-input').should('not.have.value', '')
+
+    // Submit transaction
+    cy.get('#swap-button').click()
+    cy.contains('Confirm swap').click()
+    cy.get(getTestSelector('confirmation-close-icon')).click()
+
+    cy.get(getTestSelector('popups')).contains('Swapped')
+    cy.waitForAmplitudeEvent(SwapEventName.SWAP_TRANSACTION_COMPLETED).then((event: any) => {
+      cy.wrap(event.event_properties).should('not.have.property', 'time_to_swap')
+    })
+  })
+})

cypress/e2e/swap/unconnected.test.ts

@@ -1,27 +0,0 @@
-import { SwapEventName } from '@uniswap/analytics-events'
-import { USDC_MAINNET } from 'constants/tokens'
-
-import { getTestSelector } from '../../utils'
-
-describe('Swap inputs with no wallet connected', () => {
-  it('can input and load a quote with no wallet connected', () => {
-    cy.visit(`/swap?inputCurrency=ETH&outputCurrency=${USDC_MAINNET.address}`)
-
-    cy.get(getTestSelector('web3-status-connected')).click()
-    // click twice, first time to show confirmation, second to confirm
-    cy.get(getTestSelector('wallet-disconnect')).click()
-    cy.get(getTestSelector('wallet-disconnect')).should('contain', 'Disconnect')
-    cy.get(getTestSelector('wallet-disconnect')).click()
-    cy.get(getTestSelector('close-account-drawer')).click()
-
-    // Enter amount to swap
-    cy.get('#swap-currency-output .token-amount-input').type('1').should('have.value', '1')
-    cy.get('#swap-currency-input .token-amount-input').should('not.have.value', '')
-    // Verify logging
-    cy.waitForAmplitudeEvent(SwapEventName.SWAP_QUOTE_RECEIVED).then((event: any) => {
-      cy.wrap(event.event_properties).should('have.property', 'quote_latency_milliseconds')
-      cy.wrap(event.event_properties.quote_latency_milliseconds).should('be.a', 'number')
-      cy.wrap(event.event_properties.quote_latency_milliseconds).should('be.gte', 0)
-    })
-  })
-})

cypress/e2e/swap/uniswapx.test.ts

@@ -1,374 +0,0 @@
-import { ChainId, CurrencyAmount } from '@uniswap/sdk-core'
-
-import { DAI, nativeOnChain, USDC_MAINNET } from '../../../src/constants/tokens'
-import { getTestSelector } from '../../utils'
-
-const QuoteEndpoint = 'https://api.uniswap.org/v2/quote'
-const QuoteWhereUniswapXIsBetter = 'uniswapx/quote1.json'
-const QuoteWithEthInput = 'uniswapx/quote2.json'
-
-const OrderSubmissionEndpoint = 'https://api.uniswap.org/v2/order'
-
-const OrderStatusEndpoint =
-  'https://api.uniswap.org/v2/orders?swapper=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266&orderHashes=0xa9dd6f05ad6d6c79bee654c31ede4d0d2392862711be0f3bc4a9124af24a6a19'
-
-/** Stubs the provider to return a tx receipt corresponding to the mock filled uniswapx order's txHash */
-function stubSwapTxReceipt() {
-  cy.hardhat().then((hardhat) => {
-    cy.fixture('uniswapx/fillTransactionReceipt.json').then((mockTxReceipt) => {
-      const getTransactionReceiptStub = cy.stub(hardhat.provider, 'getTransactionReceipt').log(false)
-      getTransactionReceiptStub.withArgs(mockTxReceipt.transactionHash).resolves(mockTxReceipt)
-      getTransactionReceiptStub.callThrough()
-    })
-  })
-}
-
-describe('UniswapX Toggle', () => {
-  beforeEach(() => {
-    cy.intercept(QuoteEndpoint, { fixture: QuoteWhereUniswapXIsBetter })
-    cy.visit(`/swap/?inputCurrency=${USDC_MAINNET.address}&outputCurrency=${DAI.address}`)
-  })
-
-  it('only displays uniswapx ui when setting is on', () => {
-    // Setup a swap
-    cy.get('#swap-currency-input .token-amount-input').type('300')
-
-    // UniswapX UI should not be visible
-    cy.get(getTestSelector('gas-estimate-uniswapx-icon')).should('not.exist')
-
-    // Opt-in to UniswapX
-    cy.contains('Try it now').click()
-
-    // UniswapX UI should be visible
-    cy.get(getTestSelector('gas-estimate-uniswapx-icon')).should('exist')
-  })
-
-  it('prompts opt-in if UniswapX is better', () => {
-    // Setup a swap
-    cy.get('#swap-currency-input .token-amount-input').type('300')
-
-    // UniswapX should not display in gas estimate row before opt-in
-    cy.get(getTestSelector('gas-estimate-uniswapx-icon')).should('not.exist')
-
-    // UniswapX mustache should be visible
-    cy.contains('Try it now').click()
-
-    // Opt-in dialog should now be hidden
-    cy.contains('Try it now').should('not.be.visible')
-
-    // UniswapX should display in gas estimate row
-    cy.get(getTestSelector('gas-estimate-uniswapx-icon')).should('exist')
-
-    // Opt-in dialog should not reappear if user manually toggles UniswapX off
-    cy.get(getTestSelector('open-settings-dialog-button')).click()
-    cy.get(getTestSelector('toggle-uniswap-x-button')).click()
-    cy.get(getTestSelector('open-settings-dialog-button')).click()
-    cy.contains('Try it now').should('not.be.visible')
-  })
-})
-
-describe('UniswapX Orders', () => {
-  beforeEach(() => {
-    cy.intercept(QuoteEndpoint, { fixture: QuoteWhereUniswapXIsBetter })
-    cy.intercept(OrderSubmissionEndpoint, { fixture: 'uniswapx/orderResponse.json' })
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/openStatusResponse.json' })
-
-    stubSwapTxReceipt()
-
-    cy.hardhat().then((hardhat) => hardhat.fund(hardhat.wallet, CurrencyAmount.fromRawAmount(USDC_MAINNET, 3e8)))
-    cy.visit(`/swap/?inputCurrency=${USDC_MAINNET.address}&outputCurrency=${DAI.address}`)
-  })
-
-  it('can swap exact-in trades using uniswapX', () => {
-    // Setup a swap
-    cy.get('#swap-currency-input .token-amount-input').type('300')
-    cy.contains('Try it now').click()
-
-    // Submit uniswapx order signature
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-    cy.wait('@eth_signTypedData_v4')
-    cy.contains('Swap submitted')
-    cy.contains('Learn more about swapping with UniswapX')
-
-    // Return filled order status from uniswapx api
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/filledStatusResponse.json' })
-
-    // Verify swap success
-    cy.contains('Swapped')
-  })
-
-  it('can swap exact-out trades using uniswapX', () => {
-    // Setup a swap
-    cy.get('#swap-currency-output .token-amount-input').type('300')
-    cy.contains('Try it now').click()
-
-    // Submit uniswapx order signature
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-    cy.wait('@eth_signTypedData_v4')
-    cy.contains('Swap submitted')
-    cy.contains('Learn more about swapping with UniswapX')
-
-    // Return filled order status from uniswapx api
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/filledStatusResponse.json' })
-
-    // Verify swap success
-    cy.contains('Swapped')
-  })
-
-  it('renders proper view if uniswapx order expires', () => {
-    // Setup a swap
-    cy.get('#swap-currency-input .token-amount-input').type('300')
-    cy.contains('Try it now').click()
-
-    // Submit uniswapx order signature
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-
-    // Return expired order status from uniswapx api
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/expiredStatusResponse.json' })
-
-    // Verify swap failure message
-    cy.contains('Swap expired')
-  })
-
-  it('renders proper view if uniswapx order has insufficient funds', () => {
-    // Setup a swap
-    cy.get('#swap-currency-input .token-amount-input').type('300')
-    cy.contains('Try it now').click()
-
-    // Submit uniswapx order signature
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-
-    // Return insufficient_funds order status from uniswapx api
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/insufficientFundsStatusResponse.json' })
-
-    // Verify swap failure message
-    cy.contains('Insufficient funds')
-  })
-})
-
-describe('UniswapX Eth Input', () => {
-  beforeEach(() => {
-    cy.intercept(QuoteEndpoint, { fixture: QuoteWithEthInput })
-    cy.intercept(OrderSubmissionEndpoint, { fixture: 'uniswapx/orderResponse.json' })
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/openStatusResponse.json' })
-
-    // Turn off automine so that intermediate screens are available to assert on.
-    cy.hardhat({ automine: false }).then(async (hardhat) => {
-      await hardhat.fund(hardhat.wallet, CurrencyAmount.fromRawAmount(nativeOnChain(ChainId.MAINNET), 2e18))
-      await hardhat.mine()
-    })
-
-    stubSwapTxReceipt()
-
-    cy.visit(`/swap/?inputCurrency=ETH&outputCurrency=${DAI.address}`)
-  })
-
-  it('can swap using uniswapX with ETH as input', () => {
-    // Setup a swap
-    cy.get('#swap-currency-input .token-amount-input').type('1')
-    cy.contains('Try it now').click()
-
-    // Prompt ETH wrap to use for order
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-    cy.contains('Wrap ETH')
-
-    // Wrap ETH
-    cy.wait('@eth_sendRawTransaction')
-    cy.contains('Pending...')
-    cy.hardhat().then((hardhat) => hardhat.mine())
-    cy.contains('Wrapped')
-
-    // Approve WETH spend
-    cy.wait('@eth_sendRawTransaction')
-    cy.hardhat().then((hardhat) => hardhat.mine())
-
-    // Verify signed order submission
-    cy.wait('@eth_signTypedData_v4')
-    cy.contains('Swap submitted')
-    cy.contains('Learn more about swapping with UniswapX')
-
-    // Return filled order status from uniswapx api
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/filledStatusResponse.json' })
-
-    // Verify swap success
-    cy.contains('Swapped')
-  })
-
-  it('switches swap input to WETH after wrap', () => {
-    // Setup a swap
-    cy.get('#swap-currency-input .token-amount-input').type('1')
-    cy.contains('Try it now').click()
-
-    // Prompt ETH wrap and confirm
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-    cy.wait('@eth_sendRawTransaction')
-
-    // Close review modal before wrap is confirmed on chain
-    cy.get(getTestSelector('confirmation-close-icon')).click()
-    cy.hardhat().then((hardhat) => hardhat.mine())
-
-    // Confirm wrap is successful and WETH is now input token
-    cy.contains('Wrapped')
-    cy.contains('WETH')
-
-    // Reopen review modal and continue swap
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-
-    // Approve WETH spend
-    cy.wait('@eth_sendRawTransaction')
-    cy.hardhat().then((hardhat) => hardhat.mine())
-
-    // Submit uniswapx order signature
-    cy.wait('@eth_signTypedData_v4')
-    cy.contains('Swap submitted')
-    cy.contains('Learn more about swapping with UniswapX')
-
-    // Return filled order status from uniswapx api
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/filledStatusResponse.json' })
-
-    // Verify swap success
-    cy.contains('Swapped')
-  })
-})
-
-describe('UniswapX activity history', () => {
-  beforeEach(() => {
-    cy.intercept(QuoteEndpoint, { fixture: QuoteWhereUniswapXIsBetter })
-    cy.intercept(OrderSubmissionEndpoint, { fixture: 'uniswapx/orderResponse.json' })
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/openStatusResponse.json' })
-
-    stubSwapTxReceipt()
-
-    cy.hardhat().then(async (hardhat) => {
-      await hardhat.fund(hardhat.wallet, CurrencyAmount.fromRawAmount(USDC_MAINNET, 3e8))
-    })
-    cy.visit(`/swap/?inputCurrency=${USDC_MAINNET.address}&outputCurrency=${DAI.address}`)
-  })
-
-  it('can view UniswapX order status progress in activity', () => {
-    // Setup a swap
-    cy.get('#swap-currency-input .token-amount-input').type('300')
-    cy.contains('Try it now').click()
-
-    // Submit uniswapx order signature
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-    cy.wait('@eth_signTypedData_v4')
-    cy.get(getTestSelector('confirmation-close-icon')).click()
-
-    // Open mini portfolio and navigate to activity history
-    cy.get(getTestSelector('web3-status-connected')).click()
-    cy.intercept(/graphql/, { fixture: 'mini-portfolio/empty_activity.json' })
-    cy.get(getTestSelector('mini-portfolio-navbar')).contains('Activity').click()
-
-    // Open pending order modal
-    cy.contains('Swapping').click()
-    cy.get(getTestSelector('offchain-activity-modal')).contains('Swapping')
-    cy.get(getTestSelector('offchain-activity-modal')).contains('Learn more about swapping with UniswapX')
-
-    // Return filled order status from uniswapx api
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/filledStatusResponse.json' })
-
-    cy.get(getTestSelector('offchain-activity-modal')).contains('Swapped')
-    cy.get(getTestSelector('offchain-activity-modal')).contains('View on Explorer')
-  })
-
-  it('can view UniswapX order status progress in activity upon expiry', () => {
-    // Setup a swap
-    cy.get('#swap-currency-input .token-amount-input').type('300')
-    cy.contains('Try it now').click()
-
-    // Submit uniswapx order signature
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-    cy.wait('@eth_signTypedData_v4')
-    cy.get(getTestSelector('confirmation-close-icon')).click()
-
-    // Open mini portfolio and navigate to activity history
-    cy.get(getTestSelector('web3-status-connected')).click()
-    cy.intercept(/graphql/, { fixture: 'mini-portfolio/empty_activity.json' })
-    cy.get(getTestSelector('mini-portfolio-navbar')).contains('Activity').click()
-
-    // Open pending order modal
-    cy.contains('Swapping').click()
-    cy.get(getTestSelector('offchain-activity-modal')).contains('Swapping')
-
-    // Return filled order status from uniswapx api
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/expiredStatusResponse.json' })
-
-    cy.get(getTestSelector('offchain-activity-modal')).contains('Swap expired')
-    cy.get(getTestSelector('offchain-activity-modal')).contains('learn more')
-  })
-
-  it('deduplicates remote vs local uniswapx orders', () => {
-    // Setup a swap
-    cy.get('#swap-currency-input .token-amount-input').type('300')
-    cy.contains('Try it now').click()
-
-    // Submit uniswapx order signature
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-    cy.wait('@eth_signTypedData_v4')
-    cy.get(getTestSelector('confirmation-close-icon')).click()
-
-    // Return filled order status from uniswapx api
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/filledStatusResponse.json' })
-
-    cy.contains('Swapped')
-
-    // Open mini portfolio
-    cy.get(getTestSelector('web3-status-connected')).click()
-
-    cy.fixture('mini-portfolio/uniswapx_activity.json').then((uniswapXActivity) => {
-      // Replace fixture's timestamp with current time
-      uniswapXActivity.data.portfolios[0].assetActivities[0].timestamp = Date.now() / 1000
-      cy.intercept(/graphql/, uniswapXActivity)
-    })
-
-    // Open activity history
-    cy.get(getTestSelector('mini-portfolio-navbar')).contains('Activity').click()
-
-    // Ensure gql and local order have been deduped, such that there is only one swap activity listed
-    cy.get(getTestSelector('activity-content')).contains('Swapped').should('have.length', 1)
-  })
-
-  it('balances should refetch after uniswapx swap', () => {
-    // Setup a swap
-    cy.get('#swap-currency-input .token-amount-input').type('300')
-    cy.contains('Try it now').click()
-
-    const gqlSpy = cy.spy().as('gqlSpy')
-    cy.intercept(/graphql/, (req) => {
-      // Spy on request frequency
-      req.on('response', gqlSpy)
-      // Reply with a fixture to speed up test
-      req.reply({
-        fixture: 'mini-portfolio/tokens.json',
-      })
-    })
-
-    // Expect balances to fetch upon opening mini portfolio
-    cy.get(getTestSelector('web3-status-connected')).click()
-    cy.get('@gqlSpy').should('have.been.calledOnce')
-
-    // Submit uniswapx order signature
-    cy.get('#swap-button').click()
-    cy.contains('Confirm swap').click()
-
-    // Expect balances to refetch after approval
-    cy.get('@gqlSpy').should('have.been.calledTwice')
-
-    // Return filled order status from uniswapx api
-    cy.intercept(OrderStatusEndpoint, { fixture: 'uniswapx/filledStatusResponse.json' })
-
-    // Expect balances to refetch after swap
-    cy.get('@gqlSpy').should('have.been.calledThrice')
-  })
-})

cypress/e2e/token-details.test.ts

@@ -55,9 +55,14 @@ describe('Token details', () => {
     if (cy.get('[data-cy="chart-header"]').contains('Price Unavailable')) {
       cy.get('[data-cy="missing-chart"]').should('exist')
     }
-
-    // Stats should not exist
-    cy.get(getTestSelector('token-details-stats')).should('not.exist')
+    // Stats should have: TVL, 24H Volume, 52W low, 52W high
+    cy.get(getTestSelector('token-details-stats')).should('exist')
+    cy.get(getTestSelector('token-details-stats')).within(() => {
+      cy.get('[data-cy="tvl"]').should('exist')
+      cy.get('[data-cy="volume-24h"]').should('exist')
+      cy.get('[data-cy="52w-low"]').should('exist')
+      cy.get('[data-cy="52w-high"]').should('exist')
+    })
 
     // About section should have description of token
     cy.get(getTestSelector('token-details-about-section')).should('exist')
@@ -103,7 +108,7 @@ describe('Token details', () => {
 
     it('should automatically navigate to the new TDP', () => {
       cy.get(`#swap-currency-output .open-currency-select-button`).click()
-      cy.get('[data-reach-dialog-content]').contains('WETH').click()
+      cy.contains('WETH').click()
       cy.url().should('include', `${WETH9[1].address}`)
       cy.url().should('not.include', `${UNI_MAINNET.address}`)
     })

cypress/e2e/token-explore-filter.test.ts

@@ -11,10 +11,6 @@ describe('Token explore filter', () => {
 
   function searchFor(filter: string) {
     cy.get('[data-cy="explore-tokens-search-input"]').clear().type(filter).type('{enter}')
-    // wait for it to finish the filtered render
-    cy.get('[data-cy="token-name"]').first().contains(filter, {
-      matchCase: false,
-    })
   }
 
   it('should filter correctly by dao search term', () => {
@@ -22,9 +18,7 @@ describe('Token explore filter', () => {
     searchFor('dao')
 
     cy.get('@filteredTokens').then((filteredTokens) => {
-      cy.get('[data-cy="token-name"]').then((tokens) => {
-        cy.wrap(Array.from(tokens)).should('deep.equal', Array.from(filteredTokens))
-      })
+      cy.get('[data-cy="token-name"]').should('deep.equal', filteredTokens)
     })
   })
 })

cypress/e2e/token-explore.test.ts

@@ -69,6 +69,8 @@ describe('Token explore', () => {
     cy.get(getTestSelector('tokens-network-filter-selected')).click()
     cy.get(getTestSelector('tokens-network-filter-option-optimism')).click()
     cy.get(getTestSelector('tokens-network-filter-selected')).should('contain', 'Optimism')
+    cy.reload()
+    cy.get(getTestSelector('tokens-network-filter-selected')).should('contain', 'Optimism')
     cy.get(getTestSelector('chain-selector-logo')).invoke('attr', 'alt').should('eq', 'Ethereum')
   })
 })

cypress/e2e/universal-search.test.ts

@@ -1,10 +1,5 @@
-import { ChainId } from '@uniswap/sdk-core'
-import { UNI } from 'constants/tokens'
-
 import { getTestSelector } from '../utils'
 
-const UNI_ADDRESS = UNI[ChainId.MAINNET].address.toLowerCase()
-
 describe('Universal search bar', () => {
   function openSearch() {
     // can't just type "/" because on mobile it doesn't respond to that
@@ -24,49 +19,35 @@ describe('Universal search bar', () => {
     openSearch()
     getSearchBar().clear().type('uni')
 
-    cy.get(getTestSelector(`searchbar-token-row-ETHEREUM-${UNI_ADDRESS}`))
+    cy.get(getTestSelector('searchbar-token-row-UNI'))
       .should('contain.text', 'Uniswap')
       .and('contain.text', 'UNI')
       .and('contain.text', '$')
       .and('contain.text', '%')
       .click()
-    cy.location('pathname').should('equal', '/tokens/ethereum/0x1f9840a85d5af5bf1d1762f925bdaddc4201f984')
+    cy.location('hash').should('equal', '#/tokens/ethereum/0x1f9840a85d5af5bf1d1762f925bdaddc4201f984')
 
     openSearch()
     cy.get(getTestSelector('searchbar-dropdown'))
       .contains(getTestSelector('searchbar-dropdown'), 'Recent searches')
-      .find(getTestSelector(`searchbar-token-row-ETHEREUM-${UNI_ADDRESS}`))
+      .find(getTestSelector('searchbar-token-row-UNI'))
       .should('exist')
   })
 
-  it(
-    'should go to the selected result when recent results are shown',
-    // this test is experiencing flake despite being correct, i can see the right value in DOM
-    // but for some reason cypress doesn't find it, so adding retries for now :/
-    {
-      // @ts-ignore see https://uniswapteam.slack.com/archives/C047U65H422/p1691455547556309
-      // basically cypress has bad types due to overlap with jest and you just have to deal with it
-      // i tried removing jest types but still happens
-      retries: {
-        runMode: 3,
-        openMode: 3,
-      },
-    },
-    () => {
-      // Seed recent results with UNI.
-      openSearch()
-      getSearchBar().type('uni')
-      cy.get(getTestSelector(`searchbar-token-row-ETHEREUM-${UNI_ADDRESS}`))
-      getSearchBar().clear().type('{esc}')
+  it('should go to the selected result when recent results are shown', () => {
+    // Seed recent results with UNI.
+    openSearch()
+    getSearchBar().type('uni')
+    cy.get(getTestSelector('searchbar-token-row-UNI'))
+    getSearchBar().clear().type('{esc}')
 
-      // Search a different token by name.
-      openSearch()
-      getSearchBar().type('eth')
-      cy.get(getTestSelector('searchbar-token-row-ETHEREUM-NATIVE'))
+    // Search a different token by name.
+    openSearch()
+    getSearchBar().type('eth')
+    cy.get(getTestSelector('searchbar-token-row-ETH'))
 
-      // Validate that we go to the searched/selected result.
-      getSearchBar().type('{enter}')
-      cy.url().should('contain', 'tokens/ethereum/NATIVE')
-    }
-  )
+    // Validate that we go to the searched/selected result.
+    getSearchBar().type('{enter}')
+    cy.url().should('contain', 'tokens/ethereum/NATIVE')
+  })
 })

cypress/e2e/wallet-connection/connect.test.ts

@@ -22,7 +22,7 @@ describe('disconnect wallet', () => {
     cy.contains('Connect Wallet')
 
     // Verify swap input is cleared
-    cy.get('#swap-currency-input .token-amount-input').should('have.value', '1')
+    cy.get('#swap-currency-input .token-amount-input').should('have.value', '')
   })
 })
 

cypress/e2e/wallet-dropdown.test.ts

@@ -1,5 +1,3 @@
-import { FeatureFlag } from 'featureFlags'
-
 import { getTestSelector } from '../utils'
 
 describe('Wallet Dropdown', () => {
@@ -23,20 +21,16 @@ describe('Wallet Dropdown', () => {
     })
   }
 
-  function itChangesLocale({ featureFlag = false }: { featureFlag?: boolean } = {}) {
+  function itChangesLocale() {
     it('should change locale', () => {
       cy.contains('Uniswap available in: English').should('not.exist')
 
-      if (featureFlag) {
-        cy.get(getTestSelector('language-settings-button')).click()
-      }
-
       cy.get(getTestSelector('wallet-language-item')).contains('Afrikaans').click({ force: true })
-      cy.location('search').should('match', /\?lng=af-ZA$/)
+      cy.location('hash').should('match', /\?lng=af-ZA$/)
       cy.contains('Uniswap available in: English')
 
       cy.get(getTestSelector('wallet-language-item')).contains('English').click({ force: true })
-      cy.location('search').should('match', /\?lng=en-US$/)
+      cy.location('hash').should('match', /\?lng=en-US$/)
       cy.contains('Uniswap available in: English').should('not.exist')
     })
   }
@@ -51,15 +45,6 @@ describe('Wallet Dropdown', () => {
     itChangesLocale()
   })
 
-  describe('should change locale with feature flag', () => {
-    beforeEach(() => {
-      cy.visit('/', { featureFlags: [FeatureFlag.currencyConversion] })
-      cy.get(getTestSelector('web3-status-connected')).click()
-      cy.get(getTestSelector('wallet-settings')).click()
-    })
-    itChangesLocale({ featureFlag: true })
-  })
-
   describe('testnet toggle', () => {
     beforeEach(() => {
       cy.visit('/swap')
@@ -115,7 +100,7 @@ describe('Wallet Dropdown', () => {
       cy.get(getTestSelector('web3-status-connected')).click()
       cy.get(getTestSelector('wallet-settings')).click()
       cy.get(getTestSelector('theme-auto')).click()
-      cy.get(getTestSelector('wallet-header')).should('have.css', 'color', 'rgb(155, 155, 155)')
+      cy.get(getTestSelector('wallet-header')).should('have.css', 'color', 'rgb(152, 161, 192)')
     })
 
     it('should properly use light system theme when auto theme setting is selected', () => {
@@ -123,7 +108,7 @@ describe('Wallet Dropdown', () => {
       cy.get(getTestSelector('web3-status-connected')).click()
       cy.get(getTestSelector('wallet-settings')).click()
       cy.get(getTestSelector('theme-auto')).click()
-      cy.get(getTestSelector('wallet-header')).should('have.css', 'color', 'rgb(125, 125, 125)')
+      cy.get(getTestSelector('wallet-header')).should('have.css', 'color', 'rgb(119, 128, 160)')
     })
   })
 
@@ -144,34 +129,4 @@ describe('Wallet Dropdown', () => {
       cy.get(getTestSelector('wallet-settings')).should('not.be.visible')
     })
   })
-
-  describe('local currency', () => {
-    it('loads local currency from the query param', () => {
-      cy.visit('/', { featureFlags: [FeatureFlag.currencyConversion] })
-      cy.get(getTestSelector('web3-status-connected')).click()
-      cy.get(getTestSelector('wallet-settings')).click()
-      cy.contains('USD')
-
-      cy.visit('/?cur=AUD', { featureFlags: [FeatureFlag.currencyConversion] })
-      cy.get(getTestSelector('web3-status-connected')).click()
-      cy.get(getTestSelector('wallet-settings')).click()
-      cy.contains('AUD')
-    })
-
-    it('loads local currency from menu', () => {
-      cy.visit('/', { featureFlags: [FeatureFlag.currencyConversion] })
-      cy.get(getTestSelector('web3-status-connected')).click()
-      cy.get(getTestSelector('wallet-settings')).click()
-      cy.contains('USD')
-
-      cy.get(getTestSelector('local-currency-settings-button')).click()
-      cy.get(getTestSelector('wallet-local-currency-item')).contains('AUD').click({ force: true })
-      cy.location('search').should('match', /\?cur=AUD$/)
-      cy.contains('AUD')
-
-      cy.get(getTestSelector('wallet-local-currency-item')).contains('USD').click({ force: true })
-      cy.location('search').should('match', /\?cur=USD$/)
-      cy.contains('USD')
-    })
-  })
 })

cypress/fixtures/mini-portfolio/empty_activity.json

@@ -1,12 +0,0 @@
-{
-  "data": {
-    "portfolios": [
-      {
-        "id": "UG9ydGZvbGlvOjB4ZjM5RmQ2ZTUxYWFkODhGNkY0Y2U2YUI4ODI3Mjc5Y2ZmRmI5MjI2Ng==",
-        "assetActivities": [],
-        "__typename": "Portfolio"
-      }
-    ]
-  },
-  "errors": []
-}

cypress/fixtures/mini-portfolio/full_activity.json

@@ -1,580 +0,0 @@
-{
-  "data": {
-    "portfolios": [
-      {
-        "id": "UG9ydGZvbGlvOjB4ZjM5RmQ2ZTUxYWFkODhGNkY0Y2U2YUI4ODI3Mjc5Y2ZmRmI5MjI2Ng==",
-        "assetActivities": [
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhnM09EQm1NamcwTURSak1qRXpPRGd6TVRVM00yRXdOakJtTVRaaE1UQTNaV0ZtTW1Jd01qazFZbUZqTmpjNU5tUm1ZamN5TW1WbVl6VmpPVE5tTmpRM1h6QjRaak01Wm1RMlpUVXhZV0ZrT0RobU5tWTBZMlUyWVdJNE9ESTNNamM1WTJabVptSTVNakkyTmw4d2VEQXdNREF3TURBek1HWTBPV0ptTW1Vd01ESmxOakJqTm1Wa01UWTJNV1ppTWpNME5tUTRPREk9",
-            "timestamp": 1684364195,
-            "chain": "ETHEREUM",
-            "details": {
-              "__typename": "TransactionDetails",
-              "id": "VHJhbnNhY3Rpb246MHg3ODBmMjg0MDRjMjEzODgzMTU3M2EwNjBmMTZhMTA3ZWFmMmIwMjk1YmFjNjc5NmRmYjcyMmVmYzVjOTNmNjQ3XzB4ZjM5ZmQ2ZTUxYWFkODhmNmY0Y2U2YWI4ODI3Mjc5Y2ZmZmI5MjI2Nl8weDAwMDAwMDAzMGY0OWJmMmUwMDJlNjBjNmVkMTY2MWZiMjM0NmQ4ODI=",
-              "type": "UNKNOWN",
-              "blockNumber": 17282434,
-              "hash": "0x780f28404c2138831573a060f16a107eaf2b0295bac6796dfb722efc5c93f647",
-              "status": "CONFIRMED",
-              "to": "0x000000030f49bf2e002e60c6ed1661fb2346d882",
-              "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-              "nonce": 465,
-              "assetChanges": []
-            },
-            "__typename": "AssetActivity"
-          },
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhobFl6QTROMkpoTjJJMk4yUTFPVEEwTVdNMU5XTXdObU16TkdNNVlXVmhPVEUxTkRreVpUYzRNRFl4WldRd016TTBNMlprWmprMU1qa3dPR1U0WTJSa1h6QjRaR0psWmpNM05HWmtaamhrTnpNMVpUYzFPRGxoT1dFNVpUSmpOV0V3T1RGbFlqSmtZbVUxTjE4d2VHWXpPV1prTm1VMU1XRmhaRGc0WmpabU5HTmxObUZpT0RneU56STNPV05tWm1aaU9USXlOalk9",
-            "timestamp": 1684364135,
-            "chain": "ETHEREUM",
-            "details": {
-              "__typename": "TransactionDetails",
-              "id": "VHJhbnNhY3Rpb246MHhlYzA4N2JhN2I2N2Q1OTA0MWM1NWMwNmMzNGM5YWVhOTE1NDkyZTc4MDYxZWQwMzM0M2ZkZjk1MjkwOGU4Y2RkXzB4ZGJlZjM3NGZkZjhkNzM1ZTc1ODlhOWE5ZTJjNWEwOTFlYjJkYmU1N18weGYzOWZkNmU1MWFhZDg4ZjZmNGNlNmFiODgyNzI3OWNmZmZiOTIyNjY=",
-              "type": "RECEIVE",
-              "blockNumber": 17282429,
-              "hash": "0xec087ba7b67d59041c55c06c34c9aea915492e78061ed03343fdf952908e8cdd",
-              "status": "CONFIRMED",
-              "to": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-              "from": "0xdbef374fdf8d735e7589a9a9e2c5a091eb2dbe57",
-              "nonce": 66,
-              "assetChanges": [
-                {
-                  "__typename": "TokenTransfer",
-                  "id": "VG9rZW5UcmFuc2ZlcjoweGRiZWYzNzRmZGY4ZDczNWU3NTg5YTlhOWUyYzVhMDkxZWIyZGJlNTdfMHhmMzlmZDZlNTFhYWQ4OGY2ZjRjZTZhYjg4MjcyNzljZmZmYjkyMjY2XzB4ZWMwODdiYTdiNjdkNTkwNDFjNTVjMDZjMzRjOWFlYTkxNTQ5MmU3ODA2MWVkMDMzNDNmZGY5NTI5MDhlOGNkZA==",
-                  "asset": {
-                    "id": "VG9rZW46RVRIRVJFVU1fbnVsbA==",
-                    "name": "Ether",
-                    "symbol": "ETH",
-                    "address": null,
-                    "decimals": 18,
-                    "chain": "ETHEREUM",
-                    "standard": null,
-                    "project": {
-                      "id": "VG9rZW5Qcm9qZWN0OkVUSEVSRVVNX251bGw=",
-                      "isSpam": false,
-                      "logo": {
-                        "id": "SW1hZ2U6aHR0cHM6Ly90b2tlbi1pY29ucy5zMy5hbWF6b25hd3MuY29tL2V0aC5wbmc=",
-                        "url": "https://token-icons.s3.amazonaws.com/eth.png",
-                        "__typename": "Image"
-                      },
-                      "__typename": "TokenProject"
-                    },
-                    "__typename": "Token"
-                  },
-                  "tokenStandard": "NATIVE",
-                  "quantity": "0.001",
-                  "sender": "0xdbef374fdf8d735e7589a9a9e2c5a091eb2dbe57",
-                  "recipient": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-                  "direction": "IN",
-                  "transactedValue": {
-                    "id": "QW1vdW50OjEuODI5NjcwMDAwMDAwMDAwMV9VU0Q=",
-                    "currency": "USD",
-                    "value": 1.8296700000000001,
-                    "__typename": "Amount"
-                  }
-                }
-              ]
-            },
-            "__typename": "AssetActivity"
-          },
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhoaE9URXdPVFEwT1Rka01UVmpNelpsWWprd1pXUXpZVEkwWW1Wa09ESTBOalpqWmpKaU9URXpNV1l4WkRVMk1EUmlNelppWW1aallqRTBOMkUzTURnNFh6QjRaV1JoTldVeE9ERXhORFppTVdZNVlUZG1OREJtT0RWak1HUmhNek0wT1RNNE5ESXdaRFV4TkY4d2VHWXpPV1prTm1VMU1XRmhaRGc0WmpabU5HTmxObUZpT0RneU56STNPV05tWm1aaU9USXlOalk9",
-            "timestamp": 1684319903,
-            "chain": "ETHEREUM",
-            "details": {
-              "id": "VHJhbnNhY3Rpb246MHhhOTEwOTQ0OTdkMTVjMzZlYjkwZWQzYTI0YmVkODI0NjZjZjJiOTEzMWYxZDU2MDRiMzZiYmZjYjE0N2E3MDg4XzB4ZWRhNWUxODExNDZiMWY5YTdmNDBmODVjMGRhMzM0OTM4NDIwZDUxNF8weGYzOWZkNmU1MWFhZDg4ZjZmNGNlNmFiODgyNzI3OWNmZmZiOTIyNjY=",
-              "type": "RECEIVE",
-              "blockNumber": 17278819,
-              "hash": "0xa91094497d15c36eb90ed3a24bed82466cf2b9131f1d5604b36bbfcb147a7088",
-              "status": "CONFIRMED",
-              "to": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-              "from": "0xeda5e181146b1f9a7f40f85c0da334938420d514",
-              "nonce": 5,
-              "__typename": "TransactionDetails",
-              "assetChanges": [
-                {
-                  "__typename": "TokenTransfer",
-                  "id": "VG9rZW5UcmFuc2ZlcjoweGVkYTVlMTgxMTQ2YjFmOWE3ZjQwZjg1YzBkYTMzNDkzODQyMGQ1MTRfMHhmMzlmZDZlNTFhYWQ4OGY2ZjRjZTZhYjg4MjcyNzljZmZmYjkyMjY2XzB4YTkxMDk0NDk3ZDE1YzM2ZWI5MGVkM2EyNGJlZDgyNDY2Y2YyYjkxMzFmMWQ1NjA0YjM2YmJmY2IxNDdhNzA4OA==",
-                  "asset": {
-                    "id": "VG9rZW46RVRIRVJFVU1fbnVsbA==",
-                    "name": "Ether",
-                    "symbol": "ETH",
-                    "address": null,
-                    "decimals": 18,
-                    "chain": "ETHEREUM",
-                    "standard": null,
-                    "project": {
-                      "id": "VG9rZW5Qcm9qZWN0OkVUSEVSRVVNX251bGw=",
-                      "isSpam": false,
-                      "logo": {
-                        "id": "SW1hZ2U6aHR0cHM6Ly90b2tlbi1pY29ucy5zMy5hbWF6b25hd3MuY29tL2V0aC5wbmc=",
-                        "url": "https://token-icons.s3.amazonaws.com/eth.png",
-                        "__typename": "Image"
-                      },
-                      "__typename": "TokenProject"
-                    },
-                    "__typename": "Token"
-                  },
-                  "tokenStandard": "NATIVE",
-                  "quantity": "0.15",
-                  "sender": "0xeda5e181146b1f9a7f40f85c0da334938420d514",
-                  "recipient": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-                  "direction": "IN",
-                  "transactedValue": {
-                    "id": "QW1vdW50OjI3NC40NTA1X1VTRA==",
-                    "currency": "USD",
-                    "value": 274.4505,
-                    "__typename": "Amount"
-                  }
-                }
-              ]
-            },
-            "__typename": "AssetActivity"
-          },
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhnMFkyUm1Nell6T0dRME1ERXdOV1U1WkRZMVlUZGxObUV6WVdFMlpHTXpNREZpWVRNNVpHTXlNV1ppT0dGaE5USTBNVFppT1ROaE5tWXhOVEUwTWpReVh6QjRaak01Wm1RMlpUVXhZV0ZrT0RobU5tWTBZMlUyWVdJNE9ESTNNamM1WTJabVptSTVNakkyTmw4d2VHUmxOR1F6WVRJME5XUXlZall4WW1WaE1tTmlaREl4TmpVNE1XVXlaR1ZrTmpWbFl6azFNRFE9",
-            "timestamp": 1684319903,
-            "chain": "ETHEREUM",
-            "details": {
-              "id": "VHJhbnNhY3Rpb246MHg0Y2RmMzYzOGQ0MDEwNWU5ZDY1YTdlNmEzYWE2ZGMzMDFiYTM5ZGMyMWZiOGFhNTI0MTZiOTNhNmYxNTE0MjQyXzB4ZjM5ZmQ2ZTUxYWFkODhmNmY0Y2U2YWI4ODI3Mjc5Y2ZmZmI5MjI2Nl8weGRlNGQzYTI0NWQyYjYxYmVhMmNiZDIxNjU4MWUyZGVkNjVlYzk1MDQ=",
-              "type": "SEND",
-              "blockNumber": 17278819,
-              "hash": "0x4cdf3638d40105e9d65a7e6a3aa6dc301ba39dc21fb8aa52416b93a6f1514242",
-              "status": "CONFIRMED",
-              "to": "0xde4d3a245d2b61bea2cbd216581e2ded65ec9504",
-              "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-              "nonce": 464,
-              "__typename": "TransactionDetails",
-              "assetChanges": [
-                {
-                  "__typename": "TokenTransfer",
-                  "id": "VG9rZW5UcmFuc2ZlcjoweGYzOWZkNmU1MWFhZDg4ZjZmNGNlNmFiODgyNzI3OWNmZmZiOTIyNjZfMHhkZTRkM2EyNDVkMmI2MWJlYTJjYmQyMTY1ODFlMmRlZDY1ZWM5NTA0XzB4NGNkZjM2MzhkNDAxMDVlOWQ2NWE3ZTZhM2FhNmRjMzAxYmEzOWRjMjFmYjhhYTUyNDE2YjkzYTZmMTUxNDI0Mg==",
-                  "asset": {
-                    "id": "VG9rZW46RVRIRVJFVU1fbnVsbA==",
-                    "name": "Ether",
-                    "symbol": "ETH",
-                    "address": null,
-                    "decimals": 18,
-                    "chain": "ETHEREUM",
-                    "standard": null,
-                    "project": {
-                      "id": "VG9rZW5Qcm9qZWN0OkVUSEVSRVVNX251bGw=",
-                      "isSpam": false,
-                      "logo": {
-                        "id": "SW1hZ2U6aHR0cHM6Ly90b2tlbi1pY29ucy5zMy5hbWF6b25hd3MuY29tL2V0aC5wbmc=",
-                        "url": "https://token-icons.s3.amazonaws.com/eth.png",
-                        "__typename": "Image"
-                      },
-                      "__typename": "TokenProject"
-                    },
-                    "__typename": "Token"
-                  },
-                  "tokenStandard": "NATIVE",
-                  "quantity": "0.00134999999999999",
-                  "sender": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-                  "recipient": "0xde4d3a245d2b61bea2cbd216581e2ded65ec9504",
-                  "direction": "OUT",
-                  "transactedValue": {
-                    "id": "QW1vdW50OjIuNDcwMDU0NDk5OTk5OTgyX1VTRA==",
-                    "currency": "USD",
-                    "value": 2.470054499999982,
-                    "__typename": "Amount"
-                  }
-                }
-              ]
-            },
-            "__typename": "AssetActivity"
-          },
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhnM04yRXhPVGRoWmpjek9EUXpNRFk0WVRCaVlqUmlaV1V6WWpabFptWmxaakpsTkdZMFptTXlNR1UxWVRGbVltSTBOak14WXpoak1UQTROMk15WWpjM1h6QjRaak01Wm1RMlpUVXhZV0ZrT0RobU5tWTBZMlUyWVdJNE9ESTNNamM1WTJabVptSTVNakkyTmw4d2VHWTFZekZoTnpCbU5qY3pPV0k1TW1ZNU4yTmtOVE5qTXpFMk1ETTJNbU14TXpBMVpUa3hZVGc9",
-            "timestamp": 1684202579,
-            "chain": "ETHEREUM",
-            "details": {
-              "id": "VHJhbnNhY3Rpb246MHg3N2ExOTdhZjczODQzMDY4YTBiYjRiZWUzYjZlZmZlZjJlNGY0ZmMyMGU1YTFmYmI0NjMxYzhjMTA4N2MyYjc3XzB4ZjM5ZmQ2ZTUxYWFkODhmNmY0Y2U2YWI4ODI3Mjc5Y2ZmZmI5MjI2Nl8weGY1YzFhNzBmNjczOWI5MmY5N2NkNTNjMzE2MDM2MmMxMzA1ZTkxYTg=",
-              "type": "SEND",
-              "blockNumber": 17269191,
-              "hash": "0x77a197af73843068a0bb4bee3b6effef2e4f4fc20e5a1fbb4631c8c1087c2b77",
-              "status": "CONFIRMED",
-              "to": "0xf5c1a70f6739b92f97cd53c3160362c1305e91a8",
-              "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-              "nonce": 463,
-              "__typename": "TransactionDetails",
-              "assetChanges": [
-                {
-                  "__typename": "TokenTransfer",
-                  "id": "VG9rZW5UcmFuc2ZlcjoweGYzOWZkNmU1MWFhZDg4ZjZmNGNlNmFiODgyNzI3OWNmZmZiOTIyNjZfMHhmNWMxYTcwZjY3MzliOTJmOTdjZDUzYzMxNjAzNjJjMTMwNWU5MWE4XzB4NzdhMTk3YWY3Mzg0MzA2OGEwYmI0YmVlM2I2ZWZmZWYyZTRmNGZjMjBlNWExZmJiNDYzMWM4YzEwODdjMmI3Nw==",
-                  "asset": {
-                    "id": "VG9rZW46RVRIRVJFVU1fbnVsbA==",
-                    "name": "Ether",
-                    "symbol": "ETH",
-                    "address": null,
-                    "decimals": 18,
-                    "chain": "ETHEREUM",
-                    "standard": null,
-                    "project": {
-                      "id": "VG9rZW5Qcm9qZWN0OkVUSEVSRVVNX251bGw=",
-                      "isSpam": false,
-                      "logo": {
-                        "id": "SW1hZ2U6aHR0cHM6Ly90b2tlbi1pY29ucy5zMy5hbWF6b25hd3MuY29tL2V0aC5wbmc=",
-                        "url": "https://token-icons.s3.amazonaws.com/eth.png",
-                        "__typename": "Image"
-                      },
-                      "__typename": "TokenProject"
-                    },
-                    "__typename": "Token"
-                  },
-                  "tokenStandard": "NATIVE",
-                  "quantity": "0.001216034894406018",
-                  "sender": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-                  "recipient": "0xf5c1a70f6739b92f97cd53c3160362c1305e91a8",
-                  "direction": "OUT",
-                  "transactedValue": {
-                    "id": "QW1vdW50OjIuMjI0OTQyNTY1MjQ3ODU5X1VTRA==",
-                    "currency": "USD",
-                    "value": 2.224942565247859,
-                    "__typename": "Amount"
-                  }
-                }
-              ]
-            },
-            "__typename": "AssetActivity"
-          },
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhnMlpXSmtZbVJrTVRZMk0yVmxNV1ZrT0RVeE16TXlZelUyWmpkall6YzJaV1ZqTVROaE5qTm1PVEkxTldOa1ltWXlZVEUxWWpReFl6azBPVGhrWW1Wa1h6QjROREZpTXpBNU1qTTJZemczWWpGaVl6Wm1ZVGhsWWpnMk5UZ3pNMlUwTkRFMU9HWmhPVGt4WVY4d2VHWXpPV1prTm1VMU1XRmhaRGc0WmpabU5HTmxObUZpT0RneU56STNPV05tWm1aaU9USXlOalk9",
-            "timestamp": 1684202579,
-            "chain": "ETHEREUM",
-            "details": {
-              "id": "VHJhbnNhY3Rpb246MHg2ZWJkYmRkMTY2M2VlMWVkODUxMzMyYzU2ZjdjYzc2ZWVjMTNhNjNmOTI1NWNkYmYyYTE1YjQxYzk0OThkYmVkXzB4NDFiMzA5MjM2Yzg3YjFiYzZmYThlYjg2NTgzM2U0NDE1OGZhOTkxYV8weGYzOWZkNmU1MWFhZDg4ZjZmNGNlNmFiODgyNzI3OWNmZmZiOTIyNjY=",
-              "type": "RECEIVE",
-              "blockNumber": 17269191,
-              "hash": "0x6ebdbdd1663ee1ed851332c56f7cc76eec13a63f9255cdbf2a15b41c9498dbed",
-              "status": "CONFIRMED",
-              "to": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-              "from": "0x41b309236c87b1bc6fa8eb865833e44158fa991a",
-              "nonce": 111266,
-              "__typename": "TransactionDetails",
-              "assetChanges": [
-                {
-                  "__typename": "TokenTransfer",
-                  "id": "VG9rZW5UcmFuc2ZlcjoweDQxYjMwOTIzNmM4N2IxYmM2ZmE4ZWI4NjU4MzNlNDQxNThmYTk5MWFfMHhmMzlmZDZlNTFhYWQ4OGY2ZjRjZTZhYjg4MjcyNzljZmZmYjkyMjY2XzB4NmViZGJkZDE2NjNlZTFlZDg1MTMzMmM1NmY3Y2M3NmVlYzEzYTYzZjkyNTVjZGJmMmExNWI0MWM5NDk4ZGJlZA==",
-                  "asset": {
-                    "id": "VG9rZW46RVRIRVJFVU1fbnVsbA==",
-                    "name": "Ether",
-                    "symbol": "ETH",
-                    "address": null,
-                    "decimals": 18,
-                    "chain": "ETHEREUM",
-                    "standard": null,
-                    "project": {
-                      "id": "VG9rZW5Qcm9qZWN0OkVUSEVSRVVNX251bGw=",
-                      "isSpam": false,
-                      "logo": {
-                        "id": "SW1hZ2U6aHR0cHM6Ly90b2tlbi1pY29ucy5zMy5hbWF6b25hd3MuY29tL2V0aC5wbmc=",
-                        "url": "https://token-icons.s3.amazonaws.com/eth.png",
-                        "__typename": "Image"
-                      },
-                      "__typename": "TokenProject"
-                    },
-                    "__typename": "Token"
-                  },
-                  "tokenStandard": "NATIVE",
-                  "quantity": "0.00275365",
-                  "sender": "0x41b309236c87b1bc6fa8eb865833e44158fa991a",
-                  "recipient": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-                  "direction": "IN",
-                  "transactedValue": {
-                    "id": "QW1vdW50OjUuMDM4MjcwNzk1NV9VU0Q=",
-                    "currency": "USD",
-                    "value": 5.0382707955,
-                    "__typename": "Amount"
-                  }
-                }
-              ]
-            },
-            "__typename": "AssetActivity"
-          },
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhnNU5EUmlNR00wTVROa1l6QmpNekU0TUdFelkyTTNZakUyT1RCbVlqZzBNRFExWm1FME9UTXpObUV5WmprNE16VmpORFpqTURsak1UY3lObUUzTm1aalh6QjRaak01Wm1RMlpUVXhZV0ZrT0RobU5tWTBZMlUyWVdJNE9ESTNNamM1WTJabVptSTVNakkyTmw4d2VEWXlNakJsTURoak9XUTJNMkZpTjJKaE1tVTFOalk0TXpsbU5ESTVaV1ZsWm1VeE9UbGlOMlU9",
-            "timestamp": 1684171943,
-            "chain": "ETHEREUM",
-            "details": {
-              "id": "VHJhbnNhY3Rpb246MHg5NDRiMGM0MTNkYzBjMzE4MGEzY2M3YjE2OTBmYjg0MDQ1ZmE0OTMzNmEyZjk4MzVjNDZjMDljMTcyNmE3NmZjXzB4ZjM5ZmQ2ZTUxYWFkODhmNmY0Y2U2YWI4ODI3Mjc5Y2ZmZmI5MjI2Nl8weDYyMjBlMDhjOWQ2M2FiN2JhMmU1NjY4MzlmNDI5ZWVlZmUxOTliN2U=",
-              "type": "SEND",
-              "blockNumber": 17266680,
-              "hash": "0x944b0c413dc0c3180a3cc7b1690fb84045fa49336a2f9835c46c09c1726a76fc",
-              "status": "CONFIRMED",
-              "to": "0x6220e08c9d63ab7ba2e566839f429eeefe199b7e",
-              "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-              "nonce": 462,
-              "__typename": "TransactionDetails",
-              "assetChanges": [
-                {
-                  "__typename": "TokenTransfer",
-                  "id": "VG9rZW5UcmFuc2ZlcjoweGYzOWZkNmU1MWFhZDg4ZjZmNGNlNmFiODgyNzI3OWNmZmZiOTIyNjZfMHg2MjIwZTA4YzlkNjNhYjdiYTJlNTY2ODM5ZjQyOWVlZWZlMTk5YjdlXzB4OTQ0YjBjNDEzZGMwYzMxODBhM2NjN2IxNjkwZmI4NDA0NWZhNDkzMzZhMmY5ODM1YzQ2YzA5YzE3MjZhNzZmYw==",
-                  "asset": {
-                    "id": "VG9rZW46RVRIRVJFVU1fbnVsbA==",
-                    "name": "Ether",
-                    "symbol": "ETH",
-                    "address": null,
-                    "decimals": 18,
-                    "chain": "ETHEREUM",
-                    "standard": null,
-                    "project": {
-                      "id": "VG9rZW5Qcm9qZWN0OkVUSEVSRVVNX251bGw=",
-                      "isSpam": false,
-                      "logo": {
-                        "id": "SW1hZ2U6aHR0cHM6Ly90b2tlbi1pY29ucy5zMy5hbWF6b25hd3MuY29tL2V0aC5wbmc=",
-                        "url": "https://token-icons.s3.amazonaws.com/eth.png",
-                        "__typename": "Image"
-                      },
-                      "__typename": "TokenProject"
-                    },
-                    "__typename": "Token"
-                  },
-                  "tokenStandard": "NATIVE",
-                  "quantity": "0.003476850926189204",
-                  "sender": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-                  "recipient": "0x6220e08c9d63ab7ba2e566839f429eeefe199b7e",
-                  "direction": "OUT",
-                  "transactedValue": {
-                    "id": "QW1vdW50OjYuMzYxNDg5ODM0MTIwNjAxX1VTRA==",
-                    "currency": "USD",
-                    "value": 6.361489834120601,
-                    "__typename": "Amount"
-                  }
-                }
-              ]
-            },
-            "__typename": "AssetActivity"
-          },
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhneE0yRTRNRGxsT1RZd05USmhOVGxrWlRjNU56WXhObVZrTlRjME1qTTVNakV3WkRJMVpUY3hNRGhqTkRjek9EbG1NbVJoTnpjeU5qTXhZbVZpTUdZMlh6QjRaak01Wm1RMlpUVXhZV0ZrT0RobU5tWTBZMlUyWVdJNE9ESTNNamM1WTJabVptSTVNakkyTmw4d2VEWXlNakJsTURoak9XUTJNMkZpTjJKaE1tVTFOalk0TXpsbU5ESTVaV1ZsWm1VeE9UbGlOMlU9",
-            "timestamp": 1684171943,
-            "chain": "ETHEREUM",
-            "details": {
-              "id": "VHJhbnNhY3Rpb246MHgxM2E4MDllOTYwNTJhNTlkZTc5NzYxNmVkNTc0MjM5MjEwZDI1ZTcxMDhjNDczODlmMmRhNzcyNjMxYmViMGY2XzB4ZjM5ZmQ2ZTUxYWFkODhmNmY0Y2U2YWI4ODI3Mjc5Y2ZmZmI5MjI2Nl8weDYyMjBlMDhjOWQ2M2FiN2JhMmU1NjY4MzlmNDI5ZWVlZmUxOTliN2U=",
-              "type": "SEND",
-              "blockNumber": 17266680,
-              "hash": "0x13a809e96052a59de797616ed574239210d25e7108c47389f2da772631beb0f6",
-              "status": "CONFIRMED",
-              "to": "0x6220e08c9d63ab7ba2e566839f429eeefe199b7e",
-              "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-              "nonce": 461,
-              "__typename": "TransactionDetails",
-              "assetChanges": [
-                {
-                  "__typename": "TokenTransfer",
-                  "id": "VG9rZW5UcmFuc2ZlcjoweGYzOWZkNmU1MWFhZDg4ZjZmNGNlNmFiODgyNzI3OWNmZmZiOTIyNjZfMHg2MjIwZTA4YzlkNjNhYjdiYTJlNTY2ODM5ZjQyOWVlZWZlMTk5YjdlXzB4MTNhODA5ZTk2MDUyYTU5ZGU3OTc2MTZlZDU3NDIzOTIxMGQyNWU3MTA4YzQ3Mzg5ZjJkYTc3MjYzMWJlYjBmNg==",
-                  "asset": {
-                    "id": "VG9rZW46RVRIRVJFVU1fbnVsbA==",
-                    "name": "Ether",
-                    "symbol": "ETH",
-                    "address": null,
-                    "decimals": 18,
-                    "chain": "ETHEREUM",
-                    "standard": null,
-                    "project": {
-                      "id": "VG9rZW5Qcm9qZWN0OkVUSEVSRVVNX251bGw=",
-                      "isSpam": false,
-                      "logo": {
-                        "id": "SW1hZ2U6aHR0cHM6Ly90b2tlbi1pY29ucy5zMy5hbWF6b25hd3MuY29tL2V0aC5wbmc=",
-                        "url": "https://token-icons.s3.amazonaws.com/eth.png",
-                        "__typename": "Image"
-                      },
-                      "__typename": "TokenProject"
-                    },
-                    "__typename": "Token"
-                  },
-                  "tokenStandard": "NATIVE",
-                  "quantity": "0.000900000000000318",
-                  "sender": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-                  "recipient": "0x6220e08c9d63ab7ba2e566839f429eeefe199b7e",
-                  "direction": "OUT",
-                  "transactedValue": {
-                    "id": "QW1vdW50OjEuNjQ2NzAzMDAwMDAwNTgxOF9VU0Q=",
-                    "currency": "USD",
-                    "value": 1.6467030000005818,
-                    "__typename": "Amount"
-                  }
-                }
-              ]
-            },
-            "__typename": "AssetActivity"
-          },
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhobFkyRTJNVEZrTlRVME1EZGxPVGt6WlRFM1lqWmtaVGhpWVRJMFlqWXlOREpqWVRSbFlXWTBORGN3TkRKbFpHRmtNRFE0TTJNNFptSTJabUU0WkRJNVh6QjROekU0WVRVeE5ESXhNR0kwTnpWaU9USXhOVGd6WldGaU5ERXlaV0ptTUdaaVlXUm1NMkl6T1Y4d2VHWXpPV1prTm1VMU1XRmhaRGc0WmpabU5HTmxObUZpT0RneU56STNPV05tWm1aaU9USXlOalk9",
-            "timestamp": 1684171931,
-            "chain": "ETHEREUM",
-            "details": {
-              "id": "VHJhbnNhY3Rpb246MHhlY2E2MTFkNTU0MDdlOTkzZTE3YjZkZThiYTI0YjYyNDJjYTRlYWY0NDcwNDJlZGFkMDQ4M2M4ZmI2ZmE4ZDI5XzB4NzE4YTUxNDIxMGI0NzViOTIxNTgzZWFiNDEyZWJmMGZiYWRmM2IzOV8weGYzOWZkNmU1MWFhZDg4ZjZmNGNlNmFiODgyNzI3OWNmZmZiOTIyNjY=",
-              "type": "RECEIVE",
-              "blockNumber": 17266679,
-              "hash": "0xeca611d55407e993e17b6de8ba24b6242ca4eaf447042edad0483c8fb6fa8d29",
-              "status": "CONFIRMED",
-              "to": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-              "from": "0x718a514210b475b921583eab412ebf0fbadf3b39",
-              "nonce": 92,
-              "__typename": "TransactionDetails",
-              "assetChanges": [
-                {
-                  "__typename": "TokenTransfer",
-                  "id": "VG9rZW5UcmFuc2ZlcjoweDcxOGE1MTQyMTBiNDc1YjkyMTU4M2VhYjQxMmViZjBmYmFkZjNiMzlfMHhmMzlmZDZlNTFhYWQ4OGY2ZjRjZTZhYjg4MjcyNzljZmZmYjkyMjY2XzB4ZWNhNjExZDU1NDA3ZTk5M2UxN2I2ZGU4YmEyNGI2MjQyY2E0ZWFmNDQ3MDQyZWRhZDA0ODNjOGZiNmZhOGQyOQ==",
-                  "asset": {
-                    "id": "VG9rZW46RVRIRVJFVU1fbnVsbA==",
-                    "name": "Ether",
-                    "symbol": "ETH",
-                    "address": null,
-                    "decimals": 18,
-                    "chain": "ETHEREUM",
-                    "standard": null,
-                    "project": {
-                      "id": "VG9rZW5Qcm9qZWN0OkVUSEVSRVVNX251bGw=",
-                      "isSpam": false,
-                      "logo": {
-                        "id": "SW1hZ2U6aHR0cHM6Ly90b2tlbi1pY29ucy5zMy5hbWF6b25hd3MuY29tL2V0aC5wbmc=",
-                        "url": "https://token-icons.s3.amazonaws.com/eth.png",
-                        "__typename": "Image"
-                      },
-                      "__typename": "TokenProject"
-                    },
-                    "__typename": "Token"
-                  },
-                  "tokenStandard": "NATIVE",
-                  "quantity": "0.01",
-                  "sender": "0x718a514210b475b921583eab412ebf0fbadf3b39",
-                  "recipient": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-                  "direction": "IN",
-                  "transactedValue": {
-                    "id": "QW1vdW50OjE4LjI5NjdfVVNE",
-                    "currency": "USD",
-                    "value": 18.2967,
-                    "__typename": "Amount"
-                  }
-                }
-              ]
-            },
-            "__typename": "AssetActivity"
-          },
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhnMllqTTJNelEwT1daaU1HWTROems0TkRnM1pqWmlOREkwTkRjMFkySXdNbVF5WlRVNE1EZ3dPVEpoWVRneE1EVm1ObUU0T1dOalpHTTBORGRsTURSa1h6QjRaak01Wm1RMlpUVXhZV0ZrT0RobU5tWTBZMlUyWVdJNE9ESTNNamM1WTJabVptSTVNakkyTmw4d2VEQXdNREF3TURBek1HWTBPV0ptTW1Vd01ESmxOakJqTm1Wa01UWTJNV1ppTWpNME5tUTRPREk9",
-            "timestamp": 1684085063,
-            "chain": "ETHEREUM",
-            "details": {
-              "id": "VHJhbnNhY3Rpb246MHg2YjM2MzQ0OWZiMGY4Nzk4NDg3ZjZiNDI0NDc0Y2IwMmQyZTU4MDgwOTJhYTgxMDVmNmE4OWNjZGM0NDdlMDRkXzB4ZjM5ZmQ2ZTUxYWFkODhmNmY0Y2U2YWI4ODI3Mjc5Y2ZmZmI5MjI2Nl8weDAwMDAwMDAzMGY0OWJmMmUwMDJlNjBjNmVkMTY2MWZiMjM0NmQ4ODI=",
-              "type": "UNKNOWN",
-              "blockNumber": 17259555,
-              "hash": "0x6b363449fb0f8798487f6b424474cb02d2e5808092aa8105f6a89ccdc447e04d",
-              "status": "CONFIRMED",
-              "to": "0x000000030f49bf2e002e60c6ed1661fb2346d882",
-              "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-              "nonce": 460,
-              "__typename": "TransactionDetails",
-              "assetChanges": []
-            },
-            "__typename": "AssetActivity"
-          },
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhnNFlXRTVNVFJqTkRjeU5qWTNNVGxqWkRFeE1EYzNOMkprTnpZek0yVTFOV1kyWkdWbVpXRmpPVEV4TlRjd09EZzNZVEEyWXpNNE5UTmxaV0kyTldZeVh6QjRaR0V4TTJRMk5HVmpPVFZqWkRZM056VXlPVEZpTVdNek1qRXdNamN4TWpGaVpUSXdPV1JtTUY4d2VHWXpPV1prTm1VMU1XRmhaRGc0WmpabU5HTmxObUZpT0RneU56STNPV05tWm1aaU9USXlOalk9",
-            "timestamp": 1684085051,
-            "chain": "ETHEREUM",
-            "details": {
-              "id": "VHJhbnNhY3Rpb246MHg4YWE5MTRjNDcyNjY3MTljZDExMDc3N2JkNzYzM2U1NWY2ZGVmZWFjOTExNTcwODg3YTA2YzM4NTNlZWI2NWYyXzB4ZGExM2Q2NGVjOTVjZDY3NzUyOTFiMWMzMjEwMjcxMjFiZTIwOWRmMF8weGYzOWZkNmU1MWFhZDg4ZjZmNGNlNmFiODgyNzI3OWNmZmZiOTIyNjY=",
-              "type": "RECEIVE",
-              "blockNumber": 17259554,
-              "hash": "0x8aa914c47266719cd110777bd7633e55f6defeac911570887a06c3853eeb65f2",
-              "status": "CONFIRMED",
-              "to": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-              "from": "0xda13d64ec95cd6775291b1c321027121be209df0",
-              "nonce": 832,
-              "__typename": "TransactionDetails",
-              "assetChanges": [
-                {
-                  "__typename": "TokenTransfer",
-                  "id": "VG9rZW5UcmFuc2ZlcjoweGRhMTNkNjRlYzk1Y2Q2Nzc1MjkxYjFjMzIxMDI3MTIxYmUyMDlkZjBfMHhmMzlmZDZlNTFhYWQ4OGY2ZjRjZTZhYjg4MjcyNzljZmZmYjkyMjY2XzB4OGFhOTE0YzQ3MjY2NzE5Y2QxMTA3NzdiZDc2MzNlNTVmNmRlZmVhYzkxMTU3MDg4N2EwNmMzODUzZWViNjVmMg==",
-                  "asset": {
-                    "id": "VG9rZW46RVRIRVJFVU1fbnVsbA==",
-                    "name": "Ether",
-                    "symbol": "ETH",
-                    "address": null,
-                    "decimals": 18,
-                    "chain": "ETHEREUM",
-                    "standard": null,
-                    "project": {
-                      "id": "VG9rZW5Qcm9qZWN0OkVUSEVSRVVNX251bGw=",
-                      "isSpam": false,
-                      "logo": {
-                        "id": "SW1hZ2U6aHR0cHM6Ly90b2tlbi1pY29ucy5zMy5hbWF6b25hd3MuY29tL2V0aC5wbmc=",
-                        "url": "https://token-icons.s3.amazonaws.com/eth.png",
-                        "__typename": "Image"
-                      },
-                      "__typename": "TokenProject"
-                    },
-                    "__typename": "Token"
-                  },
-                  "tokenStandard": "NATIVE",
-                  "quantity": "0.00129866",
-                  "sender": "0xda13d64ec95cd6775291b1c321027121be209df0",
-                  "recipient": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-                  "direction": "IN",
-                  "transactedValue": {
-                    "id": "QW1vdW50OjIuMzc2MTE5MjQyMl9VU0Q=",
-                    "currency": "USD",
-                    "value": 2.3761192422,
-                    "__typename": "Amount"
-                  }
-                }
-              ]
-            },
-            "__typename": "AssetActivity"
-          },
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhnM00yTXdZMlJpTnpReU9UVTJZVFUxWXpZd016YzBOemd6TkRRNVpUSmpNbVZtTURnM1lqUTVPRFl4TVdGak5EZ3dZalJrTVRFMU1UbGhZemRpTXpZNVh6QjRaak01Wm1RMlpUVXhZV0ZrT0RobU5tWTBZMlUyWVdJNE9ESTNNamM1WTJabVptSTVNakkyTmw4d2VHUXpaR1UwTkRneE5qTXlNakl5TURVME9UazJZVE0yTlRsaE5UTXlNR0k1TWpWbU5qUXhNR1k9",
-            "timestamp": 1684006019,
-            "chain": "ETHEREUM",
-            "details": {
-              "id": "VHJhbnNhY3Rpb246MHg3M2MwY2RiNzQyOTU2YTU1YzYwMzc0NzgzNDQ5ZTJjMmVmMDg3YjQ5ODYxMWFjNDgwYjRkMTE1MTlhYzdiMzY5XzB4ZjM5ZmQ2ZTUxYWFkODhmNmY0Y2U2YWI4ODI3Mjc5Y2ZmZmI5MjI2Nl8weGQzZGU0NDgxNjMyMjIyMDU0OTk2YTM2NTlhNTMyMGI5MjVmNjQxMGY=",
-              "type": "SEND",
-              "blockNumber": 17253116,
-              "hash": "0x73c0cdb742956a55c60374783449e2c2ef087b498611ac480b4d11519ac7b369",
-              "status": "CONFIRMED",
-              "to": "0xd3de4481632222054996a3659a5320b925f6410f",
-              "from": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-              "nonce": 459,
-              "__typename": "TransactionDetails",
-              "assetChanges": [
-                {
-                  "__typename": "TokenTransfer",
-                  "id": "VG9rZW5UcmFuc2ZlcjoweGYzOWZkNmU1MWFhZDg4ZjZmNGNlNmFiODgyNzI3OWNmZmZiOTIyNjZfMHhiZTgyODI1NjRlYzJiNzAwMDlmMmQ2ODk1NDAxMmViMDlmNDhiYzhkXzB4NzNjMGNkYjc0Mjk1NmE1NWM2MDM3NDc4MzQ0OWUyYzJlZjA4N2I0OTg2MTFhYzQ4MGI0ZDExNTE5YWM3YjM2OQ==",
-                  "asset": {
-                    "id": "VG9rZW46RVRIRVJFVU1fMHhkM2RlNDQ4MTYzMjIyMjA1NDk5NmEzNjU5YTUzMjBiOTI1ZjY0MTBm",
-                    "name": "EL CHAPO",
-                    "symbol": "CHAPO",
-                    "address": "0xd3de4481632222054996a3659a5320b925f6410f",
-                    "decimals": 18,
-                    "chain": "ETHEREUM",
-                    "standard": null,
-                    "project": {
-                      "id": "VG9rZW5Qcm9qZWN0OkVUSEVSRVVNXzB4ZDNkZTQ0ODE2MzIyMjIwNTQ5OTZhMzY1OWE1MzIwYjkyNWY2NDEwZg==",
-                      "isSpam": true,
-                      "logo": null,
-                      "__typename": "TokenProject"
-                    },
-                    "__typename": "Token"
-                  },
-                  "tokenStandard": "ERC20",
-                  "quantity": "50000000000000.002683081102196736",
-                  "sender": "0xf39fd6e51aad88f6f4ce6ab8827279cfffb92266",
-                  "recipient": "0xbe8282564ec2b70009f2d68954012eb09f48bc8d",
-                  "direction": "OUT",
-                  "transactedValue": null
-                }
-              ]
-            },
-            "__typename": "AssetActivity"
-          }
-        ],
-        "__typename": "Portfolio"
-      }
-    ]
-  },
-  "errors": []
-}

cypress/fixtures/mini-portfolio/uniswapx_activity.json

@@ -1,102 +0,0 @@
-{
-  "data": {
-    "portfolios": [
-      {
-        "id": "UG9ydGZvbGlvOjB4ZjM5RmQ2ZTUxYWFkODhGNkY0Y2U2YUI4ODI3Mjc5Y2ZmRmI5MjI2Ng==",
-        "assetActivities": [
-          {
-            "id": "QXNzZXRBY3Rpdml0eTpWSEpoYm5OaFkzUnBiMjQ2TUhnNE9EZGpOemN5TlRRNU1qWTVNVEkwWVRkbVpUTXlNams1TjJJNU0yUTJabUV3TjJObE1UQXhOamxrTjJJd1pXUXhObUV6TldabU16SmtOMk13TWpBeVh6QjRaREkzTXpnek1EUTRaalF4WldZMlpXRXhaV1EzWWpBeFltVTVOemRqTjJVME1HSXdaRGswTmw4d2VEUTNZVFF5TVdKalpXTTJORE5oWWpSallURmpZamc0TmpOaU4yWm1PV0ppWm1SaU5HVmlNVE09",
-            "timestamp": 1691001923,
-            "type": "SWAP_ORDER",
-            "chain": "ETHEREUM",
-            "details": {
-                "__typename": "TransactionDetails",
-                "id": "VHJhbnNhY3Rpb246MHg4ODdjNzcyNTQ5MjY5MTI0YTdmZTMyMjk5N2I5M2Q2ZmEwN2NlMTAxNjlkN2IwZWQxNmEzNWZmMzJkN2MwMjAyXzB4ZDI3MzgzMDQ4ZjQxZWY2ZWExZWQ3YjAxYmU5NzdjN2U0MGIwZDk0Nl8weDQ3YTQyMWJjZWM2NDNhYjRjYTFjYjg4NjNiN2ZmOWJiZmRiNGViMTM=",
-                "type": "SWAP_ORDER",
-                "from": "0xd27383048f41ef6ea1ed7b01be977c7e40b0d946",
-                "to": "0x47a421bcec643ab4ca1cb8863b7ff9bbfdb4eb13",
-                "hash": "0x9f8382a94ee80ca119bc690908ab5f69c4c72f7497ee10f37e9ede0ded83cca6",
-                "nonce": 439,
-                "status": "CONFIRMED"
-            },
-            "assetChanges": [
-                {
-                    "__typename": "TokenTransfer",
-                    "id": "VG9rZW5UcmFuc2ZlcjoweDgwYmVjYjgwOGJmYWRlNDE0MzE4M2U1OGQxOGYyMDgwZTg0ZTU3YTFfMHg0N2E0MjFiY2VjNjQzYWI0Y2ExY2I4ODYzYjdmZjliYmZkYjRlYjEzXzB4ODg3Yzc3MjU0OTI2OTEyNGE3ZmUzMjI5OTdiOTNkNmZhMDdjZTEwMTY5ZDdiMGVkMTZhMzVmZjMyZDdjMDIwMg==",
-                    "asset": {
-                        "id": "VG9rZW46RVRIRVJFVU1fMHhhMGI4Njk5MWM2MjE4YjM2YzFkMTlkNGEyZTllYjBjZTM2MDZlYjQ4",
-                        "name": "USD Coin",
-                        "symbol": "USDC",
-                        "address": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
-                        "decimals": 6,
-                        "chain": "ETHEREUM",
-                        "standard": null,
-                        "project": {
-                            "id": "VG9rZW5Qcm9qZWN0OkVUSEVSRVVNXzB4YTBiODY5OTFjNjIxOGIzNmMxZDE5ZDRhMmU5ZWIwY2UzNjA2ZWI0OA==",
-                            "isSpam": false,
-                            "logo": {
-                                "id": "SW1hZ2U6aHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL1VuaXN3YXAvYXNzZXRzL21hc3Rlci9ibG9ja2NoYWlucy9ldGhlcmV1bS9hc3NldHMvMHhBMGI4Njk5MWM2MjE4YjM2YzFkMTlENGEyZTlFYjBjRTM2MDZlQjQ4L2xvZ28ucG5n",
-                                "url": "https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png",
-                                "__typename": "Image"
-                            },
-                            "__typename": "TokenProject"
-                        },
-                        "__typename": "Token"
-                    },
-                    "tokenStandard": "ERC20",
-                    "quantity": "300.0",
-                    "sender": "0x80becb808bfade4143183e58d18f2080e84e57a1",
-                    "recipient": "0x47a421bcec643ab4ca1cb8863b7ff9bbfdb4eb13",
-                    "direction": "OUT",
-                    "transactedValue": {
-                        "id": "QW1vdW50OjMwMC4xNDkxNTIwOTE5NDE2M19VU0Q=",
-                        "currency": "USD",
-                        "value": 300.14915209194163,
-                        "__typename": "Amount"
-                    }
-                },
-                {
-                    "__typename": "TokenTransfer",
-                    "id": "VG9rZW5UcmFuc2ZlcjoweDQ3YTQyMWJjZWM2NDNhYjRjYTFjYjg4NjNiN2ZmOWJiZmRiNGViMTNfMHg4MGJlY2I4MDhiZmFkZTQxNDMxODNlNThkMThmMjA4MGU4NGU1N2ExXzB4ODg3Yzc3MjU0OTI2OTEyNGE3ZmUzMjI5OTdiOTNkNmZhMDdjZTEwMTY5ZDdiMGVkMTZhMzVmZjMyZDdjMDIwMg==",
-                    "asset": {
-                        "id": "VG9rZW46RVRIRVJFVU1fMHg2YjE3NTQ3NGU4OTA5NGM0NGRhOThiOTU0ZWVkZWFjNDk1MjcxZDBm",
-                        "name": "Dai Stablecoin",
-                        "symbol": "DAI",
-                        "address": "0x6b175474e89094c44da98b954eedeac495271d0f",
-                        "decimals": 18,
-                        "chain": "ETHEREUM",
-                        "standard": null,
-                        "project": {
-                            "id": "VG9rZW5Qcm9qZWN0OkVUSEVSRVVNXzB4NmIxNzU0NzRlODkwOTRjNDRkYTk4Yjk1NGVlZGVhYzQ5NTI3MWQwZg==",
-                            "isSpam": false,
-                            "logo": {
-                                "id": "SW1hZ2U6aHR0cHM6Ly9yYXcuZ2l0aHVidXNlcmNvbnRlbnQuY29tL1VuaXN3YXAvYXNzZXRzL21hc3Rlci9ibG9ja2NoYWlucy9ldGhlcmV1bS9hc3NldHMvMHg2QjE3NTQ3NEU4OTA5NEM0NERhOThiOTU0RWVkZUFDNDk1MjcxZDBGL2xvZ28ucG5n",
-                                "url": "https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png",
-                                "__typename": "Image"
-                            },
-                            "__typename": "TokenProject"
-                        },
-                        "__typename": "Token"
-                    },
-                    "tokenStandard": "ERC20",
-                    "quantity": "280.573117586837733376",
-                    "sender": "0x47a421bcec643ab4ca1cb8863b7ff9bbfdb4eb13",
-                    "recipient": "0x80becb808bfade4143183e58d18f2080e84e57a1",
-                    "direction": "IN",
-                    "transactedValue": {
-                        "id": "QW1vdW50OjI4MC42ODc3OTU0NTg2ODE4X1VTRA==",
-                        "currency": "USD",
-                        "value": 280.6877954586818,
-                        "__typename": "Amount"
-                    }
-                }
-            ],
-            "__typename": "AssetActivity"
-        }
-        ],
-        "__typename": "Portfolio"
-      }
-    ]
-  },
-  "errors": []
-}

cypress/fixtures/uniswapx/expiredStatusResponse.json

@@ -1,26 +0,0 @@
-{
-  "orders": [
-    {
-      "outputs": [
-        {
-          "recipient": "0x80becb808bfade4143183e58d18f2080e84e57a1",
-          "startAmount": "91371770080538616664",
-          "endAmount": "90914911230135923580",
-          "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
-        }
-      ],
-      "encodedOrder": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000064837e2a0000000000000000000000000000000000000000000000000000000064837e6600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000bd7f9d0239f81c94b728d827a87b9864972661ec00000000000000000000000080becb808bfade4143183e58d18f2080e84e57a18e32c6335b6f657322448399bd12ff5c22b7b1aa770850ff4eed36c750e2de000000000000000000000000000000000000000000000000000000000064837e66000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000004f409bcc7a52b6358000000000000000000000000000000000000000000000004edb2a613726c737c00000000000000000000000080becb808bfade4143183e58d18f2080e84e57a1",
-      "signature": "0x973882a290778b5c8aae691ef777385259928cde0513d224ea1131538379258d2db7a69804110320b08558380394879a31ab8dea61152c2dba7623acbfa11d0e1b",
-      "input": {
-        "endAmount": "100000000",
-        "token": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-        "startAmount": "100000000"
-      },
-      "orderStatus": "expired",
-      "createdAt": 1686339087,
-      "chainId": 1,
-      "orderHash": "0xa9dd6f05ad6d6c79bee654c31ede4d0d2392862711be0f3bc4a9124af24a6a19",
-      "type": "Dutch"
-    }
-  ]
-}

cypress/fixtures/uniswapx/fillTransactionReceipt.json

@@ -1,114 +0,0 @@
-{
-  "to": "0xbD7F9D0239f81C94b728d827a87b9864972661eC",
-  "from": "0xa17Fbb0b5a251A7ACA3BD7377e7eCC4F700A2C09",
-  "contractAddress": null,
-  "transactionIndex": 61,
-  "gasUsed": {
-    "type": "BigNumber",
-    "hex": "0x03e0c8"
-  },
-  "logsBloom":
-    "0x00000000000000000000008000200100000020000000000000000000000000000000000000000000000000010000000000000000000020000000000001000000000280000000000808000008000000000000000000000000000000000000200010000000100000000008000000000004402000080000000000000010000800000000000000000800000800000000000000000000010000000000000000000000000000000000200000000000005000000000000000000000000000000000000000000002000000000000000000000000040002000000000000000100000000090000000400000000000400000020080000000000000000000000000000000000",
-  "blockHash": "0x79cf0785f317f984eeaf737c592afff806cabf4fe0c46a84f62a4a0212cfab5c",
-  "transactionHash": "0x9f8382a94ee80ca119bc690908ab5f69c4c72f7497ee10f37e9ede0ded83cca6",
-  "logs": [
-    {
-      "transactionIndex": 61,
-      "blockNumber": 17444757,
-      "transactionHash": "0x9f8382a94ee80ca119bc690908ab5f69c4c72f7497ee10f37e9ede0ded83cca6",
-      "address": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-      "topics": [
-        "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-        "0x00000000000000000000000080becb808bfade4143183e58d18f2080e84e57a1",
-        "0x000000000000000000000000c59938e2d9ff9a0ecccbedf39031b1600d008eaf"
-      ],
-      "data": "0x0000000000000000000000000000000000000000000000000000000005f5e100",
-      "logIndex": 103,
-      "blockHash": "0x79cf0785f317f984eeaf737c592afff806cabf4fe0c46a84f62a4a0212cfab5c"
-    },
-    {
-      "transactionIndex": 61,
-      "blockNumber": 17444757,
-      "transactionHash": "0x9f8382a94ee80ca119bc690908ab5f69c4c72f7497ee10f37e9ede0ded83cca6",
-      "address": "0xbD7F9D0239f81C94b728d827a87b9864972661eC",
-      "topics": [
-        "0x78ad7ec0e9f89e74012afa58738b6b661c024cb0fd185ee2f616c0a28924bd66",
-        "0xd10e1d90145460003d98ba4b788564e9549cc93c65a12c9b297720a9d6a586de",
-        "0x000000000000000000000000a17fbb0b5a251a7aca3bd7377e7ecc4f700a2c09",
-        "0x00000000000000000000000080becb808bfade4143183e58d18f2080e84e57a1"
-      ],
-      "data": "0x8e32c6335b6f657322448399bd12ff5c22b7b1aa770850ff4eed36c750e2de00",
-      "logIndex": 104,
-      "blockHash": "0x79cf0785f317f984eeaf737c592afff806cabf4fe0c46a84f62a4a0212cfab5c"
-    },
-    {
-      "transactionIndex": 61,
-      "blockNumber": 17444757,
-      "transactionHash": "0x9f8382a94ee80ca119bc690908ab5f69c4c72f7497ee10f37e9ede0ded83cca6",
-      "address": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-      "topics": [
-        "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-        "0x0000000000000000000000005777d92f208679db4b9778590fa3cab3ac9e2168",
-        "0x000000000000000000000000c59938e2d9ff9a0ecccbedf39031b1600d008eaf"
-      ],
-      "data": "0x0000000000000000000000000000000000000000000000056b9a675be430b502",
-      "logIndex": 105,
-      "blockHash": "0x79cf0785f317f984eeaf737c592afff806cabf4fe0c46a84f62a4a0212cfab5c"
-    },
-    {
-      "transactionIndex": 61,
-      "blockNumber": 17444757,
-      "transactionHash": "0x9f8382a94ee80ca119bc690908ab5f69c4c72f7497ee10f37e9ede0ded83cca6",
-      "address": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-      "topics": [
-        "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-        "0x000000000000000000000000c59938e2d9ff9a0ecccbedf39031b1600d008eaf",
-        "0x0000000000000000000000005777d92f208679db4b9778590fa3cab3ac9e2168"
-      ],
-      "data": "0x0000000000000000000000000000000000000000000000000000000005f5e100",
-      "logIndex": 106,
-      "blockHash": "0x79cf0785f317f984eeaf737c592afff806cabf4fe0c46a84f62a4a0212cfab5c"
-    },
-    {
-      "transactionIndex": 61,
-      "blockNumber": 17444757,
-      "transactionHash": "0x9f8382a94ee80ca119bc690908ab5f69c4c72f7497ee10f37e9ede0ded83cca6",
-      "address": "0x5777d92f208679DB4b9778590Fa3CAB3aC9e2168",
-      "topics": [
-        "0xc42079f94a6350d7e6235f29174924f928cc2ac818eb64fed8004e115fbcca67",
-        "0x00000000000000000000000068b3465833fb72a70ecdf485e0e4c7bd8665fc45",
-        "0x000000000000000000000000c59938e2d9ff9a0ecccbedf39031b1600d008eaf"
-      ],
-      "data": "0xfffffffffffffffffffffffffffffffffffffffffffffffa946598a41bcf4afe0000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000010c7063b90a5e90d13830000000000000000000000000000000000000000000071b57cb2bb0b5b28224ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbc89c",
-      "logIndex": 107,
-      "blockHash": "0x79cf0785f317f984eeaf737c592afff806cabf4fe0c46a84f62a4a0212cfab5c"
-    },
-    {
-      "transactionIndex": 61,
-      "blockNumber": 17444757,
-      "transactionHash": "0x9f8382a94ee80ca119bc690908ab5f69c4c72f7497ee10f37e9ede0ded83cca6",
-      "address": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-      "topics": [
-        "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef",
-        "0x000000000000000000000000c59938e2d9ff9a0ecccbedf39031b1600d008eaf",
-        "0x00000000000000000000000080becb808bfade4143183e58d18f2080e84e57a1"
-      ],
-      "data": "0x000000000000000000000000000000000000000000000004f409bcc7a52b6358",
-      "logIndex": 108,
-      "blockHash": "0x79cf0785f317f984eeaf737c592afff806cabf4fe0c46a84f62a4a0212cfab5c"
-    }
-  ],
-  "blockNumber": 17444757,
-  "confirmations": 392238,
-  "cumulativeGasUsed": {
-    "type": "BigNumber",
-    "hex": "0x4065ac"
-  },
-  "effectiveGasPrice": {
-    "type": "BigNumber",
-    "hex": "0x04aa792df0"
-  },
-  "status": 1,
-  "type": 2,
-  "byzantium": true
-}

cypress/fixtures/uniswapx/filledStatusResponse.json

@@ -1,33 +0,0 @@
-{
-  "orders": [
-    {
-      "outputs": [
-        {
-          "recipient": "0x80becb808bfade4143183e58d18f2080e84e57a1",
-          "startAmount": "91371770080538616664",
-          "endAmount": "90914911230135923580",
-          "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
-        }
-      ],
-      "encodedOrder": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000064837e2a0000000000000000000000000000000000000000000000000000000064837e6600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000bd7f9d0239f81c94b728d827a87b9864972661ec00000000000000000000000080becb808bfade4143183e58d18f2080e84e57a18e32c6335b6f657322448399bd12ff5c22b7b1aa770850ff4eed36c750e2de000000000000000000000000000000000000000000000000000000000064837e66000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000004f409bcc7a52b6358000000000000000000000000000000000000000000000004edb2a613726c737c00000000000000000000000080becb808bfade4143183e58d18f2080e84e57a1",
-      "signature": "0x973882a290778b5c8aae691ef777385259928cde0513d224ea1131538379258d2db7a69804110320b08558380394879a31ab8dea61152c2dba7623acbfa11d0e1b",
-      "input": {
-        "endAmount": "100000000",
-        "token": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-        "startAmount": "100000000"
-      },
-      "settledAmounts": [
-        {
-          "tokenOut": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-          "amountOut": "91371770080538616664"
-        }
-      ],
-      "orderStatus": "filled",
-      "txHash": "0x9f8382a94ee80ca119bc690908ab5f69c4c72f7497ee10f37e9ede0ded83cca6",
-      "createdAt": 1686339087,
-      "chainId": 1,
-      "orderHash": "0xa9dd6f05ad6d6c79bee654c31ede4d0d2392862711be0f3bc4a9124af24a6a19",
-      "type": "Dutch"
-    }
-  ]
-}

cypress/fixtures/uniswapx/insufficientFundsStatusResponse.json

@@ -1,26 +0,0 @@
-{
-  "orders": [
-    {
-      "outputs": [
-        {
-          "recipient": "0x80becb808bfade4143183e58d18f2080e84e57a1",
-          "startAmount": "91371770080538616664",
-          "endAmount": "90914911230135923580",
-          "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
-        }
-      ],
-      "encodedOrder": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000064837e2a0000000000000000000000000000000000000000000000000000000064837e6600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000bd7f9d0239f81c94b728d827a87b9864972661ec00000000000000000000000080becb808bfade4143183e58d18f2080e84e57a18e32c6335b6f657322448399bd12ff5c22b7b1aa770850ff4eed36c750e2de000000000000000000000000000000000000000000000000000000000064837e66000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000004f409bcc7a52b6358000000000000000000000000000000000000000000000004edb2a613726c737c00000000000000000000000080becb808bfade4143183e58d18f2080e84e57a1",
-      "signature": "0x973882a290778b5c8aae691ef777385259928cde0513d224ea1131538379258d2db7a69804110320b08558380394879a31ab8dea61152c2dba7623acbfa11d0e1b",
-      "input": {
-        "endAmount": "100000000",
-        "token": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-        "startAmount": "100000000"
-      },
-      "orderStatus": "insufficient-funds",
-      "createdAt": 1686339087,
-      "chainId": 1,
-      "orderHash": "0xa9dd6f05ad6d6c79bee654c31ede4d0d2392862711be0f3bc4a9124af24a6a19",
-      "type": "Dutch"
-    }
-  ]
-}

cypress/fixtures/uniswapx/openStatusResponse.json

@@ -1,26 +0,0 @@
-{
-  "orders": [
-    {
-      "outputs": [
-        {
-          "recipient": "0x80becb808bfade4143183e58d18f2080e84e57a1",
-          "startAmount": "91371770080538616664",
-          "endAmount": "90914911230135923580",
-          "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F"
-        }
-      ],
-      "encodedOrder": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000064837e2a0000000000000000000000000000000000000000000000000000000064837e6600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000005f5e1000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000bd7f9d0239f81c94b728d827a87b9864972661ec00000000000000000000000080becb808bfade4143183e58d18f2080e84e57a18e32c6335b6f657322448399bd12ff5c22b7b1aa770850ff4eed36c750e2de000000000000000000000000000000000000000000000000000000000064837e66000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000004f409bcc7a52b6358000000000000000000000000000000000000000000000004edb2a613726c737c00000000000000000000000080becb808bfade4143183e58d18f2080e84e57a1",
-      "signature": "0x973882a290778b5c8aae691ef777385259928cde0513d224ea1131538379258d2db7a69804110320b08558380394879a31ab8dea61152c2dba7623acbfa11d0e1b",
-      "input": {
-        "endAmount": "100000000",
-        "token": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-        "startAmount": "100000000"
-      },
-      "orderStatus": "open",
-      "createdAt": 1686339087,
-      "chainId": 1,
-      "orderHash": "0xa9dd6f05ad6d6c79bee654c31ede4d0d2392862711be0f3bc4a9124af24a6a19",
-      "type": "Dutch"
-    }
-  ]
-}

cypress/fixtures/uniswapx/orderResponse.json

@@ -1 +0,0 @@
-{"hash":"0xa9dd6f05ad6d6c79bee654c31ede4d0d2392862711be0f3bc4a9124af24a6a19"}

cypress/fixtures/uniswapx/quote1.json

@@ -1,493 +0,0 @@
-{
-    "routing": "DUTCH_LIMIT",
-    "quote": {
-        "orderInfo": {
-            "chainId": 1,
-            "permit2Address": "0x000000000022d473030f116ddee9f6b43ac78ba3",
-            "reactor": "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4",
-            "swapper": "0x67d615D6bccAA1562B1cca9786384b4840597ecD",
-            "nonce": "57335948072881703373319552024074512292695687510330025934414357004397546394368",
-            "deadline": 1690902198,
-            "additionalValidationContract": "0x0000000000000000000000000000000000000000",
-            "additionalValidationData": "0x",
-            "decayStartTime": 1690902126,
-            "decayEndTime": 1690902186,
-            "exclusiveFiller": "0x0000000000000000000000000000000000000000",
-            "exclusivityOverrideBps": "0",
-            "input": {
-                "token": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-                "startAmount": "300000000",
-                "endAmount": "300000000"
-            },
-            "outputs": [
-                {
-                    "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-                    "startAmount": "289951120815684452958",
-                    "endAmount": "267060007981523637666",
-                    "recipient": "0x67d615D6bccAA1562B1cca9786384b4840597ecD"
-                }
-            ]
-        },
-        "encodedOrder": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000064c91e6e0000000000000000000000000000000000000000000000000000000064c91eaa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000011e1a3000000000000000000000000000000000000000000000000000000000011e1a30000000000000000000000000000000000000000000000000000000000000002000000000000000000000000006000da47483062a0d734ba3dc7576ce6a0b645c400000000000000000000000067d615d6bccaa1562b1cca9786384b4840597ecd7ec2ff20796a08922e11fd828e3871a6aa9a80e6495e30cd41be24b7e37953000000000000000000000000000000000000000000000000000000000064c91eb6000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000fb7e15027ad3e025e00000000000000000000000000000000000000000000000e7a33be508bb395a200000000000000000000000067d615d6bccaa1562b1cca9786384b4840597ecd",
-        "quoteId": "f9f47cd7-a62c-4622-9ac7-51d0e662245a",
-        "requestId": "2d16f993-6429-4755-ba50-1383789459dc",
-        "auctionPeriodSecs": 60,
-        "startTimeBufferSecs": 30,
-        "deadlineBufferSecs": 12,
-        "slippageTolerance": "0.5",
-        "permitData": {
-            "domain": {
-                "name": "Permit2",
-                "chainId": 1,
-                "verifyingContract": "0x000000000022d473030f116ddee9f6b43ac78ba3"
-            },
-            "types": {
-                "PermitWitnessTransferFrom": [
-                    {
-                        "name": "permitted",
-                        "type": "TokenPermissions"
-                    },
-                    {
-                        "name": "spender",
-                        "type": "address"
-                    },
-                    {
-                        "name": "nonce",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "deadline",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "witness",
-                        "type": "ExclusiveDutchOrder"
-                    }
-                ],
-                "TokenPermissions": [
-                    {
-                        "name": "token",
-                        "type": "address"
-                    },
-                    {
-                        "name": "amount",
-                        "type": "uint256"
-                    }
-                ],
-                "ExclusiveDutchOrder": [
-                    {
-                        "name": "info",
-                        "type": "OrderInfo"
-                    },
-                    {
-                        "name": "decayStartTime",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "decayEndTime",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "exclusiveFiller",
-                        "type": "address"
-                    },
-                    {
-                        "name": "exclusivityOverrideBps",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "inputToken",
-                        "type": "address"
-                    },
-                    {
-                        "name": "inputStartAmount",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "inputEndAmount",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "outputs",
-                        "type": "DutchOutput[]"
-                    }
-                ],
-                "OrderInfo": [
-                    {
-                        "name": "reactor",
-                        "type": "address"
-                    },
-                    {
-                        "name": "swapper",
-                        "type": "address"
-                    },
-                    {
-                        "name": "nonce",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "deadline",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "additionalValidationContract",
-                        "type": "address"
-                    },
-                    {
-                        "name": "additionalValidationData",
-                        "type": "bytes"
-                    }
-                ],
-                "DutchOutput": [
-                    {
-                        "name": "token",
-                        "type": "address"
-                    },
-                    {
-                        "name": "startAmount",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "endAmount",
-                        "type": "uint256"
-                    },
-                    {
-                        "name": "recipient",
-                        "type": "address"
-                    }
-                ]
-            },
-            "values": {
-                "permitted": {
-                    "token": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-                    "amount": {
-                        "type": "BigNumber",
-                        "hex": "0x11e1a300"
-                    }
-                },
-                "spender": "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4",
-                "nonce": {
-                    "type": "BigNumber",
-                    "hex": "0x7ec2ff20796a08922e11fd828e3871a6aa9a80e6495e30cd41be24b7e3795300"
-                },
-                "deadline": 1690902198,
-                "witness": {
-                    "info": {
-                        "reactor": "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4",
-                        "swapper": "0x67d615D6bccAA1562B1cca9786384b4840597ecD",
-                        "nonce": {
-                            "type": "BigNumber",
-                            "hex": "0x7ec2ff20796a08922e11fd828e3871a6aa9a80e6495e30cd41be24b7e3795300"
-                        },
-                        "deadline": 1690902198,
-                        "additionalValidationContract": "0x0000000000000000000000000000000000000000",
-                        "additionalValidationData": "0x"
-                    },
-                    "decayStartTime": 1690902126,
-                    "decayEndTime": 1690902186,
-                    "exclusiveFiller": "0x0000000000000000000000000000000000000000",
-                    "exclusivityOverrideBps": {
-                        "type": "BigNumber",
-                        "hex": "0x00"
-                    },
-                    "inputToken": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-                    "inputStartAmount": {
-                        "type": "BigNumber",
-                        "hex": "0x11e1a300"
-                    },
-                    "inputEndAmount": {
-                        "type": "BigNumber",
-                        "hex": "0x11e1a300"
-                    },
-                    "outputs": [
-                        {
-                            "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-                            "startAmount": {
-                                "type": "BigNumber",
-                                "hex": "0x0fb7e15027ad3e025e"
-                            },
-                            "endAmount": {
-                                "type": "BigNumber",
-                                "hex": "0x0e7a33be508bb395a2"
-                            },
-                            "recipient": "0x67d615D6bccAA1562B1cca9786384b4840597ecD"
-                        }
-                    ]
-                }
-            }
-        }
-    },
-    "requestId": "2d16f993-6429-4755-ba50-1383789459dc",
-    "allQuotes": [
-        {
-            "routing": "DUTCH_LIMIT",
-            "quote": {
-                "orderInfo": {
-                    "chainId": 1,
-                    "permit2Address": "0x000000000022d473030f116ddee9f6b43ac78ba3",
-                    "reactor": "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4",
-                    "swapper": "0x67d615D6bccAA1562B1cca9786384b4840597ecD",
-                    "nonce": "57335948072881703373319552024074512292695687510330025934414357004397546394368",
-                    "deadline": 1690902198,
-                    "additionalValidationContract": "0x0000000000000000000000000000000000000000",
-                    "additionalValidationData": "0x",
-                    "decayStartTime": 1690902126,
-                    "decayEndTime": 1690902186,
-                    "exclusiveFiller": "0x0000000000000000000000000000000000000000",
-                    "exclusivityOverrideBps": "0",
-                    "input": {
-                        "token": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-                        "startAmount": "300000000",
-                        "endAmount": "300000000"
-                    },
-                    "outputs": [
-                        {
-                            "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-                            "startAmount": "289951120815684452958",
-                            "endAmount": "267060007981523637666",
-                            "recipient": "0x67d615D6bccAA1562B1cca9786384b4840597ecD"
-                        }
-                    ]
-                },
-                "encodedOrder": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000064c91e6e0000000000000000000000000000000000000000000000000000000064c91eaa00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000000000000000000000000000000000000011e1a3000000000000000000000000000000000000000000000000000000000011e1a30000000000000000000000000000000000000000000000000000000000000002000000000000000000000000006000da47483062a0d734ba3dc7576ce6a0b645c400000000000000000000000067d615d6bccaa1562b1cca9786384b4840597ecd7ec2ff20796a08922e11fd828e3871a6aa9a80e6495e30cd41be24b7e37953000000000000000000000000000000000000000000000000000000000064c91eb6000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000000fb7e15027ad3e025e00000000000000000000000000000000000000000000000e7a33be508bb395a200000000000000000000000067d615d6bccaa1562b1cca9786384b4840597ecd",
-                "quoteId": "f9f47cd7-a62c-4622-9ac7-51d0e662245a",
-                "requestId": "2d16f993-6429-4755-ba50-1383789459dc",
-                "auctionPeriodSecs": 60,
-                "startTimeBufferSecs": 30,
-                "deadlineBufferSecs": 12,
-                "slippageTolerance": "0.5",
-                "permitData": {
-                    "domain": {
-                        "name": "Permit2",
-                        "chainId": 1,
-                        "verifyingContract": "0x000000000022d473030f116ddee9f6b43ac78ba3"
-                    },
-                    "types": {
-                        "PermitWitnessTransferFrom": [
-                            {
-                                "name": "permitted",
-                                "type": "TokenPermissions"
-                            },
-                            {
-                                "name": "spender",
-                                "type": "address"
-                            },
-                            {
-                                "name": "nonce",
-                                "type": "uint256"
-                            },
-                            {
-                                "name": "deadline",
-                                "type": "uint256"
-                            },
-                            {
-                                "name": "witness",
-                                "type": "ExclusiveDutchOrder"
-                            }
-                        ],
-                        "TokenPermissions": [
-                            {
-                                "name": "token",
-                                "type": "address"
-                            },
-                            {
-                                "name": "amount",
-                                "type": "uint256"
-                            }
-                        ],
-                        "ExclusiveDutchOrder": [
-                            {
-                                "name": "info",
-                                "type": "OrderInfo"
-                            },
-                            {
-                                "name": "decayStartTime",
-                                "type": "uint256"
-                            },
-                            {
-                                "name": "decayEndTime",
-                                "type": "uint256"
-                            },
-                            {
-                                "name": "exclusiveFiller",
-                                "type": "address"
-                            },
-                            {
-                                "name": "exclusivityOverrideBps",
-                                "type": "uint256"
-                            },
-                            {
-                                "name": "inputToken",
-                                "type": "address"
-                            },
-                            {
-                                "name": "inputStartAmount",
-                                "type": "uint256"
-                            },
-                            {
-                                "name": "inputEndAmount",
-                                "type": "uint256"
-                            },
-                            {
-                                "name": "outputs",
-                                "type": "DutchOutput[]"
-                            }
-                        ],
-                        "OrderInfo": [
-                            {
-                                "name": "reactor",
-                                "type": "address"
-                            },
-                            {
-                                "name": "swapper",
-                                "type": "address"
-                            },
-                            {
-                                "name": "nonce",
-                                "type": "uint256"
-                            },
-                            {
-                                "name": "deadline",
-                                "type": "uint256"
-                            },
-                            {
-                                "name": "additionalValidationContract",
-                                "type": "address"
-                            },
-                            {
-                                "name": "additionalValidationData",
-                                "type": "bytes"
-                            }
-                        ],
-                        "DutchOutput": [
-                            {
-                                "name": "token",
-                                "type": "address"
-                            },
-                            {
-                                "name": "startAmount",
-                                "type": "uint256"
-                            },
-                            {
-                                "name": "endAmount",
-                                "type": "uint256"
-                            },
-                            {
-                                "name": "recipient",
-                                "type": "address"
-                            }
-                        ]
-                    },
-                    "values": {
-                        "permitted": {
-                            "token": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-                            "amount": {
-                                "type": "BigNumber",
-                                "hex": "0x11e1a300"
-                            }
-                        },
-                        "spender": "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4",
-                        "nonce": {
-                            "type": "BigNumber",
-                            "hex": "0x7ec2ff20796a08922e11fd828e3871a6aa9a80e6495e30cd41be24b7e3795300"
-                        },
-                        "deadline": 1690902198,
-                        "witness": {
-                            "info": {
-                                "reactor": "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4",
-                                "swapper": "0x67d615D6bccAA1562B1cca9786384b4840597ecD",
-                                "nonce": {
-                                    "type": "BigNumber",
-                                    "hex": "0x7ec2ff20796a08922e11fd828e3871a6aa9a80e6495e30cd41be24b7e3795300"
-                                },
-                                "deadline": 1690902198,
-                                "additionalValidationContract": "0x0000000000000000000000000000000000000000",
-                                "additionalValidationData": "0x"
-                            },
-                            "decayStartTime": 1690902126,
-                            "decayEndTime": 1690902186,
-                            "exclusiveFiller": "0x0000000000000000000000000000000000000000",
-                            "exclusivityOverrideBps": {
-                                "type": "BigNumber",
-                                "hex": "0x00"
-                            },
-                            "inputToken": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-                            "inputStartAmount": {
-                                "type": "BigNumber",
-                                "hex": "0x11e1a300"
-                            },
-                            "inputEndAmount": {
-                                "type": "BigNumber",
-                                "hex": "0x11e1a300"
-                            },
-                            "outputs": [
-                                {
-                                    "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-                                    "startAmount": {
-                                        "type": "BigNumber",
-                                        "hex": "0x0fb7e15027ad3e025e"
-                                    },
-                                    "endAmount": {
-                                        "type": "BigNumber",
-                                        "hex": "0x0e7a33be508bb395a2"
-                                    },
-                                    "recipient": "0x67d615D6bccAA1562B1cca9786384b4840597ecD"
-                                }
-                            ]
-                        }
-                    }
-                }
-            }
-        },
-        {
-            "routing": "CLASSIC",
-            "quote": {
-                "blockNumber": "17820918",
-                "amount": "300000000",
-                "amountDecimals": "300",
-                "quote": "299952256425393549464",
-                "quoteDecimals": "299.952256425393549464",
-                "quoteGasAdjusted": "289922128602824170541",
-                "quoteGasAdjustedDecimals": "289.922128602824170541",
-                "gasUseEstimateQuote": "10030127822569378922",
-                "gasUseEstimateQuoteDecimals": "10.030127822569378922",
-                "gasUseEstimate": "128000",
-                "gasUseEstimateUSD": "10.031724",
-                "simulationStatus": "UNATTEMPTED",
-                "simulationError": false,
-                "gasPriceWei": "42803167855",
-                "route": [
-                    [
-                        {
-                            "type": "v3-pool",
-                            "address": "0x5777d92f208679DB4b9778590Fa3CAB3aC9e2168",
-                            "tokenIn": {
-                                "chainId": 1,
-                                "decimals": "6",
-                                "address": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
-                                "symbol": "USDC"
-                            },
-                            "tokenOut": {
-                                "chainId": 1,
-                                "decimals": "18",
-                                "address": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-                                "symbol": "DAI"
-                            },
-                            "fee": "100",
-                            "liquidity": "534676532046235168447130",
-                            "sqrtRatioX96": "79230505815006815109584",
-                            "tickCurrent": "-276324",
-                            "amountIn": "300000000",
-                            "amountOut": "299952256425393549464"
-                        }
-                    ]
-                ],
-                "routeString": "[V3] 100.00% = USDC -- 0.01% [0x5777d92f208679DB4b9778590Fa3CAB3aC9e2168] --> DAI",
-                "quoteId": "1dd3bd14-780e-41c6-88e1-30a763f97482",
-                "requestId": "2d16f993-6429-4755-ba50-1383789459dc",
-                "tradeType": "EXACT_INPUT",
-                "slippage": 0.5
-            }
-        }
-    ]
-}

cypress/fixtures/uniswapx/quote2.json

@@ -1,493 +0,0 @@
-{
-  "routing": "DUTCH_LIMIT",
-  "quote": {
-      "orderInfo": {
-          "chainId": 1,
-          "permit2Address": "0x000000000022d473030f116ddee9f6b43ac78ba3",
-          "reactor": "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4",
-          "swapper": "0x0000000000000000000000000000000000000000",
-          "nonce": "1993350209834725680308575292465150260730647098062962750049345504775310970881",
-          "deadline": 1691176812,
-          "additionalValidationContract": "0x0000000000000000000000000000000000000000",
-          "additionalValidationData": "0x",
-          "decayStartTime": 1691176740,
-          "decayEndTime": 1691176800,
-          "exclusiveFiller": "0x165D98de005d2818176B99B1A93b9325dBE58181",
-          "exclusivityOverrideBps": "100",
-          "input": {
-              "token": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-              "startAmount": "1000000000000000000",
-              "endAmount": "1000000000000000000"
-          },
-          "outputs": [
-              {
-                  "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-                  "startAmount": "929502510517534478575",
-                  "endAmount": "919795986077127665276",
-                  "recipient": "0x0000000000000000000000000000000000000000"
-              }
-          ]
-      },
-      "encodedOrder": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000064cd4f240000000000000000000000000000000000000000000000000000000064cd4f60000000000000000000000000165d98de005d2818176b99b1a93b9325dbe581810000000000000000000000000000000000000000000000000000000000000064000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000006000da47483062a0d734ba3dc7576ce6a0b645c400000000000000000000000000000000000000000000000000000000000000000468323c9682990e3dc0646f899b437e62fbfb52a63cc8de721280222d8090010000000000000000000000000000000000000000000000000000000064cd4f6c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000092d6c1e31e14520e676a687f0a93788b716beff500000000000000000000000000000000000000000000003263704899af6e50ef000000000000000000000000000000000000000000000031dcbbc80c9555e67c0000000000000000000000000000000000000000000000000000000000000000",
-      "quoteId": "09ce28b7-1ddf-4317-a28d-d21092be9f84",
-      "requestId": "f00535d4-461a-4363-afbe-7a5ab7061cd1",
-      "auctionPeriodSecs": 60,
-      "startTimeBufferSecs": 30,
-      "deadlineBufferSecs": 12,
-      "slippageTolerance": "0.5",
-      "permitData": {
-          "domain": {
-              "name": "Permit2",
-              "chainId": 1,
-              "verifyingContract": "0x000000000022d473030f116ddee9f6b43ac78ba3"
-          },
-          "types": {
-              "PermitWitnessTransferFrom": [
-                  {
-                      "name": "permitted",
-                      "type": "TokenPermissions"
-                  },
-                  {
-                      "name": "spender",
-                      "type": "address"
-                  },
-                  {
-                      "name": "nonce",
-                      "type": "uint256"
-                  },
-                  {
-                      "name": "deadline",
-                      "type": "uint256"
-                  },
-                  {
-                      "name": "witness",
-                      "type": "ExclusiveDutchOrder"
-                  }
-              ],
-              "TokenPermissions": [
-                  {
-                      "name": "token",
-                      "type": "address"
-                  },
-                  {
-                      "name": "amount",
-                      "type": "uint256"
-                  }
-              ],
-              "ExclusiveDutchOrder": [
-                  {
-                      "name": "info",
-                      "type": "OrderInfo"
-                  },
-                  {
-                      "name": "decayStartTime",
-                      "type": "uint256"
-                  },
-                  {
-                      "name": "decayEndTime",
-                      "type": "uint256"
-                  },
-                  {
-                      "name": "exclusiveFiller",
-                      "type": "address"
-                  },
-                  {
-                      "name": "exclusivityOverrideBps",
-                      "type": "uint256"
-                  },
-                  {
-                      "name": "inputToken",
-                      "type": "address"
-                  },
-                  {
-                      "name": "inputStartAmount",
-                      "type": "uint256"
-                  },
-                  {
-                      "name": "inputEndAmount",
-                      "type": "uint256"
-                  },
-                  {
-                      "name": "outputs",
-                      "type": "DutchOutput[]"
-                  }
-              ],
-              "OrderInfo": [
-                  {
-                      "name": "reactor",
-                      "type": "address"
-                  },
-                  {
-                      "name": "swapper",
-                      "type": "address"
-                  },
-                  {
-                      "name": "nonce",
-                      "type": "uint256"
-                  },
-                  {
-                      "name": "deadline",
-                      "type": "uint256"
-                  },
-                  {
-                      "name": "additionalValidationContract",
-                      "type": "address"
-                  },
-                  {
-                      "name": "additionalValidationData",
-                      "type": "bytes"
-                  }
-              ],
-              "DutchOutput": [
-                  {
-                      "name": "token",
-                      "type": "address"
-                  },
-                  {
-                      "name": "startAmount",
-                      "type": "uint256"
-                  },
-                  {
-                      "name": "endAmount",
-                      "type": "uint256"
-                  },
-                  {
-                      "name": "recipient",
-                      "type": "address"
-                  }
-              ]
-          },
-          "values": {
-              "permitted": {
-                  "token": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-                  "amount": {
-                      "type": "BigNumber",
-                      "hex": "0x0de0b6b3a7640000"
-                  }
-              },
-              "spender": "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4",
-              "nonce": {
-                  "type": "BigNumber",
-                  "hex": "0x0468323c9682990e3dc0646f899b437e62fbfb52a63cc8de721280222d809001"
-              },
-              "deadline": 1691176812,
-              "witness": {
-                  "info": {
-                      "reactor": "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4",
-                      "swapper": "0x0000000000000000000000000000000000000000",
-                      "nonce": {
-                          "type": "BigNumber",
-                          "hex": "0x0468323c9682990e3dc0646f899b437e62fbfb52a63cc8de721280222d809001"
-                      },
-                      "deadline": 1691176812,
-                      "additionalValidationContract": "0x0000000000000000000000000000000000000000",
-                      "additionalValidationData": "0x"
-                  },
-                  "decayStartTime": 1691176740,
-                  "decayEndTime": 1691176800,
-                  "exclusiveFiller": "0x165D98de005d2818176B99B1A93b9325dBE58181",
-                  "exclusivityOverrideBps": {
-                      "type": "BigNumber",
-                      "hex": "0x64"
-                  },
-                  "inputToken": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-                  "inputStartAmount": {
-                      "type": "BigNumber",
-                      "hex": "0x0de0b6b3a7640000"
-                  },
-                  "inputEndAmount": {
-                      "type": "BigNumber",
-                      "hex": "0x0de0b6b3a7640000"
-                  },
-                  "outputs": [
-                      {
-                          "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-                          "startAmount": {
-                              "type": "BigNumber",
-                              "hex": "0x3263704899af6e50ef"
-                          },
-                          "endAmount": {
-                              "type": "BigNumber",
-                              "hex": "0x31dcbbc80c9555e67c"
-                          },
-                          "recipient": "0x0000000000000000000000000000000000000000"
-                      }
-                  ]
-              }
-          }
-      }
-  },
-  "requestId": "f00535d4-461a-4363-afbe-7a5ab7061cd1",
-  "allQuotes": [
-      {
-          "routing": "DUTCH_LIMIT",
-          "quote": {
-              "orderInfo": {
-                  "chainId": 1,
-                  "permit2Address": "0x000000000022d473030f116ddee9f6b43ac78ba3",
-                  "reactor": "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4",
-                  "swapper": "0x0000000000000000000000000000000000000000",
-                  "nonce": "1993350209834725680308575292465150260730647098062962750049345504775310970881",
-                  "deadline": 1691176812,
-                  "additionalValidationContract": "0x0000000000000000000000000000000000000000",
-                  "additionalValidationData": "0x",
-                  "decayStartTime": 1691176740,
-                  "decayEndTime": 1691176800,
-                  "exclusiveFiller": "0x165D98de005d2818176B99B1A93b9325dBE58181",
-                  "exclusivityOverrideBps": "100",
-                  "input": {
-                      "token": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-                      "startAmount": "1000000000000000000",
-                      "endAmount": "1000000000000000000"
-                  },
-                  "outputs": [
-                      {
-                          "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-                          "startAmount": "929502510517534478575",
-                          "endAmount": "919795986077127665276",
-                          "recipient": "0x0000000000000000000000000000000000000000"
-                      }
-                  ]
-              },
-              "encodedOrder": "0x000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000064cd4f240000000000000000000000000000000000000000000000000000000064cd4f60000000000000000000000000165d98de005d2818176b99b1a93b9325dbe581810000000000000000000000000000000000000000000000000000000000000064000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000006000da47483062a0d734ba3dc7576ce6a0b645c400000000000000000000000000000000000000000000000000000000000000000468323c9682990e3dc0646f899b437e62fbfb52a63cc8de721280222d8090010000000000000000000000000000000000000000000000000000000064cd4f6c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000092d6c1e31e14520e676a687f0a93788b716beff500000000000000000000000000000000000000000000003263704899af6e50ef000000000000000000000000000000000000000000000031dcbbc80c9555e67c0000000000000000000000000000000000000000000000000000000000000000",
-              "quoteId": "09ce28b7-1ddf-4317-a28d-d21092be9f84",
-              "requestId": "f00535d4-461a-4363-afbe-7a5ab7061cd1",
-              "auctionPeriodSecs": 60,
-              "startTimeBufferSecs": 30,
-              "deadlineBufferSecs": 12,
-              "slippageTolerance": "0.5",
-              "permitData": {
-                  "domain": {
-                      "name": "Permit2",
-                      "chainId": 1,
-                      "verifyingContract": "0x000000000022d473030f116ddee9f6b43ac78ba3"
-                  },
-                  "types": {
-                      "PermitWitnessTransferFrom": [
-                          {
-                              "name": "permitted",
-                              "type": "TokenPermissions"
-                          },
-                          {
-                              "name": "spender",
-                              "type": "address"
-                          },
-                          {
-                              "name": "nonce",
-                              "type": "uint256"
-                          },
-                          {
-                              "name": "deadline",
-                              "type": "uint256"
-                          },
-                          {
-                              "name": "witness",
-                              "type": "ExclusiveDutchOrder"
-                          }
-                      ],
-                      "TokenPermissions": [
-                          {
-                              "name": "token",
-                              "type": "address"
-                          },
-                          {
-                              "name": "amount",
-                              "type": "uint256"
-                          }
-                      ],
-                      "ExclusiveDutchOrder": [
-                          {
-                              "name": "info",
-                              "type": "OrderInfo"
-                          },
-                          {
-                              "name": "decayStartTime",
-                              "type": "uint256"
-                          },
-                          {
-                              "name": "decayEndTime",
-                              "type": "uint256"
-                          },
-                          {
-                              "name": "exclusiveFiller",
-                              "type": "address"
-                          },
-                          {
-                              "name": "exclusivityOverrideBps",
-                              "type": "uint256"
-                          },
-                          {
-                              "name": "inputToken",
-                              "type": "address"
-                          },
-                          {
-                              "name": "inputStartAmount",
-                              "type": "uint256"
-                          },
-                          {
-                              "name": "inputEndAmount",
-                              "type": "uint256"
-                          },
-                          {
-                              "name": "outputs",
-                              "type": "DutchOutput[]"
-                          }
-                      ],
-                      "OrderInfo": [
-                          {
-                              "name": "reactor",
-                              "type": "address"
-                          },
-                          {
-                              "name": "swapper",
-                              "type": "address"
-                          },
-                          {
-                              "name": "nonce",
-                              "type": "uint256"
-                          },
-                          {
-                              "name": "deadline",
-                              "type": "uint256"
-                          },
-                          {
-                              "name": "additionalValidationContract",
-                              "type": "address"
-                          },
-                          {
-                              "name": "additionalValidationData",
-                              "type": "bytes"
-                          }
-                      ],
-                      "DutchOutput": [
-                          {
-                              "name": "token",
-                              "type": "address"
-                          },
-                          {
-                              "name": "startAmount",
-                              "type": "uint256"
-                          },
-                          {
-                              "name": "endAmount",
-                              "type": "uint256"
-                          },
-                          {
-                              "name": "recipient",
-                              "type": "address"
-                          }
-                      ]
-                  },
-                  "values": {
-                      "permitted": {
-                          "token": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-                          "amount": {
-                              "type": "BigNumber",
-                              "hex": "0x0de0b6b3a7640000"
-                          }
-                      },
-                      "spender": "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4",
-                      "nonce": {
-                          "type": "BigNumber",
-                          "hex": "0x0468323c9682990e3dc0646f899b437e62fbfb52a63cc8de721280222d809001"
-                      },
-                      "deadline": 1691176812,
-                      "witness": {
-                          "info": {
-                              "reactor": "0x6000da47483062A0D734Ba3dc7576Ce6A0B645C4",
-                              "swapper": "0x0000000000000000000000000000000000000000",
-                              "nonce": {
-                                  "type": "BigNumber",
-                                  "hex": "0x0468323c9682990e3dc0646f899b437e62fbfb52a63cc8de721280222d809001"
-                              },
-                              "deadline": 1691176812,
-                              "additionalValidationContract": "0x0000000000000000000000000000000000000000",
-                              "additionalValidationData": "0x"
-                          },
-                          "decayStartTime": 1691176740,
-                          "decayEndTime": 1691176800,
-                          "exclusiveFiller": "0x165D98de005d2818176B99B1A93b9325dBE58181",
-                          "exclusivityOverrideBps": {
-                              "type": "BigNumber",
-                              "hex": "0x64"
-                          },
-                          "inputToken": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-                          "inputStartAmount": {
-                              "type": "BigNumber",
-                              "hex": "0x0de0b6b3a7640000"
-                          },
-                          "inputEndAmount": {
-                              "type": "BigNumber",
-                              "hex": "0x0de0b6b3a7640000"
-                          },
-                          "outputs": [
-                              {
-                                  "token": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-                                  "startAmount": {
-                                      "type": "BigNumber",
-                                      "hex": "0x3263704899af6e50ef"
-                                  },
-                                  "endAmount": {
-                                      "type": "BigNumber",
-                                      "hex": "0x31dcbbc80c9555e67c"
-                                  },
-                                  "recipient": "0x0000000000000000000000000000000000000000"
-                              }
-                          ]
-                      }
-                  }
-              }
-          }
-      },
-      {
-          "routing": "CLASSIC",
-          "quote": {
-              "blockNumber": "17843654",
-              "amount": "1000000000000000000",
-              "amountDecimals": "1",
-              "quote": "931181529570145926787",
-              "quoteDecimals": "931.181529570145926787",
-              "quoteGasAdjusted": "929033336026294051828",
-              "quoteGasAdjustedDecimals": "929.033336026294051828",
-              "gasUseEstimateQuote": "2148193543851874958",
-              "gasUseEstimateQuoteDecimals": "2.148193543851874958",
-              "gasUseEstimate": "128000",
-              "gasUseEstimateUSD": "4.174934",
-              "simulationStatus": "UNATTEMPTED",
-              "simulationError": false,
-              "gasPriceWei": "17811260539",
-              "route": [
-                  [
-                      {
-                          "type": "v3-pool",
-                          "address": "0xD8de6af55F618a7Bc69835D55DDC6582220c36c0",
-                          "tokenIn": {
-                              "chainId": 1,
-                              "decimals": "18",
-                              "address": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-                              "symbol": "WETH"
-                          },
-                          "tokenOut": {
-                              "chainId": 1,
-                              "decimals": "18",
-                              "address": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
-                              "symbol": "DAI"
-                          },
-                          "fee": "3000",
-                          "liquidity": "62287359628325896425115",
-                          "sqrtRatioX96": "2591813593283507889384697884",
-                          "tickCurrent": "-68403",
-                          "amountIn": "1000000000000000000",
-                          "amountOut": "931181529570145926787"
-                      }
-                  ]
-              ],
-              "routeString": "[V3] 100.00% = WETH -- 0.3% [0xD8de6af55F618a7Bc69835D55DDC6582220c36c0] --> DAI",
-              "quoteId": "414e5f1c-120a-4e35-9760-c54d4b09e91d",
-              "requestId": "f00535d4-461a-4363-afbe-7a5ab7061cd1",
-              "tradeType": "EXACT_INPUT",
-              "slippage": 0.5
-          }
-      }
-  ]
-}

cypress/staging/t9n.test.ts

@@ -12,7 +12,7 @@ describe('translations', () => {
     cy.get(getTestSelector('web3-status-connected')).click()
     cy.get(getTestSelector('wallet-settings')).click()
     cy.get(getTestSelector('wallet-language-item')).contains('français').click({ force: true })
-    cy.location('search').should('match', /\?lng=fr-FR$/)
+    cy.location('hash').should('match', /\?lng=fr-FR$/)
     cy.contains('Échanger')
     cy.contains('Uniswap disponible en : English')
   })

cypress/support/commands.ts

@@ -3,8 +3,8 @@ import 'cypress-hardhat/lib/browser'
 import { Eip1193Bridge } from '@ethersproject/experimental/lib/eip1193-bridge'
 
 import { FeatureFlag } from '../../src/featureFlags'
-import { initialState, UserState } from '../../src/state/user/reducer'
-import { CONNECTED_WALLET_USER_STATE, setInitialUserState } from '../utils/user-state'
+import { UserState } from '../../src/state/user/reducer'
+import { CONNECTED_WALLET_USER_STATE } from '../utils/user-state'
 
 declare global {
   // eslint-disable-next-line @typescript-eslint/no-namespace
@@ -41,21 +41,27 @@ Cypress.Commands.overwrite(
   (original, url: string | Partial<Cypress.VisitOptions>, options?: Partial<Cypress.VisitOptions>) => {
     if (typeof url !== 'string') throw new Error('Invalid arguments. The first argument to cy.visit must be the path.')
 
+    // Add a hash in the URL if it is not present (to use hash-based routing correctly with queryParams).
+    const hashUrl = url.startsWith('/') && url.length > 2 && !url.startsWith('/#') ? `/#${url}` : url
+
     return cy
       .intercept('/service-worker.js', options?.serviceWorker ? undefined : { statusCode: 404 })
       .provider()
       .then((provider) =>
         original({
           ...options,
-          url,
+          url: hashUrl,
           onBeforeLoad(win) {
             options?.onBeforeLoad?.(win)
 
-            setInitialUserState(win, {
-              ...initialState,
-              ...CONNECTED_WALLET_USER_STATE,
-              ...(options?.userState ?? {}),
-            })
+            // We want to test from a clean state, so we clear the local storage (which clears redux).
+            win.localStorage.clear()
+
+            // Set initial user state.
+            win.localStorage.setItem(
+              'redux_localstorage_simple_user', // storage key for the user reducer using 'redux-localstorage-simple'
+              JSON.stringify({ ...CONNECTED_WALLET_USER_STATE, ...(options?.userState ?? {}) })
+            )
 
             // Set feature flags, if configured.
             if (options?.featureFlags) {

cypress/support/e2e.ts

@@ -5,6 +5,7 @@
 // https://on.cypress.io/configuration
 // ***********************************************************
 
+import '@cypress/code-coverage/support'
 import './commands'
 import './setupTests'
 

cypress/utils/user-state.ts

@@ -1,42 +1,6 @@
-import { connectionMetaKey } from '../../src/connection/meta'
 import { ConnectionType } from '../../src/connection/types'
 import { UserState } from '../../src/state/user/reducer'
 
 export const CONNECTED_WALLET_USER_STATE: Partial<UserState> = { selectedWallet: ConnectionType.INJECTED }
 
 export const DISCONNECTED_WALLET_USER_STATE: Partial<UserState> = { selectedWallet: undefined }
-
-/**
- * This sets the initial value of the "user" slice in IndexedDB.
- * Other persisted slices are not set, so they will be filled with their respective initial values
- * when the app runs.
- */
-export function setInitialUserState(win: Cypress.AUTWindow, state: UserState) {
-  // Selected wallet should also be reflected in localStorage, so that eager connections work.
-  if (state.selectedWallet) {
-    win.localStorage.setItem(
-      connectionMetaKey,
-      JSON.stringify({
-        type: state.selectedWallet,
-      })
-    )
-  }
-
-  win.indexedDB.deleteDatabase('redux')
-  const dbRequest = win.indexedDB.open('redux')
-  dbRequest.onsuccess = function () {
-    const db = dbRequest.result
-    const transaction = db.transaction('keyvaluepairs', 'readwrite')
-    const store = transaction.objectStore('keyvaluepairs')
-    store.put(
-      {
-        user: state,
-      },
-      'persist:interface'
-    )
-  }
-  dbRequest.onupgradeneeded = function () {
-    const db = dbRequest.result
-    db.createObjectStore('keyvaluepairs')
-  }
-}

functions/README.md

@@ -18,9 +18,9 @@ Currently, there are 2 types of cloudflare functions developed
 
 ## Testing
 
-Testing is done utilizing a custom jest environment as well as Cloudflare's local tester: `wrangler`. Wrangler enables testing locally by running a proxy to wrap `localhost`. Tests run against a proxy server, so you'll need to start it before running tests:
-- Manually run `yarn start:cloud` to setup wrangler on `localhost:3000`
-- Run unit tests with `yarn test:cloud`
+Testing is done utilizing a custom jest environment as well as Cloudflare's local tester: `wrangler`. Wrangler enables testing locally by running a proxy to wrap `localhost`. Testing can be done the following ways.
+- Manually by running `yarn start:cloud` to setup wrangler on `localhost:3000`
+- Automated tests by running `yarn test:cloud` to setup both a jest and wrangler environment and automatically test features
 
 ## Deployment
 

functions/[[index]].ts

@@ -1,18 +0,0 @@
-/* eslint-disable import/no-unused-modules */
-import { MetaTagInjector } from './components/metaTagInjector'
-
-export const onRequest: PagesFunction = async ({ request, next }) => {
-  const imageUri = new URL(request.url).origin + '/images/1200x630_Rich_Link_Preview_Image.png'
-  const data = {
-    title: 'Uniswap Interface',
-    image: imageUri,
-    url: request.url,
-    description: 'Swap or provide liquidity on the Uniswap Protocol',
-  }
-  const res = next()
-  try {
-    return new HTMLRewriter().on('head', new MetaTagInjector(data)).transform(await res)
-  } catch (e) {
-    return res
-  }
-}

functions/api/image/nfts/asset/[[index]].tsx

@@ -1,76 +0,0 @@
-/* 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'
-import getAsset from '../../../../utils/getAsset'
-import getFont from '../../../../utils/getFont'
-import { getRequest } from '../../../../utils/getRequest'
-
-export const onRequest: PagesFunction = async ({ params, request }) => {
-  try {
-    const origin = new URL(request.url).origin
-    const { index } = params
-    const collectionAddress = index[0]?.toString()
-    const tokenId = index[1]?.toString()
-    const cacheUrl = origin + '/nfts/asset/' + collectionAddress + '/' + tokenId
-
-    if (blocklistedCollections.includes(collectionAddress)) {
-      return new Response('Collection unsupported.', { status: 404 })
-    }
-
-    const data = await getRequest(
-      cacheUrl,
-      () => getAsset(collectionAddress, tokenId, cacheUrl),
-      (data): data is NonNullable<Awaited<ReturnType<typeof getAsset>>> => Boolean(data.ogImage)
-    )
-
-    if (!data) {
-      return new Response('Asset not found.', { status: 404 })
-    }
-
-    const fontData = await getFont(origin)
-
-    return new ImageResponse(
-      (
-        <div
-          style={{
-            display: 'flex',
-            alignItems: 'center',
-            justifyContent: 'center',
-            flexDirection: 'column',
-            width: '1200px',
-            height: '630px',
-          }}
-        >
-          <img src={data.ogImage} alt={data.title} width="1200px" />
-          <div
-            style={{
-              position: 'absolute',
-              bottom: '72px',
-              right: '72px',
-              display: 'flex',
-              gap: '24px',
-            }}
-          >
-            <img src={WATERMARK_URL} alt="Uniswap" height="72px" width="324px" />
-          </div>
-        </div>
-      ),
-      {
-        width: 1200,
-        height: 630,
-        fonts: [
-          {
-            name: 'Inter',
-            data: fontData,
-            style: 'normal',
-          },
-        ],
-      }
-    ) as Response
-  } catch (error: any) {
-    return new Response(error.message || error.toString(), { status: 500 })
-  }
-}

functions/api/image/nfts/asset/nftImage.test.ts

@@ -1,29 +0,0 @@
-const assetImageUrl = [
-  'http://127.0.0.1:3000/api/image/nfts/asset/0xed5af388653567af2f388e6224dc7c4b3241c544/804',
-  'http://127.0.0.1:3000/api/image/nfts/asset/0xb47e3cd837ddf8e4c57f05d70ab865de6e193bbb/3947',
-]
-
-test.each(assetImageUrl)('assetImageUrl', async (url) => {
-  const response = await fetch(new Request(url))
-  expect(response.status).toBe(200)
-  expect(response.headers.get('content-type')).toBe('image/png')
-})
-
-const invalidAssetImageUrl = [
-  'http://127.0.0.1:3000/api/image/nfts/asset/0xed5af388653567af2f388e6224dc7c4b3241c544/10001',
-  'http://127.0.0.1:3000/api/image/nfts/asset/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d/44700',
-]
-
-test.each(invalidAssetImageUrl)('invalidAssetImageUrl', async (url) => {
-  const response = await fetch(new Request(url))
-  expect(response.status).toBe(404)
-})
-
-const blockedAssetImageUrl = [
-  'http://127.0.0.1:3000/api/image/nfts/asset/0xd4d871419714b778ebec2e22c7c53572b573706e/276',
-]
-
-test.each(blockedAssetImageUrl)('blockedAssetImageUrl', async (url) => {
-  const response = await fetch(new Request(url))
-  expect(response.status).toBe(404)
-})

functions/api/image/nfts/collection/[index].tsx

@@ -1,122 +0,0 @@
-/* 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'
-import { CHECK_URL, WATERMARK_URL } from '../../../../constants'
-import getCollection from '../../../../utils/getCollection'
-import getFont from '../../../../utils/getFont'
-import { getRequest } from '../../../../utils/getRequest'
-
-export const onRequest: PagesFunction = async ({ params, request }) => {
-  try {
-    const origin = new URL(request.url).origin
-    const { index } = params
-    const collectionAddress = index?.toString()
-    const cacheUrl = origin + '/nfts/collection/' + collectionAddress
-
-    if (blocklistedCollections.includes(collectionAddress)) {
-      return new Response('Collection unsupported.', { status: 404 })
-    }
-
-    const data = await getRequest(
-      cacheUrl,
-      () => getCollection(collectionAddress, cacheUrl),
-      (data): data is NonNullable<Awaited<ReturnType<typeof getCollection>>> =>
-        Boolean(data.ogImage && data.name && data.isVerified)
-    )
-
-    if (!data) {
-      return new Response('Collection not found.', { status: 404 })
-    }
-
-    const [fontData, palette] = await Promise.all([getFont(origin), getColor(data.ogImage)])
-
-    // Split name into words to wrap them since satori does not support inline text wrapping
-    const words = data.name.split(' ')
-
-    return new ImageResponse(
-      (
-        <div
-          style={{
-            backgroundColor: 'black',
-            display: 'flex',
-            width: '1200px',
-            height: '630px',
-          }}
-        >
-          <div
-            style={{
-              display: 'flex',
-              alignItems: 'center',
-              backgroundColor: `rgba(${palette[0]}, ${palette[1]}, ${palette[2]}, 0.75)`,
-              padding: '72px',
-            }}
-          >
-            <div
-              style={{
-                display: 'flex',
-                flexDirection: 'row',
-                alignItems: 'flex-end',
-                gap: '48px',
-                width: '100%',
-              }}
-            >
-              <img
-                src={data.ogImage}
-                alt={data.name}
-                width="500px"
-                height="500px"
-                style={{
-                  borderRadius: '60px',
-                  objectFit: 'cover',
-                }}
-              />
-              <div
-                style={{
-                  display: 'flex',
-                  flexDirection: 'column',
-                  gap: '32px',
-                  width: '45%',
-                }}
-              >
-                <div
-                  style={{
-                    gap: '12px',
-                    fontSize: '72px',
-                    fontFamily: 'Inter',
-                    color: 'white',
-                    display: 'flex',
-                    flexDirection: 'row',
-                    alignItems: 'center',
-                    flexWrap: 'wrap',
-                  }}
-                >
-                  {words.map((word: string) => (
-                    <text key={word + index}>{word}</text>
-                  ))}
-                  {data.isVerified && <img src={CHECK_URL} height="54px" />}
-                </div>
-                <img src={WATERMARK_URL} alt="Uniswap" height="72px" width="324px" />
-              </div>
-            </div>
-          </div>
-        </div>
-      ),
-      {
-        width: 1200,
-        height: 630,
-        fonts: [
-          {
-            name: 'Inter',
-            data: fontData,
-            style: 'normal',
-          },
-        ],
-      }
-    ) as Response
-  } catch (error: any) {
-    return new Response(error.message || error.toString(), { status: 500 })
-  }
-}

functions/api/image/nfts/collection/collectionImage.test.ts

@@ -1,34 +0,0 @@
-import * as matchers from 'jest-extended'
-expect.extend(matchers)
-
-const collectionImageUrls = [
-  'http://127.0.0.1:3000/api/image/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c544',
-  'http://127.0.0.1:3000/api/image/nfts/collection/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d',
-  'http://127.0.0.1:3000/api/image/nfts/collection/0x49cf6f5d44e70224e2e23fdcdd2c053f30ada28b',
-]
-
-const nonexistentImageUrls = [
-  'http://127.0.0.1:3000/api/image/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c545',
-]
-
-test.each([...collectionImageUrls, ...nonexistentImageUrls])('collectionImageUrl', async (url) => {
-  const response = await fetch(new Request(url))
-  expect(response.status).toBe(200)
-  expect(response.headers.get('content-type')).toBe('image/png')
-})
-
-const invalidCollectionImageUrls = ['http://127.0.0.1:3000/api/image/nfts/collection/0xd3adb33f']
-
-test.each(invalidCollectionImageUrls)('invalidAssetImageUrl', async (url) => {
-  const response = await fetch(new Request(url))
-  expect(response.status).toBeOneOf([404, 500])
-})
-
-const blockedCollectionImageUrls = [
-  'http://127.0.0.1:3000/api/image/nfts/collection/0xd4d871419714b778ebec2e22c7c53572b573706e',
-]
-
-test.each(blockedCollectionImageUrls)('blockedCollectionImageUrl', async (url) => {
-  const response = await fetch(new Request(url))
-  expect(response.status).toBeOneOf([404, 500])
-})

functions/api/image/tokens/[[index]].tsx

@@ -1,177 +0,0 @@
-/* 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'
-import getFont from '../../../utils/getFont'
-import getNetworkLogoUrl from '../../../utils/getNetworkLogoURL'
-import { getRequest } from '../../../utils/getRequest'
-import getToken from '../../../utils/getToken'
-
-export const onRequest: PagesFunction = async ({ params, request }) => {
-  try {
-    const origin = new URL(request.url).origin
-    const { index } = params
-    const networkName = String(index[0])
-    const tokenAddress = String(index[1])
-
-    const cacheUrl = origin + '/tokens/' + networkName + '/' + tokenAddress
-
-    const data = await getRequest(
-      cacheUrl,
-      () => getToken(networkName, tokenAddress, cacheUrl),
-      (data): data is NonNullable<Awaited<ReturnType<typeof getToken>>> => Boolean(data.symbol && data.name)
-    )
-
-    if (!data) {
-      return new Response('Token not found.', { status: 404 })
-    }
-
-    const [fontData, palette] = await Promise.all([getFont(origin), getColor(data.ogImage, true)])
-
-    const networkLogo = getNetworkLogoUrl(networkName.toUpperCase(), origin)
-
-    // Capitalize name such that each word starts with a capital letter
-    let words = data.name.split(' ')
-    words = words.map((word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase())
-    let name = words.join(' ')
-    name = name.trim()
-
-    return new ImageResponse(
-      (
-        <div
-          style={{
-            backgroundColor: 'black',
-            display: 'flex',
-            width: '1200px',
-            height: '630px',
-          }}
-        >
-          <div
-            style={{
-              display: 'flex',
-              backgroundColor: `rgba(${palette[0]}, ${palette[1]}, ${palette[2]})`,
-              alignItems: 'center',
-              height: '100%',
-              padding: '72px',
-            }}
-          >
-            <div
-              style={{
-                display: 'flex',
-                flexDirection: 'column',
-                justifyContent: 'space-between',
-                alignItems: 'flex-start',
-                width: '100%',
-                height: '100%',
-                color: 'white',
-              }}
-            >
-              {data.ogImage ? (
-                <img src={data.ogImage} width="144px" style={{ borderRadius: '100%' }}>
-                  {networkLogo != '' && (
-                    <img
-                      src={networkLogo}
-                      width="48px"
-                      style={{
-                        position: 'absolute',
-                        right: '2px',
-                        bottom: '0px',
-                        borderRadius: '100%',
-                      }}
-                    />
-                  )}
-                </img>
-              ) : (
-                <div
-                  style={{
-                    width: '144px',
-                    height: '144px',
-                    borderRadius: '100%',
-                    backgroundColor: 'rgba(255, 255, 255, 0.12)',
-                    display: 'flex',
-                    justifyContent: 'center',
-                    alignItems: 'center',
-                  }}
-                >
-                  <div
-                    style={{
-                      fontFamily: 'Inter',
-                      fontSize: '48px',
-                      lineHeight: '58px',
-                      color: 'white',
-                    }}
-                  >
-                    {data.name.slice(0, 3).toUpperCase()}
-                  </div>
-                  {networkLogo != '' && (
-                    <img
-                      src={networkLogo}
-                      width="48px"
-                      style={{
-                        position: 'absolute',
-                        right: '2px',
-                        bottom: '0px',
-                        borderRadius: '100%',
-                      }}
-                    />
-                  )}
-                </div>
-              )}
-              <div
-                style={{
-                  fontFamily: 'Inter',
-                  fontSize: '72px',
-                  lineHeight: '72px',
-                  marginLeft: '-5px',
-                  marginTop: '24px',
-                }}
-              >
-                {name}
-              </div>
-              <div
-                style={{
-                  display: 'flex',
-                  flexDirection: 'row',
-                  justifyContent: 'space-between',
-                  alignItems: 'flex-end',
-                  width: '100%',
-                }}
-              >
-                <div
-                  style={{
-                    fontFamily: 'Inter',
-                    fontSize: '168px',
-                    lineHeight: '133px',
-                    marginLeft: '-13px',
-                    overflow: 'hidden',
-                    textOverflow: 'ellipsis',
-                    whiteSpace: 'nowrap',
-                    width: '100%',
-                  }}
-                >
-                  {data.symbol}
-                </div>
-                <img src={WATERMARK_URL} alt="Uniswap" height="72px" width="324px" />
-              </div>
-            </div>
-          </div>
-        </div>
-      ),
-      {
-        width: 1200,
-        height: 630,
-        fonts: [
-          {
-            name: 'Inter',
-            data: fontData,
-            style: 'normal',
-          },
-        ],
-      }
-    ) as Response
-  } catch (error: any) {
-    return new Response(error.message || error.toString(), { status: 500 })
-  }
-}

functions/api/image/tokens/tokenImage.test.ts

@@ -1,22 +0,0 @@
-const tokenImageUrl = [
-  'http://127.0.0.1:3000/api/image/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
-  'http://127.0.0.1:3000/api/image/tokens/ethereum/NATIVE',
-]
-
-test.each(tokenImageUrl)('tokenImageUrl', async (url) => {
-  const response = await fetch(new Request(url))
-  expect(response.status).toBe(200)
-  expect(response.headers.get('content-type')).toBe('image/png')
-})
-
-const invalidTokenImageUrl = [
-  'http://127.0.0.1:3000/api/image/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb49',
-  'http://127.0.0.1:3000/api/image/tokens/ethereum',
-  'http://127.0.0.1:3000/api/image/tokens/ethereun',
-  'http://127.0.0.1:3000/api/image/tokens/potato/?potato=1',
-]
-
-test.each(invalidTokenImageUrl)('invalidAssetImageUrl', async (url) => {
-  const response = await fetch(new Request(url))
-  expect(response.status).toBe(404)
-})

functions/components/metaTagInjector.test.ts

@@ -1,38 +0,0 @@
-import { MetaTagInjector } from './metaTagInjector'
-
-test('should append meta tag to element', () => {
-  const element = {
-    append: jest.fn(),
-  } as unknown as Element
-  const property = 'property'
-  const content = 'content'
-  const injector = new MetaTagInjector({
-    title: 'test',
-    url: 'testUrl',
-    image: 'testImage',
-    description: 'testDescription',
-  })
-  injector.append(element, property, content)
-  expect(element.append).toHaveBeenCalledWith(`<meta property="${property}" content="${content}"/>`, { html: true })
-
-  injector.element(element)
-  expect(element.append).toHaveBeenCalledWith(`<meta property="og:title" content="test"/>`, { html: true })
-  expect(element.append).toHaveBeenCalledWith(`<meta property="og:description" content="testDescription"/>`, {
-    html: true,
-  })
-  expect(element.append).toHaveBeenCalledWith(`<meta property="og:image" content="testImage"/>`, { html: true })
-  expect(element.append).toHaveBeenCalledWith(`<meta property="og:image:width" content="1200"/>`, { html: true })
-  expect(element.append).toHaveBeenCalledWith(`<meta property="og:image:height" content="630"/>`, { html: true })
-  expect(element.append).toHaveBeenCalledWith(`<meta property="og:image:alt" content="test"/>`, { html: true })
-  expect(element.append).toHaveBeenCalledWith(`<meta property="og:type" content="website"/>`, { html: true })
-  expect(element.append).toHaveBeenCalledWith(`<meta property="og:url" content="testUrl"/>`, { html: true })
-
-  expect(element.append).toHaveBeenCalledWith(`<meta property="twitter:card" content="summary_large_image"/>`, {
-    html: true,
-  })
-  expect(element.append).toHaveBeenCalledWith(`<meta property="twitter:title" content="test"/>`, { html: true })
-  expect(element.append).toHaveBeenCalledWith(`<meta property="twitter:image" content="testImage"/>`, { html: true })
-  expect(element.append).toHaveBeenCalledWith(`<meta property="twitter:image:alt" content="test"/>`, { html: true })
-
-  expect(element.append).toHaveBeenCalledTimes(13)
-})

functions/components/metaTagInjector.ts

@@ -2,7 +2,6 @@ type MetaTagInjectorInput = {
   title: string
   image?: string
   url: string
-  description?: string
 }
 
 /**
@@ -19,9 +18,6 @@ export class MetaTagInjector implements HTMLRewriterElementContentHandlers {
   element(element: Element) {
     //Open Graph Tags
     this.append(element, 'og:title', this.input.title)
-    if (this.input.description) {
-      this.append(element, 'og:description', this.input.description)
-    }
     if (this.input.image) {
       this.append(element, 'og:image', this.input.image)
       this.append(element, 'og:image:width', '1200')

functions/constants.ts

@@ -1,2 +0,0 @@
-export const WATERMARK_URL = 'https://app.uniswap.org/images/324x74_App_Watermark.png'
-export const CHECK_URL = 'https://app.uniswap.org/images/54x54_Verified_Check.svg'

functions/default.test.ts

@@ -1,22 +0,0 @@
-const defaultUrls = ['http://127.0.0.1:3000/', 'http://127.0.0.1:3000/swap', 'http://127.0.0.1:3000/pools']
-
-test.each(defaultUrls)('should inject metadata for valid collections', async (defaultUrl) => {
-  const body = await fetch(new Request(defaultUrl)).then((res) => res.text())
-  expect(body).toContain(`<meta property="og:title" content="Uniswap Interface"/>`)
-  expect(body).toContain(
-    `<meta property="og:description" content="Swap or provide liquidity on the Uniswap Protocol"/>`
-  )
-  expect(body).toContain(
-    `<meta property="og:image" content="http://127.0.0.1:3000/images/1200x630_Rich_Link_Preview_Image.png"/>`
-  )
-  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:image:alt" content="Uniswap Interface"/>`)
-  expect(body).toContain(`<meta property="twitter:card" content="summary_large_image"/>`)
-  expect(body).toContain(`<meta property="twitter:title" content="Uniswap Interface"/>`)
-  expect(body).toContain(
-    `<meta property="twitter:image" content="http://127.0.0.1:3000/images/1200x630_Rich_Link_Preview_Image.png"/>`
-  )
-  expect(body).toContain(`<meta property="twitter:image:alt" content="Uniswap Interface"/>`)
-})

functions/global-setup.ts

@@ -0,0 +1,9 @@
+import { setup } from 'jest-dev-server'
+
+module.exports = async function globalSetup() {
+  globalThis.servers = await setup({
+    command: `yarn start:cloud`,
+    port: 3000,
+    launchTimeout: 50000,
+  })
+}

functions/global-teardown.ts

@@ -0,0 +1,5 @@
+import { teardown } from 'jest-dev-server'
+
+module.exports = async function globalTeardown() {
+  await teardown(globalThis.servers)
+}

functions/global.d.ts

@@ -0,0 +1,6 @@
+import { setup } from 'jest-dev-server'
+
+declare global {
+  // eslint-disable-next-line no-var
+  var servers: Awaited<ReturnType<typeof setup>>
+}

functions/jest.config.json

@@ -1,5 +1,6 @@
 {
-  "setupFilesAfterEnv": ["<rootDir>/setupAfterEnv.ts"],
+  "globalSetup": "<rootDir>/global-setup.ts",
+  "globalTeardown": "<rootDir>/global-teardown.ts",
   "preset": "ts-jest",
   "transform": {
     "'^.+\\.(ts|tsx)?$'": "ts-jest",

functions/nfts/asset/[[index]].ts

@@ -1,6 +1,6 @@
 /* eslint-disable import/no-unused-modules */
 import getAsset from '../../utils/getAsset'
-import { getMetadataRequest } from '../../utils/getRequest'
+import getRequest from '../../utils/getRequest'
 
 export const onRequest: PagesFunction = async ({ params, request, next }) => {
   const res = next()
@@ -8,7 +8,7 @@ export const onRequest: PagesFunction = async ({ params, request, next }) => {
     const { index } = params
     const collectionAddress = index[0]?.toString()
     const tokenId = index[1]?.toString()
-    return getMetadataRequest(res, request.url, () => getAsset(collectionAddress, tokenId, request.url))
+    return getRequest(res, request.url, () => getAsset(collectionAddress, tokenId, request.url))
   } catch (e) {
     return res
   }

functions/nfts/asset/__snapshots__/nft.test.ts.snap

@@ -7,17 +7,18 @@ exports[`should inject metadata for valid assets 1`] = `
     <meta charset="utf-8" />
 
     <title>Uniswap Interface</title>
+    <meta name="description" content="Swap or provide liquidity on the Uniswap Protocol" />
 
     <!--
-       will be replaced with the URL of the \`public\` folder during build.
+      . 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" />
+    <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 name="theme-color" content="#FC72FF" />
     <meta
       http-equiv="Content-Security-Policy"
       
@@ -35,48 +36,33 @@ exports[`should inject metadata for valid assets 1`] = `
       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="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/Inter-roman.var.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-Medium.woff" as="font" type="font/woff" crossorigin />
-
-   
     <style>
       * {
-        font-family: 'Basel', sans-serif;
+        font-family: 'Inter', sans-serif;
         box-sizing: border-box;
       }
 
       /**
-          Explicitly load Basel var from public/ so it does not block LCP's critical path.
+          Explicitly load Inter var from public/ so it does not block LCP's critical path.
         */
       @font-face {
-        font-family: 'Basel';
-        font-weight: 535;
+        font-family: 'Inter custom';
+        font-weight: 100 900;
         font-style: normal;
         font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Medium.woff) format('woff');
-      }
-
-      @font-face {
-        font-family: 'Basel';
-        font-weight: 485;
-        font-style: normal;
-        font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Book.woff) format('woff');
+        font-named-instance: 'Regular';
+        src: url(./fonts/Inter-roman.var.woff2) format('woff2 supports variations(gvar)'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2-variations'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2');
       }
 
       @supports (font-variation-settings: normal) {
         * {
-          font-family: 'Basel', sans-serif;
-          
+          font-family: 'Inter custom', sans-serif;
         }
       }
 
@@ -92,11 +78,9 @@ exports[`should inject metadata for valid assets 1`] = `
 
       html {
         font-size: 16px;
-        font-weight: 485;
         font-variant: none;
         font-smooth: always;
-        text-rendering: optimizeLegibility !important;
-        -webkit-font-smoothing: antialiased !important;
+        -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
       }
@@ -122,17 +106,17 @@ exports[`should inject metadata for valid assets 1`] = `
 
       @media (prefers-color-scheme: dark) {
         html {
-          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+          background: linear-gradient(180deg, #202738 0%, #070816 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);
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0.51) 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF
         }
       }
     </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>
+  <script defer src="./static/js/bundle.js"></script><meta property="og:title" content="Azuki #2550"/><meta property="og:image" content="https://cdn.center.app/1/0xED5AF388653567Af2F388E6224dC7C4b3241C544/2550/d268b7f60a56306ced68b9762709ceaff4f1ee939f3150e7363fae300a59da12.png"/><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="https://cdn.center.app/1/0xED5AF388653567Af2F388E6224dC7C4b3241C544/2550/d268b7f60a56306ced68b9762709ceaff4f1ee939f3150e7363fae300a59da12.png"/><meta property="twitter:image:alt" content="Azuki #2550"/></head>
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
@@ -155,17 +139,18 @@ exports[`should inject metadata for valid assets 2`] = `
     <meta charset="utf-8" />
 
     <title>Uniswap Interface</title>
+    <meta name="description" content="Swap or provide liquidity on the Uniswap Protocol" />
 
     <!--
-       will be replaced with the URL of the \`public\` folder during build.
+      . 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" />
+    <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 name="theme-color" content="#FC72FF" />
     <meta
       http-equiv="Content-Security-Policy"
       
@@ -183,48 +168,33 @@ exports[`should inject metadata for valid assets 2`] = `
       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="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/Inter-roman.var.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-Medium.woff" as="font" type="font/woff" crossorigin />
-
-   
     <style>
       * {
-        font-family: 'Basel', sans-serif;
+        font-family: 'Inter', sans-serif;
         box-sizing: border-box;
       }
 
       /**
-          Explicitly load Basel var from public/ so it does not block LCP's critical path.
+          Explicitly load Inter var from public/ so it does not block LCP's critical path.
         */
       @font-face {
-        font-family: 'Basel';
-        font-weight: 535;
+        font-family: 'Inter custom';
+        font-weight: 100 900;
         font-style: normal;
         font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Medium.woff) format('woff');
-      }
-
-      @font-face {
-        font-family: 'Basel';
-        font-weight: 485;
-        font-style: normal;
-        font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Book.woff) format('woff');
+        font-named-instance: 'Regular';
+        src: url(./fonts/Inter-roman.var.woff2) format('woff2 supports variations(gvar)'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2-variations'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2');
       }
 
       @supports (font-variation-settings: normal) {
         * {
-          font-family: 'Basel', sans-serif;
-          
+          font-family: 'Inter custom', sans-serif;
         }
       }
 
@@ -240,11 +210,9 @@ exports[`should inject metadata for valid assets 2`] = `
 
       html {
         font-size: 16px;
-        font-weight: 485;
         font-variant: none;
         font-smooth: always;
-        text-rendering: optimizeLegibility !important;
-        -webkit-font-smoothing: antialiased !important;
+        -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
       }
@@ -270,17 +238,17 @@ exports[`should inject metadata for valid assets 2`] = `
 
       @media (prefers-color-scheme: dark) {
         html {
-          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+          background: linear-gradient(180deg, #202738 0%, #070816 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);
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0.51) 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF
         }
       }
     </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>
+  <script defer src="./static/js/bundle.js"></script><meta property="og:title" content="Bored Ape Yacht Club #3735"/><meta property="og:image" content="https://cdn.center.app/v2/1/697f69bb495aaa24c66638cae921977354f0b8274fc2e2814e455f355e67f01d/88c2ac6b73288e41051d3fd58ff3cef1f4908403f05f4a7d2a8435d003758529.png"/><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="https://cdn.center.app/v2/1/697f69bb495aaa24c66638cae921977354f0b8274fc2e2814e455f355e67f01d/88c2ac6b73288e41051d3fd58ff3cef1f4908403f05f4a7d2a8435d003758529.png"/><meta property="twitter:image:alt" content="Bored Ape Yacht Club #3735"/></head>
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
@@ -303,17 +271,18 @@ exports[`should inject metadata for valid assets 3`] = `
     <meta charset="utf-8" />
 
     <title>Uniswap Interface</title>
+    <meta name="description" content="Swap or provide liquidity on the Uniswap Protocol" />
 
     <!--
-       will be replaced with the URL of the \`public\` folder during build.
+      . 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" />
+    <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 name="theme-color" content="#FC72FF" />
     <meta
       http-equiv="Content-Security-Policy"
       
@@ -331,48 +300,33 @@ exports[`should inject metadata for valid assets 3`] = `
       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="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/Inter-roman.var.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-Medium.woff" as="font" type="font/woff" crossorigin />
-
-   
     <style>
       * {
-        font-family: 'Basel', sans-serif;
+        font-family: 'Inter', sans-serif;
         box-sizing: border-box;
       }
 
       /**
-          Explicitly load Basel var from public/ so it does not block LCP's critical path.
+          Explicitly load Inter var from public/ so it does not block LCP's critical path.
         */
       @font-face {
-        font-family: 'Basel';
-        font-weight: 535;
+        font-family: 'Inter custom';
+        font-weight: 100 900;
         font-style: normal;
         font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Medium.woff) format('woff');
-      }
-
-      @font-face {
-        font-family: 'Basel';
-        font-weight: 485;
-        font-style: normal;
-        font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Book.woff) format('woff');
+        font-named-instance: 'Regular';
+        src: url(./fonts/Inter-roman.var.woff2) format('woff2 supports variations(gvar)'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2-variations'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2');
       }
 
       @supports (font-variation-settings: normal) {
         * {
-          font-family: 'Basel', sans-serif;
-          
+          font-family: 'Inter custom', sans-serif;
         }
       }
 
@@ -388,11 +342,9 @@ exports[`should inject metadata for valid assets 3`] = `
 
       html {
         font-size: 16px;
-        font-weight: 485;
         font-variant: none;
         font-smooth: always;
-        text-rendering: optimizeLegibility !important;
-        -webkit-font-smoothing: antialiased !important;
+        -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
       }
@@ -418,17 +370,17 @@ exports[`should inject metadata for valid assets 3`] = `
 
       @media (prefers-color-scheme: dark) {
         html {
-          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+          background: linear-gradient(180deg, #202738 0%, #070816 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);
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0.51) 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF
         }
       }
     </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>
+  <script defer src="./static/js/bundle.js"></script><meta property="og:title" content="CryptoPunk #3947"/><meta property="og:image" content="https://cdn.center.app/1/0xb47e3cd837dDF8e4c57F05d70Ab865de6e193BBB/3947/62319d784e7a816d190aa184ffe58550d6ed8eb2e117b218e2ac02f126538ee6.png"/><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="https://cdn.center.app/1/0xb47e3cd837dDF8e4c57F05d70Ab865de6e193BBB/3947/62319d784e7a816d190aa184ffe58550d6ed8eb2e117b218e2ac02f126538ee6.png"/><meta property="twitter:image:alt" content="CryptoPunk #3947"/></head>
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

functions/nfts/asset/nft.test.ts

@@ -3,19 +3,22 @@ const assets = [
     address: '0xed5af388653567af2f388e6224dc7c4b3241c544',
     assetId: '2550',
     collectionName: 'Azuki',
-    image: 'http://127.0.0.1:3000/api/image/nfts/asset/0xed5af388653567af2f388e6224dc7c4b3241c544/2550',
+    image:
+      'https://cdn.center.app/1/0xED5AF388653567Af2F388E6224dC7C4b3241C544/2550/d268b7f60a56306ced68b9762709ceaff4f1ee939f3150e7363fae300a59da12.png',
   },
   {
     address: '0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d',
     assetId: '3735',
     collectionName: 'Bored Ape Yacht Club',
-    image: 'http://127.0.0.1:3000/api/image/nfts/asset/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d/3735',
+    image:
+      'https://cdn.center.app/v2/1/697f69bb495aaa24c66638cae921977354f0b8274fc2e2814e455f355e67f01d/88c2ac6b73288e41051d3fd58ff3cef1f4908403f05f4a7d2a8435d003758529.png',
   },
   {
     address: '0xb47e3cd837ddf8e4c57f05d70ab865de6e193bbb',
     assetId: '3947',
     collectionName: 'CryptoPunk',
-    image: 'http://127.0.0.1:3000/api/image/nfts/asset/0xb47e3cd837ddf8e4c57f05d70ab865de6e193bbb/3947',
+    image:
+      'https://cdn.center.app/1/0xb47e3cd837dDF8e4c57F05d70Ab865de6e193BBB/3947/62319d784e7a816d190aa184ffe58550d6ed8eb2e117b218e2ac02f126538ee6.png',
   },
 ]
 
@@ -24,7 +27,6 @@ test.each(assets)('should inject metadata for valid assets', async (nft) => {
   const body = await fetch(new Request(url)).then((res) => res.text())
   expect(body).toMatchSnapshot()
   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"/>`)

functions/nfts/collection/[index].ts

@@ -1,13 +1,13 @@
 /* eslint-disable import/no-unused-modules */
 import getCollection from '../../utils/getCollection'
-import { getMetadataRequest } from '../../utils/getRequest'
+import getRequest from '../../utils/getRequest'
 
 export const onRequest: PagesFunction = async ({ params, request, next }) => {
   const res = next()
   try {
     const { index } = params
     const collectionAddress = index?.toString()
-    return getMetadataRequest(res, request.url, () => getCollection(collectionAddress, request.url))
+    return getRequest(res, request.url, () => getCollection(collectionAddress, request.url))
   } catch (e) {
     return res
   }

functions/nfts/collection/__snapshots__/collection.test.ts.snap

@@ -1,23 +1,24 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`should inject metadata for collections 1`] = `
+exports[`should inject metadata for valid collections 1`] = `
 "<!DOCTYPE html>
 <html translate="no">
   <head>
     <meta charset="utf-8" />
 
     <title>Uniswap Interface</title>
+    <meta name="description" content="Swap or provide liquidity on the Uniswap Protocol" />
 
     <!--
-       will be replaced with the URL of the \`public\` folder during build.
+      . 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" />
+    <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 name="theme-color" content="#FC72FF" />
     <meta
       http-equiv="Content-Security-Policy"
       
@@ -35,48 +36,33 @@ exports[`should inject metadata for collections 1`] = `
       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="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/Inter-roman.var.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-Medium.woff" as="font" type="font/woff" crossorigin />
-
-   
     <style>
       * {
-        font-family: 'Basel', sans-serif;
+        font-family: 'Inter', sans-serif;
         box-sizing: border-box;
       }
 
       /**
-          Explicitly load Basel var from public/ so it does not block LCP's critical path.
+          Explicitly load Inter var from public/ so it does not block LCP's critical path.
         */
       @font-face {
-        font-family: 'Basel';
-        font-weight: 535;
+        font-family: 'Inter custom';
+        font-weight: 100 900;
         font-style: normal;
         font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Medium.woff) format('woff');
-      }
-
-      @font-face {
-        font-family: 'Basel';
-        font-weight: 485;
-        font-style: normal;
-        font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Book.woff) format('woff');
+        font-named-instance: 'Regular';
+        src: url(./fonts/Inter-roman.var.woff2) format('woff2 supports variations(gvar)'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2-variations'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2');
       }
 
       @supports (font-variation-settings: normal) {
         * {
-          font-family: 'Basel', sans-serif;
-          
+          font-family: 'Inter custom', sans-serif;
         }
       }
 
@@ -92,11 +78,9 @@ exports[`should inject metadata for collections 1`] = `
 
       html {
         font-size: 16px;
-        font-weight: 485;
         font-variant: none;
         font-smooth: always;
-        text-rendering: optimizeLegibility !important;
-        -webkit-font-smoothing: antialiased !important;
+        -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
       }
@@ -122,17 +106,17 @@ exports[`should inject metadata for collections 1`] = `
 
       @media (prefers-color-scheme: dark) {
         html {
-          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+          background: linear-gradient(180deg, #202738 0%, #070816 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);
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0.51) 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF
         }
       }
     </style>
-  <script defer src="/static/js/bundle.js"></script><meta property="og:title" content="Azuki on Uniswap"/><meta property="og:image" content="http://127.0.0.1:3000/api/image/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c544"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Azuki on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c544"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Azuki on Uniswap"/><meta property="twitter:image" content="http://127.0.0.1:3000/api/image/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c544"/><meta property="twitter:image:alt" content="Azuki on Uniswap"/></head>
+  <script defer src="./static/js/bundle.js"></script><meta property="og:title" content="Azuki on Uniswap"/><meta property="og:image" content="https://i.seadn.io/gae/H8jOCJuQokNqGBpkBN5wk1oZwO7LM8bNnrHCaekV2nKjnCqw6UB5oaH8XyNeBDj6bA_n1mjejzhFQUP3O1NfjFLHr3FOaeHcTOOT?w=500&auto=format"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Azuki on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c544"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Azuki on Uniswap"/><meta property="twitter:image" content="https://i.seadn.io/gae/H8jOCJuQokNqGBpkBN5wk1oZwO7LM8bNnrHCaekV2nKjnCqw6UB5oaH8XyNeBDj6bA_n1mjejzhFQUP3O1NfjFLHr3FOaeHcTOOT?w=500&auto=format"/><meta property="twitter:image:alt" content="Azuki on Uniswap"/></head>
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
@@ -148,24 +132,25 @@ exports[`should inject metadata for collections 1`] = `
 "
 `;
 
-exports[`should inject metadata for collections 2`] = `
+exports[`should inject metadata for valid collections 2`] = `
 "<!DOCTYPE html>
 <html translate="no">
   <head>
     <meta charset="utf-8" />
 
     <title>Uniswap Interface</title>
+    <meta name="description" content="Swap or provide liquidity on the Uniswap Protocol" />
 
     <!--
-       will be replaced with the URL of the \`public\` folder during build.
+      . 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" />
+    <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 name="theme-color" content="#FC72FF" />
     <meta
       http-equiv="Content-Security-Policy"
       
@@ -183,48 +168,33 @@ exports[`should inject metadata for collections 2`] = `
       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="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/Inter-roman.var.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-Medium.woff" as="font" type="font/woff" crossorigin />
-
-   
     <style>
       * {
-        font-family: 'Basel', sans-serif;
+        font-family: 'Inter', sans-serif;
         box-sizing: border-box;
       }
 
       /**
-          Explicitly load Basel var from public/ so it does not block LCP's critical path.
+          Explicitly load Inter var from public/ so it does not block LCP's critical path.
         */
       @font-face {
-        font-family: 'Basel';
-        font-weight: 535;
+        font-family: 'Inter custom';
+        font-weight: 100 900;
         font-style: normal;
         font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Medium.woff) format('woff');
-      }
-
-      @font-face {
-        font-family: 'Basel';
-        font-weight: 485;
-        font-style: normal;
-        font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Book.woff) format('woff');
+        font-named-instance: 'Regular';
+        src: url(./fonts/Inter-roman.var.woff2) format('woff2 supports variations(gvar)'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2-variations'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2');
       }
 
       @supports (font-variation-settings: normal) {
         * {
-          font-family: 'Basel', sans-serif;
-          
+          font-family: 'Inter custom', sans-serif;
         }
       }
 
@@ -240,11 +210,9 @@ exports[`should inject metadata for collections 2`] = `
 
       html {
         font-size: 16px;
-        font-weight: 485;
         font-variant: none;
         font-smooth: always;
-        text-rendering: optimizeLegibility !important;
-        -webkit-font-smoothing: antialiased !important;
+        -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
       }
@@ -270,17 +238,17 @@ exports[`should inject metadata for collections 2`] = `
 
       @media (prefers-color-scheme: dark) {
         html {
-          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+          background: linear-gradient(180deg, #202738 0%, #070816 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);
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0.51) 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF
         }
       }
     </style>
-  <script defer src="/static/js/bundle.js"></script><meta property="og:title" content="Bored Ape Yacht Club on Uniswap"/><meta property="og:image" content="http://127.0.0.1:3000/api/image/nfts/collection/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Bored Ape Yacht Club on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/nfts/collection/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Bored Ape Yacht Club on Uniswap"/><meta property="twitter:image" content="http://127.0.0.1:3000/api/image/nfts/collection/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d"/><meta property="twitter:image:alt" content="Bored Ape Yacht Club on Uniswap"/></head>
+  <script defer src="./static/js/bundle.js"></script><meta property="og:title" content="Bored Ape Yacht Club on Uniswap"/><meta property="og:image" content="https://i.seadn.io/gae/Ju9CkWtV-1Okvf45wo8UctR-M9He2PjILP0oOvxE89AyiPPGtrR3gysu1Zgy0hjd2xKIgjJJtWIc0ybj4Vd7wv8t3pxDGHoJBzDB?w=500&auto=format"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Bored Ape Yacht Club on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/nfts/collection/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Bored Ape Yacht Club on Uniswap"/><meta property="twitter:image" content="https://i.seadn.io/gae/Ju9CkWtV-1Okvf45wo8UctR-M9He2PjILP0oOvxE89AyiPPGtrR3gysu1Zgy0hjd2xKIgjJJtWIc0ybj4Vd7wv8t3pxDGHoJBzDB?w=500&auto=format"/><meta property="twitter:image:alt" content="Bored Ape Yacht Club on Uniswap"/></head>
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
@@ -296,24 +264,25 @@ exports[`should inject metadata for collections 2`] = `
 "
 `;
 
-exports[`should inject metadata for collections 3`] = `
+exports[`should inject metadata for valid collections 3`] = `
 "<!DOCTYPE html>
 <html translate="no">
   <head>
     <meta charset="utf-8" />
 
     <title>Uniswap Interface</title>
+    <meta name="description" content="Swap or provide liquidity on the Uniswap Protocol" />
 
     <!--
-       will be replaced with the URL of the \`public\` folder during build.
+      . 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" />
+    <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 name="theme-color" content="#FC72FF" />
     <meta
       http-equiv="Content-Security-Policy"
       
@@ -331,48 +300,33 @@ exports[`should inject metadata for collections 3`] = `
       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="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/Inter-roman.var.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-Medium.woff" as="font" type="font/woff" crossorigin />
-
-   
     <style>
       * {
-        font-family: 'Basel', sans-serif;
+        font-family: 'Inter', sans-serif;
         box-sizing: border-box;
       }
 
       /**
-          Explicitly load Basel var from public/ so it does not block LCP's critical path.
+          Explicitly load Inter var from public/ so it does not block LCP's critical path.
         */
       @font-face {
-        font-family: 'Basel';
-        font-weight: 535;
+        font-family: 'Inter custom';
+        font-weight: 100 900;
         font-style: normal;
         font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Medium.woff) format('woff');
-      }
-
-      @font-face {
-        font-family: 'Basel';
-        font-weight: 485;
-        font-style: normal;
-        font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Book.woff) format('woff');
+        font-named-instance: 'Regular';
+        src: url(./fonts/Inter-roman.var.woff2) format('woff2 supports variations(gvar)'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2-variations'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2');
       }
 
       @supports (font-variation-settings: normal) {
         * {
-          font-family: 'Basel', sans-serif;
-          
+          font-family: 'Inter custom', sans-serif;
         }
       }
 
@@ -388,11 +342,9 @@ exports[`should inject metadata for collections 3`] = `
 
       html {
         font-size: 16px;
-        font-weight: 485;
         font-variant: none;
         font-smooth: always;
-        text-rendering: optimizeLegibility !important;
-        -webkit-font-smoothing: antialiased !important;
+        -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
       }
@@ -418,165 +370,17 @@ exports[`should inject metadata for collections 3`] = `
 
       @media (prefers-color-scheme: dark) {
         html {
-          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+          background: linear-gradient(180deg, #202738 0%, #070816 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);
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0.51) 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF
         }
       }
     </style>
-  <script defer src="/static/js/bundle.js"></script><meta property="og:title" content="CLONE X - X TAKASHI MURAKAMI on Uniswap"/><meta property="og:image" content="http://127.0.0.1:3000/api/image/nfts/collection/0x49cf6f5d44e70224e2e23fdcdd2c053f30ada28b"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="CLONE X - X TAKASHI MURAKAMI on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/nfts/collection/0x49cf6f5d44e70224e2e23fdcdd2c053f30ada28b"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="CLONE X - X TAKASHI MURAKAMI on Uniswap"/><meta property="twitter:image" content="http://127.0.0.1:3000/api/image/nfts/collection/0x49cf6f5d44e70224e2e23fdcdd2c053f30ada28b"/><meta property="twitter:image:alt" content="CLONE X - X TAKASHI MURAKAMI on Uniswap"/></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 collections 4`] = `
-"<!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-Medium.woff" as="font" type="font/woff" 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;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Medium.woff) format('woff');
-      }
-
-      @font-face {
-        font-family: 'Basel';
-        font-weight: 485;
-        font-style: normal;
-        font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          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="0xed5af388653567af2f388e6224dc7c4b3241c545 on Uniswap"/><meta property="og:image" content="http://127.0.0.1:3000/api/image/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c545"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="0xed5af388653567af2f388e6224dc7c4b3241c545 on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c545"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="0xed5af388653567af2f388e6224dc7c4b3241c545 on Uniswap"/><meta property="twitter:image" content="http://127.0.0.1:3000/api/image/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c545"/><meta property="twitter:image:alt" content="0xed5af388653567af2f388e6224dc7c4b3241c545 on Uniswap"/></head>
+  <script defer src="./static/js/bundle.js"></script><meta property="og:title" content="CLONE X - X TAKASHI MURAKAMI on Uniswap"/><meta property="og:image" content="https://i.seadn.io/gae/XN0XuD8Uh3jyRWNtPTFeXJg_ht8m5ofDx6aHklOiy4amhFuWUa0JaR6It49AH8tlnYS386Q0TW_-Lmedn0UET_ko1a3CbJGeu5iHMg?w=500&auto=format"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="CLONE X - X TAKASHI MURAKAMI on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/nfts/collection/0x49cf6f5d44e70224e2e23fdcdd2c053f30ada28b"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="CLONE X - X TAKASHI MURAKAMI on Uniswap"/><meta property="twitter:image" content="https://i.seadn.io/gae/XN0XuD8Uh3jyRWNtPTFeXJg_ht8m5ofDx6aHklOiy4amhFuWUa0JaR6It49AH8tlnYS386Q0TW_-Lmedn0UET_ko1a3CbJGeu5iHMg?w=500&auto=format"/><meta property="twitter:image:alt" content="CLONE X - X TAKASHI MURAKAMI on Uniswap"/></head>
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

functions/nfts/collection/collection.test.ts

@@ -2,34 +2,28 @@ const collections = [
   {
     address: '0xed5af388653567af2f388e6224dc7c4b3241c544',
     collectionName: 'Azuki',
-    image: 'http://127.0.0.1:3000/api/image/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c544',
+    image:
+      'https://i.seadn.io/gae/H8jOCJuQokNqGBpkBN5wk1oZwO7LM8bNnrHCaekV2nKjnCqw6UB5oaH8XyNeBDj6bA_n1mjejzhFQUP3O1NfjFLHr3FOaeHcTOOT?w=500&auto=format',
   },
   {
     address: '0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d',
     collectionName: 'Bored Ape Yacht Club',
-    image: 'http://127.0.0.1:3000/api/image/nfts/collection/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d',
+    image:
+      'https://i.seadn.io/gae/Ju9CkWtV-1Okvf45wo8UctR-M9He2PjILP0oOvxE89AyiPPGtrR3gysu1Zgy0hjd2xKIgjJJtWIc0ybj4Vd7wv8t3pxDGHoJBzDB?w=500&auto=format',
   },
   {
     address: '0x49cf6f5d44e70224e2e23fdcdd2c053f30ada28b',
     collectionName: 'CLONE X - X TAKASHI MURAKAMI',
-    image: 'http://127.0.0.1:3000/api/image/nfts/collection/0x49cf6f5d44e70224e2e23fdcdd2c053f30ada28b',
+    image:
+      'https://i.seadn.io/gae/XN0XuD8Uh3jyRWNtPTFeXJg_ht8m5ofDx6aHklOiy4amhFuWUa0JaR6It49AH8tlnYS386Q0TW_-Lmedn0UET_ko1a3CbJGeu5iHMg?w=500&auto=format',
   },
 ]
 
-const nonexistentCollections = [
-  {
-    address: '0xed5af388653567af2f388e6224dc7c4b3241c545',
-    collectionName: '0xed5af388653567af2f388e6224dc7c4b3241c545',
-    image: 'http://127.0.0.1:3000/api/image/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c545',
-  },
-]
-
-test.each([...collections, ...nonexistentCollections])('should inject metadata for collections', async (collection) => {
+test.each(collections)('should inject metadata for valid collections', async (collection) => {
   const url = 'http://127.0.0.1:3000/nfts/collection/' + collection.address
   const body = await fetch(new Request(url)).then((res) => res.text())
   expect(body).toMatchSnapshot()
   expect(body).toContain(`<meta property="og:title" content="${collection.collectionName} on Uniswap"/>`)
-  expect(body).not.toContain(`<meta property="og:description"`)
   expect(body).toContain(`<meta property="og:image" content="${collection.image}"/>`)
   expect(body).toContain(`<meta property="og:image:width" content="1200"/>`)
   expect(body).toContain(`<meta property="og:image:height" content="630"/>`)
@@ -43,23 +37,27 @@ test.each([...collections, ...nonexistentCollections])('should inject metadata f
 })
 
 const invalidCollections = [
-  {
-    address: '0xd3adb33f',
-  },
+  'http://127.0.0.1:3000/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c545',
+  'http://127.0.0.1:3000/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c545/10',
+  'http://127.0.0.1:3000/nfts/collection/0xed5af388653567af2f388e6224dc7c4b3241c545//',
+  'http://127.0.0.1:3000/nfts/collection',
 ]
 
-test.each(invalidCollections)('should not inject metadata for nonexistent collections', async (collection) => {
-  const url = 'http://127.0.0.1:3000/nfts/collection/' + collection.address
-  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(invalidCollections)(
+  'should not inject metadata for invalid collection urls',
+  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')
+  },
+  50000
+)

functions/setupAfterEnv.ts

@@ -1 +0,0 @@
-jest.retryTimes(3)

functions/tokens/[[index]].ts

@@ -1,17 +1,33 @@
 /* eslint-disable import/no-unused-modules */
-import { getMetadataRequest } from '../utils/getRequest'
+import { Chain } from '../../src/graphql/data/__generated__/types-and-hooks'
+import getRequest from '../utils/getRequest'
 import getToken from '../utils/getToken'
 
+const convertTokenAddress = (tokenAddress: string, networkName: string) => {
+  if (tokenAddress === 'NATIVE') {
+    switch (networkName) {
+      case Chain.Celo:
+        return '0x471EcE3750Da237f93B8E339c536989b8978a438'
+      case Chain.Polygon:
+        return '0x0000000000000000000000000000000000001010'
+      default:
+        return undefined
+    }
+  }
+  return tokenAddress
+}
+
 export const onRequest: PagesFunction = async ({ params, request, next }) => {
   const res = next()
   try {
     const { index } = params
-    const networkName = index[0]?.toString()
-    const tokenAddress = index[1]?.toString()
-    if (!tokenAddress) {
+    const networkName = index[0]?.toString().toUpperCase()
+    const tokenString = index[1]?.toString()
+    if (!tokenString) {
       return res
     }
-    return getMetadataRequest(res, request.url, () => getToken(networkName, tokenAddress, request.url))
+    const tokenAddress = convertTokenAddress(tokenString, networkName)
+    return getRequest(res, request.url, () => getToken(networkName, tokenAddress, request.url))
   } catch (e) {
     return res
   }

functions/tokens/__snapshots__/token.test.ts.snap

@@ -7,17 +7,18 @@ exports[`should inject metadata for valid tokens 1`] = `
     <meta charset="utf-8" />
 
     <title>Uniswap Interface</title>
+    <meta name="description" content="Swap or provide liquidity on the Uniswap Protocol" />
 
     <!--
-       will be replaced with the URL of the \`public\` folder during build.
+      . 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" />
+    <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 name="theme-color" content="#FC72FF" />
     <meta
       http-equiv="Content-Security-Policy"
       
@@ -35,48 +36,33 @@ exports[`should inject metadata for valid tokens 1`] = `
       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="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/Inter-roman.var.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-Medium.woff" as="font" type="font/woff" crossorigin />
-
-   
     <style>
       * {
-        font-family: 'Basel', sans-serif;
+        font-family: 'Inter', sans-serif;
         box-sizing: border-box;
       }
 
       /**
-          Explicitly load Basel var from public/ so it does not block LCP's critical path.
+          Explicitly load Inter var from public/ so it does not block LCP's critical path.
         */
       @font-face {
-        font-family: 'Basel';
-        font-weight: 535;
+        font-family: 'Inter custom';
+        font-weight: 100 900;
         font-style: normal;
         font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Medium.woff) format('woff');
-      }
-
-      @font-face {
-        font-family: 'Basel';
-        font-weight: 485;
-        font-style: normal;
-        font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Book.woff) format('woff');
+        font-named-instance: 'Regular';
+        src: url(./fonts/Inter-roman.var.woff2) format('woff2 supports variations(gvar)'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2-variations'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2');
       }
 
       @supports (font-variation-settings: normal) {
         * {
-          font-family: 'Basel', sans-serif;
-          
+          font-family: 'Inter custom', sans-serif;
         }
       }
 
@@ -92,11 +78,9 @@ exports[`should inject metadata for valid tokens 1`] = `
 
       html {
         font-size: 16px;
-        font-weight: 485;
         font-variant: none;
         font-smooth: always;
-        text-rendering: optimizeLegibility !important;
-        -webkit-font-smoothing: antialiased !important;
+        -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
       }
@@ -122,17 +106,17 @@ exports[`should inject metadata for valid tokens 1`] = `
 
       @media (prefers-color-scheme: dark) {
         html {
-          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+          background: linear-gradient(180deg, #202738 0%, #070816 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);
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0.51) 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF
         }
       }
     </style>
-  <script defer src="/static/js/bundle.js"></script><meta property="og:title" content="Get USDC on Uniswap"/><meta property="og:image" content="http://127.0.0.1:3000/api/image/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Get USDC on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Get USDC on Uniswap"/><meta property="twitter:image" content="http://127.0.0.1:3000/api/image/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"/><meta property="twitter:image:alt" content="Get USDC on Uniswap"/></head>
+  <script defer src="./static/js/bundle.js"></script><meta property="og:title" content="Get USDC on Uniswap"/><meta property="og:image" content="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Get USDC on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Get USDC on Uniswap"/><meta property="twitter:image" content="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"/><meta property="twitter:image:alt" content="Get USDC on Uniswap"/></head>
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
@@ -155,17 +139,18 @@ exports[`should inject metadata for valid tokens 2`] = `
     <meta charset="utf-8" />
 
     <title>Uniswap Interface</title>
+    <meta name="description" content="Swap or provide liquidity on the Uniswap Protocol" />
 
     <!--
-       will be replaced with the URL of the \`public\` folder during build.
+      . 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" />
+    <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 name="theme-color" content="#FC72FF" />
     <meta
       http-equiv="Content-Security-Policy"
       
@@ -183,48 +168,33 @@ exports[`should inject metadata for valid tokens 2`] = `
       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="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/Inter-roman.var.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-Medium.woff" as="font" type="font/woff" crossorigin />
-
-   
     <style>
       * {
-        font-family: 'Basel', sans-serif;
+        font-family: 'Inter', sans-serif;
         box-sizing: border-box;
       }
 
       /**
-          Explicitly load Basel var from public/ so it does not block LCP's critical path.
+          Explicitly load Inter var from public/ so it does not block LCP's critical path.
         */
       @font-face {
-        font-family: 'Basel';
-        font-weight: 535;
+        font-family: 'Inter custom';
+        font-weight: 100 900;
         font-style: normal;
         font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Medium.woff) format('woff');
-      }
-
-      @font-face {
-        font-family: 'Basel';
-        font-weight: 485;
-        font-style: normal;
-        font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Book.woff) format('woff');
+        font-named-instance: 'Regular';
+        src: url(./fonts/Inter-roman.var.woff2) format('woff2 supports variations(gvar)'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2-variations'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2');
       }
 
       @supports (font-variation-settings: normal) {
         * {
-          font-family: 'Basel', sans-serif;
-          
+          font-family: 'Inter custom', sans-serif;
         }
       }
 
@@ -240,11 +210,9 @@ exports[`should inject metadata for valid tokens 2`] = `
 
       html {
         font-size: 16px;
-        font-weight: 485;
         font-variant: none;
         font-smooth: always;
-        text-rendering: optimizeLegibility !important;
-        -webkit-font-smoothing: antialiased !important;
+        -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
       }
@@ -270,17 +238,17 @@ exports[`should inject metadata for valid tokens 2`] = `
 
       @media (prefers-color-scheme: dark) {
         html {
-          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+          background: linear-gradient(180deg, #202738 0%, #070816 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);
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0.51) 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF
         }
       }
     </style>
-  <script defer src="/static/js/bundle.js"></script><meta property="og:title" content="Get ETH on Uniswap"/><meta property="og:image" content="http://127.0.0.1:3000/api/image/tokens/ethereum/NATIVE"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Get ETH on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/tokens/ethereum/NATIVE"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Get ETH on Uniswap"/><meta property="twitter:image" content="http://127.0.0.1:3000/api/image/tokens/ethereum/NATIVE"/><meta property="twitter:image:alt" content="Get ETH on Uniswap"/></head>
+  <script defer src="./static/js/bundle.js"></script><meta property="og:title" content="Get ETH on Uniswap"/><meta property="og:image" content="https://token-icons.s3.amazonaws.com/eth.png"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Get ETH on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/tokens/ethereum/NATIVE"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Get ETH on Uniswap"/><meta property="twitter:image" content="https://token-icons.s3.amazonaws.com/eth.png"/><meta property="twitter:image:alt" content="Get ETH on Uniswap"/></head>
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
@@ -303,17 +271,18 @@ exports[`should inject metadata for valid tokens 3`] = `
     <meta charset="utf-8" />
 
     <title>Uniswap Interface</title>
+    <meta name="description" content="Swap or provide liquidity on the Uniswap Protocol" />
 
     <!--
-       will be replaced with the URL of the \`public\` folder during build.
+      . 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" />
+    <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 name="theme-color" content="#FC72FF" />
     <meta
       http-equiv="Content-Security-Policy"
       
@@ -331,48 +300,33 @@ exports[`should inject metadata for valid tokens 3`] = `
       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="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/Inter-roman.var.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-Medium.woff" as="font" type="font/woff" crossorigin />
-
-   
     <style>
       * {
-        font-family: 'Basel', sans-serif;
+        font-family: 'Inter', sans-serif;
         box-sizing: border-box;
       }
 
       /**
-          Explicitly load Basel var from public/ so it does not block LCP's critical path.
+          Explicitly load Inter var from public/ so it does not block LCP's critical path.
         */
       @font-face {
-        font-family: 'Basel';
-        font-weight: 535;
+        font-family: 'Inter custom';
+        font-weight: 100 900;
         font-style: normal;
         font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Medium.woff) format('woff');
-      }
-
-      @font-face {
-        font-family: 'Basel';
-        font-weight: 485;
-        font-style: normal;
-        font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Book.woff) format('woff');
+        font-named-instance: 'Regular';
+        src: url(./fonts/Inter-roman.var.woff2) format('woff2 supports variations(gvar)'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2-variations'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2');
       }
 
       @supports (font-variation-settings: normal) {
         * {
-          font-family: 'Basel', sans-serif;
-          
+          font-family: 'Inter custom', sans-serif;
         }
       }
 
@@ -388,11 +342,9 @@ exports[`should inject metadata for valid tokens 3`] = `
 
       html {
         font-size: 16px;
-        font-weight: 485;
         font-variant: none;
         font-smooth: always;
-        text-rendering: optimizeLegibility !important;
-        -webkit-font-smoothing: antialiased !important;
+        -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
       }
@@ -418,17 +370,17 @@ exports[`should inject metadata for valid tokens 3`] = `
 
       @media (prefers-color-scheme: dark) {
         html {
-          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+          background: linear-gradient(180deg, #202738 0%, #070816 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);
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0.51) 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF
         }
       }
     </style>
-  <script defer src="/static/js/bundle.js"></script><meta property="og:title" content="Get MATIC on Uniswap"/><meta property="og:image" content="http://127.0.0.1:3000/api/image/tokens/polygon/NATIVE"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Get MATIC on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/tokens/polygon/NATIVE"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Get MATIC on Uniswap"/><meta property="twitter:image" content="http://127.0.0.1:3000/api/image/tokens/polygon/NATIVE"/><meta property="twitter:image:alt" content="Get MATIC on Uniswap"/></head>
+  <script defer src="./static/js/bundle.js"></script><meta property="og:title" content="Get MATIC on Uniswap"/><meta property="og:image" content="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0/logo.png"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Get MATIC on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/tokens/polygon/NATIVE"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Get MATIC on Uniswap"/><meta property="twitter:image" content="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0/logo.png"/><meta property="twitter:image:alt" content="Get MATIC on Uniswap"/></head>
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
@@ -451,17 +403,18 @@ exports[`should inject metadata for valid tokens 4`] = `
     <meta charset="utf-8" />
 
     <title>Uniswap Interface</title>
+    <meta name="description" content="Swap or provide liquidity on the Uniswap Protocol" />
 
     <!--
-       will be replaced with the URL of the \`public\` folder during build.
+      . 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" />
+    <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 name="theme-color" content="#FC72FF" />
     <meta
       http-equiv="Content-Security-Policy"
       
@@ -479,48 +432,33 @@ exports[`should inject metadata for valid tokens 4`] = `
       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="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/Inter-roman.var.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-Medium.woff" as="font" type="font/woff" crossorigin />
-
-   
     <style>
       * {
-        font-family: 'Basel', sans-serif;
+        font-family: 'Inter', sans-serif;
         box-sizing: border-box;
       }
 
       /**
-          Explicitly load Basel var from public/ so it does not block LCP's critical path.
+          Explicitly load Inter var from public/ so it does not block LCP's critical path.
         */
       @font-face {
-        font-family: 'Basel';
-        font-weight: 535;
+        font-family: 'Inter custom';
+        font-weight: 100 900;
         font-style: normal;
         font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Medium.woff) format('woff');
-      }
-
-      @font-face {
-        font-family: 'Basel';
-        font-weight: 485;
-        font-style: normal;
-        font-display: block;
-        font-named-instance: 'Book';
-        src: 
-          url(/fonts/Basel-Book.woff) format('woff');
+        font-named-instance: 'Regular';
+        src: url(./fonts/Inter-roman.var.woff2) format('woff2 supports variations(gvar)'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2-variations'),
+          url(./fonts/Inter-roman.var.woff2) format('woff2');
       }
 
       @supports (font-variation-settings: normal) {
         * {
-          font-family: 'Basel', sans-serif;
-          
+          font-family: 'Inter custom', sans-serif;
         }
       }
 
@@ -536,11 +474,9 @@ exports[`should inject metadata for valid tokens 4`] = `
 
       html {
         font-size: 16px;
-        font-weight: 485;
         font-variant: none;
         font-smooth: always;
-        text-rendering: optimizeLegibility !important;
-        -webkit-font-smoothing: antialiased !important;
+        -webkit-font-smoothing: antialiased;
         -moz-osx-font-smoothing: grayscale;
         -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
       }
@@ -566,17 +502,17 @@ exports[`should inject metadata for valid tokens 4`] = `
 
       @media (prefers-color-scheme: dark) {
         html {
-          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+          background: linear-gradient(180deg, #202738 0%, #070816 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);
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0.51) 0%, rgba(255, 255, 255, 0) 100%), #FFFFFF
         }
       }
     </style>
-  <script defer src="/static/js/bundle.js"></script><meta property="og:title" content="Get PEPE on Uniswap"/><meta property="og:image" content="http://127.0.0.1:3000/api/image/tokens/ethereum/0x6982508145454ce325ddbe47a25d4ec3d2311933"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Get PEPE on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/tokens/ethereum/0x6982508145454ce325ddbe47a25d4ec3d2311933"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Get PEPE on Uniswap"/><meta property="twitter:image" content="http://127.0.0.1:3000/api/image/tokens/ethereum/0x6982508145454ce325ddbe47a25d4ec3d2311933"/><meta property="twitter:image:alt" content="Get PEPE on Uniswap"/></head>
+  <script defer src="./static/js/bundle.js"></script><meta property="og:title" content="Get PEPE on Uniswap"/><meta property="og:image" content="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6982508145454Ce325dDbE47a25d4ec3d2311933/logo.png"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Get PEPE on Uniswap"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/tokens/ethereum/0x6982508145454ce325ddbe47a25d4ec3d2311933"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Get PEPE on Uniswap"/><meta property="twitter:image" content="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6982508145454Ce325dDbE47a25d4ec3d2311933/logo.png"/><meta property="twitter:image:alt" content="Get PEPE on Uniswap"/></head>
 
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

functions/tokens/token.test.ts

@@ -3,25 +3,28 @@ const tokens = [
     address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
     network: 'ethereum',
     symbol: 'USDC',
-    image: 'http://127.0.0.1:3000/api/image/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+    image:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
   },
   {
     address: 'NATIVE',
     network: 'ethereum',
     symbol: 'ETH',
-    image: 'http://127.0.0.1:3000/api/image/tokens/ethereum/NATIVE',
+    image: 'https://token-icons.s3.amazonaws.com/eth.png',
   },
   {
     address: 'NATIVE',
     network: 'polygon',
     symbol: 'MATIC',
-    image: 'http://127.0.0.1:3000/api/image/tokens/polygon/NATIVE',
+    image:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x7D1AfA7B718fb893dB30A3aBc0Cfc608AaCfeBB0/logo.png',
   },
   {
     address: '0x6982508145454ce325ddbe47a25d4ec3d2311933',
     network: 'ethereum',
     symbol: 'PEPE',
-    image: 'http://127.0.0.1:3000/api/image/tokens/ethereum/0x6982508145454ce325ddbe47a25d4ec3d2311933',
+    image:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6982508145454Ce325dDbE47a25d4ec3d2311933/logo.png',
   },
 ]
 
@@ -30,7 +33,6 @@ test.each(tokens)('should inject metadata for valid tokens', async (token) => {
   const body = await fetch(new Request(url)).then((res) => res.text())
   expect(body).toMatchSnapshot()
   expect(body).toContain(`<meta property="og:title" content="Get ${token.symbol} on Uniswap"/>`)
-  expect(body).not.toContain(`<meta property="og:description"`)
   expect(body).toContain(`<meta property="og:image" content="${token.image}"/>`)
   expect(body).toContain(`<meta property="og:image:width" content="1200"/>`)
   expect(body).toContain(`<meta property="og:image:height" content="630"/>`)

functions/tsconfig.json

@@ -1,13 +1,19 @@
 {
-  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": "functions",
-    "composite": false,
+    "esModuleInterop": true,
     "incremental": true,
-    "isolatedModules": false,
-    "jsx": "react",
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "moduleResolution": "node",
+    "module": "esnext",
+    "noEmit": true,
+    "strict": true,
+    "target": "ESNext",
     "tsBuildInfoFile": "../node_modules/.cache/tsbuildinfo/functions", // avoid clobbering the build tsbuildinfo
     "types": ["jest", "node", "@cloudflare/workers-types"],
+    "jsx": "react",
+    "skipLibCheck": true,
+    "baseUrl": "functions"
   },
-  "include": ["**/*.ts", ".ts", "**/*.tsx"],
+  "exclude": ["../node_modules", "../src"],
+  "include": ["**/*.ts"],
 }

functions/types.d.ts

@@ -1 +0,0 @@
-declare module 'colorthief/src/color-thief-node'

functions/utils/cache.ts

@@ -1,11 +1,7 @@
-export interface Data {
+interface Data {
   title: string
   image: string
   url: string
-  name?: string
-  ogImage?: string
-  isVerified?: boolean
-  symbol?: string
 }
 
 const CACHE_NAME = 'functions-cache' as const

functions/utils/getAsset.ts

@@ -1,7 +1,7 @@
-import { AssetDocument, AssetQuery } from '../../src/graphql/data/__generated__/types-and-hooks'
+import { AssetDocument } from '../../src/graphql/data/__generated__/types-and-hooks'
 import client from '../client'
 
-function formatTitleName(name: string | undefined, collectionName: string | undefined, tokenId: string) {
+function formatTitleName(name: string, collectionName: string, tokenId: string) {
   if (name) {
     return name
   }
@@ -15,9 +15,7 @@ function formatTitleName(name: string | undefined, collectionName: string | unde
 }
 
 export default async function getAsset(collectionAddress: string, tokenId: string, url: string) {
-  const origin = new URL(url).origin
-  const image = origin + '/api/image/nfts/asset/' + collectionAddress + '/' + tokenId
-  const { data } = await client.query<AssetQuery>({
+  const { data } = await client.query({
     query: AssetDocument,
     variables: {
       address: collectionAddress,
@@ -33,9 +31,8 @@ export default async function getAsset(collectionAddress: string, tokenId: strin
   const title = formatTitleName(asset.name, asset.collection?.name, asset.tokenId)
   const formattedAsset = {
     title,
-    image,
+    image: asset.image?.url,
     url,
-    ogImage: asset.image?.url ?? origin + '/images/192x192_App_Icon.png',
   }
   return formattedAsset
 }

functions/utils/getCollection.ts

@@ -1,10 +1,8 @@
-import { CollectionDocument, CollectionQuery } from '../../src/graphql/data/__generated__/types-and-hooks'
+import { CollectionDocument } from '../../src/graphql/data/__generated__/types-and-hooks'
 import client from '../client'
 
 export default async function getCollection(collectionAddress: string, url: string) {
-  const origin = new URL(url).origin
-  const image = origin + '/api/image/nfts/collection/' + collectionAddress
-  const { data } = await client.query<CollectionQuery>({
+  const { data } = await client.query({
     query: CollectionDocument,
     variables: {
       addresses: collectionAddress,
@@ -16,11 +14,8 @@ export default async function getCollection(collectionAddress: string, url: stri
   }
   const formattedAsset = {
     title: collection.name + ' on Uniswap',
-    image,
+    image: collection.image?.url,
     url,
-    name: collection.name ?? 'Collection',
-    ogImage: collection.image?.url ?? origin + '/images/192x192_App_Icon.png',
-    isVerified: collection.isVerified ?? false,
   }
   return formattedAsset
 }

functions/utils/getFont.ts

@@ -1,5 +0,0 @@
-export default async function getFont(origin: string) {
-  const url = origin + '/fonts/Inter-normal.var.ttf'
-  const font = await fetch(url)
-  return font.arrayBuffer()
-}

functions/utils/getNetworkLogoURL.ts

@@ -1,16 +0,0 @@
-import { Chain } from '../../src/graphql/data/__generated__/types-and-hooks'
-
-export default function getNetworkLogoUrl(network: string, origin: string) {
-  switch (network) {
-    case Chain.Polygon:
-      return origin + '/images/logos/Polygon_Logo.png'
-    case Chain.Arbitrum:
-      return origin + '/images/logos/Arbitrum_Logo.png'
-    case Chain.Optimism:
-      return origin + '/images/logos/Optimism_Logo.png'
-    case Chain.Celo:
-      return origin + '/images/logos/Celo_Logo.png'
-    default:
-      return ''
-  }
-}

functions/utils/getRequest.test.ts

@@ -2,8 +2,8 @@ import * as matchers from 'jest-extended'
 expect.extend(matchers)
 
 import { mocked } from '../../src/test-utils/mocked'
-import Cache, { Data } from './cache'
-import { getRequest } from './getRequest'
+import Cache from './cache'
+import getRequest from './getRequest'
 
 jest.mock('./cache', () => ({
   match: jest.fn(),
@@ -17,7 +17,7 @@ test('should call Cache.match before calling getData when request is not cached'
     image: 'testImage',
     url: 'testUrl',
   })
-  await getRequest(url, getData, (data): data is Data => true)
+  await getRequest(Promise.resolve(new Response()), url, getData)
   expect(Cache.match).toHaveBeenCalledWith(url)
   expect(getData).toHaveBeenCalled()
   expect(Cache.match).toHaveBeenCalledBefore(getData)
@@ -32,7 +32,7 @@ test('getData should not be called when request is cached', async () => {
     url: 'testUrl',
   })
   const getData = jest.fn()
-  await getRequest(url, getData, (data): data is Data => true)
+  await getRequest(Promise.resolve(new Response()), url, getData)
   expect(Cache.match).toHaveBeenCalledWith(url)
   expect(getData).not.toHaveBeenCalled()
 })

functions/utils/getRequest.ts

@@ -1,42 +1,31 @@
 import { MetaTagInjector } from '../components/metaTagInjector'
 import Cache from './cache'
-import { Data } from './cache'
 
-export async function getMetadataRequest(
+export default async function getRequest(
   res: Promise<Response>,
   url: string,
-  getData: () => Promise<Data | undefined>
+  getData: () => Promise<
+    | {
+        title: string
+        image: string
+        url: string
+      }
+    | undefined
+  >
 ) {
   try {
-    const cachedData = await getRequest(url, getData, (data): data is Data => true)
+    const cachedData = await Cache.match(url)
     if (cachedData) {
       return new HTMLRewriter().on('head', new MetaTagInjector(cachedData)).transform(await res)
     } else {
-      return res
+      const data = await getData()
+      if (!data) {
+        return res
+      }
+      await Cache.put(data, url)
+      return new HTMLRewriter().on('head', new MetaTagInjector(data)).transform(await res)
     }
   } catch (e) {
     return res
   }
 }
-
-export async function getRequest<T extends Data>(
-  url: string,
-  getData: () => Promise<T | undefined>,
-  validateData: (data: Data) => data is T
-): Promise<T | undefined> {
-  try {
-    const cachedData = await Cache.match(url)
-    if (cachedData && validateData(cachedData)) {
-      return cachedData
-    } else {
-      const data = await getData()
-      if (!data) {
-        return undefined
-      }
-      await Cache.put(data, url)
-      return data
-    }
-  } catch (e) {
-    return undefined
-  }
-}

functions/utils/getToken.ts

@@ -1,8 +1,7 @@
-import { TokenDocument, TokenQuery } from '../../src/graphql/data/__generated__/types-and-hooks'
-import { Chain } from '../../src/graphql/data/__generated__/types-and-hooks'
+import { TokenDocument } from '../../src/graphql/data/__generated__/types-and-hooks'
 import client from '../client'
 
-function formatTitleName(symbol: string | undefined, name: string | undefined) {
+function formatTitleName(symbol: string, name: string) {
   if (symbol) {
     return 'Get ' + symbol + ' on Uniswap'
   }
@@ -12,46 +11,23 @@ function formatTitleName(symbol: string | undefined, name: string | undefined) {
   return 'View Token on Uniswap'
 }
 
-const convertTokenAddress = (networkName: string, tokenAddress: string) => {
-  if (tokenAddress === 'NATIVE') {
-    switch (networkName) {
-      case Chain.Celo:
-        return '0x471EcE3750Da237f93B8E339c536989b8978a438'
-      case Chain.Polygon:
-        return '0x0000000000000000000000000000000000001010'
-      default:
-        return undefined
-    }
-  }
-  return tokenAddress
-}
-
-export default async function getToken(networkName: string, tokenAddress: string, url: string) {
-  const origin = new URL(url).origin
-  const image = origin + '/api/image/tokens/' + networkName + '/' + tokenAddress
-  const uppercaseNetworkName = networkName.toUpperCase()
-  const convertedTokenAddress = convertTokenAddress(uppercaseNetworkName, tokenAddress)
-  const { data } = await client.query<TokenQuery>({
+export default async function getToken(networkName: string, tokenAddress: string | undefined, url: string) {
+  const { data } = await client.query({
     query: TokenDocument,
     variables: {
-      chain: uppercaseNetworkName,
-      address: convertedTokenAddress,
+      chain: networkName,
+      address: tokenAddress,
     },
   })
   const asset = data?.token
   if (!asset) {
     return undefined
   }
-
   const title = formatTitleName(asset.symbol, asset.name)
-
   const formattedAsset = {
     title,
-    image,
+    image: asset.project?.logoUrl,
     url,
-    symbol: asset.symbol ?? 'UNK',
-    ogImage: asset.project?.logoUrl,
-    name: asset.name ?? 'Token',
   }
   return formattedAsset
 }

lingui.config.ts

@@ -1,4 +1,64 @@
 /* eslint-env node */
+import { default as babelExtractor } from '@lingui/cli/api/extractors/babel'
+import { createHash } from 'crypto'
+import { mkdirSync, readFileSync, writeFileSync } from 'fs'
+import { existsSync } from 'fs'
+import * as path from 'path'
+
+/** A custom caching extractor built on top of babelExtractor. */
+const cachingExtractor: typeof babelExtractor = {
+  /** Delegates to babelExtractor.match. */
+  match(filename: string) {
+    return babelExtractor.match(filename)
+  },
+  /**
+   * Checks a cache before extraction, only delegating to babelExtractor.extract if the file has changed.
+   *
+   * The lingui extractor works by extracting JSON (the catalog) from `filename` to `buildDir/filename.json`.
+   * Caching works by man-in-the-middling this:
+   * - File freshness is computed as a hash of `filename` contents.
+   * - Before extracting, we check the cache to see if we already have a fresh catalog for the file.
+   *   If we do, we copy it to `localeDir/filename.json`. Copying is significantly faster than extracting.
+   * - After extracting, we copy the catalog to the cache.
+   */
+  extract(filename: string, localeDir: string, ...options: unknown[]) {
+    // This runs from node_modules/@lingui/conf, so we need to back out to the root.
+    const root = __dirname.split('/node_modules')[0]
+
+    // This logic mimics catalogFilename in @lingui/babel-plugin-extract-messages.
+    const buildDir = path.join(localeDir, '_build')
+    const localePath = path.join(buildDir, filename + '.json')
+
+    const filePath = path.join(root, filename)
+    const fileHash = createHash('sha256').update(readFileSync(filePath)).digest('hex')
+
+    const cacheRoot = path.join(root, 'node_modules/.cache/lingui')
+    const cachePath = path.join(cacheRoot, filename + '.json')
+
+    // If we have a matching cached copy of the catalog, we can copy it to localePath and return early.
+    if (existsSync(cachePath)) {
+      const { hash, catalog } = JSON.parse(readFileSync(cachePath, 'utf8'))
+      if (hash === fileHash) {
+        if (catalog) {
+          mkdirSync(path.dirname(localePath), { recursive: true })
+          writeFileSync(localePath, JSON.stringify(catalog, null, 2))
+        }
+        return
+      }
+    }
+
+    babelExtractor.extract(filename, localeDir, ...options)
+
+    // Cache the extracted catalog.
+    mkdirSync(path.dirname(cachePath), { recursive: true })
+    if (existsSync(localePath)) {
+      const catalog = JSON.parse(readFileSync(localePath, 'utf8'))
+      writeFileSync(cachePath, JSON.stringify({ hash: fileHash, catalog }))
+    } else {
+      writeFileSync(cachePath, JSON.stringify({ hash: fileHash }))
+    }
+  },
+}
 
 const linguiConfig = {
   catalogs: [
@@ -60,6 +120,7 @@ const linguiConfig = {
   rootDir: '.',
   runtimeConfigModule: ['@lingui/core', 'i18n'],
   sourceLocale: 'en-US',
+  extractors: [cachingExtractor],
 }
 
 export default linguiConfig

package.json

@@ -2,6 +2,7 @@
   "name": "@uniswap/interface",
   "version": "1.1.0",
   "description": "Uniswap Interface",
+  "homepage": ".",
   "license": "GPL-3.0-or-later",
   "scripts": {
     "ajv": "node scripts/compile-ajv-validators.js",
@@ -18,30 +19,20 @@
     "i18n": "yarn i18n:extract --clean && yarn i18n:compile",
     "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",
+    "start:cloud": "NODE_OPTIONS=--dns-result-order=ipv4first PORT=3001 npx wrangler pages dev --node-compat --proxy=3001 --port=3000 -- yarn start",
     "build": "craco build",
-    "analyze": "source-map-explorer 'build/static/js/*.js' --no-border-checks --gzip",
-    "serve": "serve build -s -l 3000",
+    "build:e2e": "REACT_APP_CSP_ALLOW_UNSAFE_EVAL=true REACT_APP_ADD_COVERAGE_INSTRUMENTATION=true craco build",
+    "analyze": "source-map-explorer 'build/static/js/*.js' --only-mapped",
+    "serve": "serve build -l 3000",
     "lint": "yarn eslint --ignore-path .gitignore --cache --cache-location node_modules/.cache/eslint/ .",
     "typecheck": "tsc",
     "typecheck:cloud": "tsc -p functions/tsconfig.json",
     "typecheck:cypress": "tsc -p cypress/tsconfig.json",
     "test": "craco test",
-    "test:cloud": "yarn jest functions --config=functions/jest.config.json",
+    "test:cloud": "NODE_OPTIONS=--experimental-vm-modules yarn jest functions --config=functions/jest.config.json",
     "cypress:open": "cypress open --browser chrome --e2e",
     "cypress:run": "cypress run --browser chrome --e2e",
-    "deduplicate": "yarn-deduplicate --strategy=highest",
-    "postinstall": "yarn patch-package"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "lint-staged"
-    }
-  },
-  "lint-staged": {
-    "yarn.lock": [
-      "yarn deduplicate"
-    ]
+    "deduplicate": "yarn-deduplicate --strategy=highest"
   },
   "jest": {
     "collectCoverageFrom": [
@@ -68,8 +59,9 @@
   },
   "browserslist": {
     "production": [
-      ">0.5%",
-      "not dead"
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
     ],
     "development": [
       "last 1 chrome version",
@@ -78,15 +70,12 @@
     ]
   },
   "devDependencies": {
+    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
     "@babel/preset-env": "^7.22.7",
     "@cloudflare/workers-types": "^4.20230710.1",
     "@craco/craco": "^7.1.0",
     "@ethersproject/experimental": "^5.4.0",
-    "@lingui/cli": "^4.3.0",
-    "@lingui/swc-plugin": "^4.0.4",
-    "@swc/core": "^1.3.72",
-    "@swc/jest": "^0.2.27",
-    "@swc/plugin-styled-components": "^1.5.70",
+    "@lingui/cli": "^3.9.0",
     "@testing-library/jest-dom": "^5.16.4",
     "@testing-library/react": "^13.1",
     "@testing-library/user-event": "^14.4.3",
@@ -94,17 +83,18 @@
     "@types/array.prototype.flat": "^1.2.1",
     "@types/array.prototype.flatmap": "^1.2.2",
     "@types/d3": "^6.7.1",
-    "@types/jest": "^27.0.1",
+    "@types/jest": "^25.2.1",
     "@types/lingui__core": "^2.7.1",
     "@types/lingui__macro": "^2.7.4",
     "@types/lingui__react": "^2.8.3",
-    "@types/ms": "^0.7.31",
+    "@types/ms.macro": "^2.0.0",
     "@types/multicodec": "^1.0.0",
     "@types/node": "^13.13.5",
     "@types/qs": "^6.9.2",
     "@types/react": "^18.0.15",
     "@types/react-dom": "^18.0.6",
     "@types/react-redux": "^7.1.24",
+    "@types/react-router-dom": "^5.3.3",
     "@types/react-table": "^7.7.12",
     "@types/react-virtualized-auto-sizer": "^1.0.0",
     "@types/react-window": "^1.8.2",
@@ -116,11 +106,12 @@
     "@types/wcag-contrast": "^3.0.0",
     "@uniswap/default-token-list": "^11.2.0",
     "@uniswap/eslint-config": "^1.2.0",
+    "@vanilla-extract/babel-plugin": "^1.1.7",
     "@vanilla-extract/jest-transform": "^1.1.1",
-    "@vanilla-extract/webpack-plugin": "^2.2.0",
-    "@vercel/og": "0.5.8",
+    "@vanilla-extract/webpack-plugin": "^2.1.11",
     "@walletconnect/types": "^2.8.6",
     "babel-jest": "^29.6.1",
+    "babel-plugin-istanbul": "^6.1.1",
     "browser-cache-mock": "^0.1.7",
     "buffer": "^6.0.3",
     "concurrently": "^8.0.1",
@@ -131,67 +122,58 @@
     "eslint-plugin-import": "^2.27",
     "eslint-plugin-rulesdir": "^0.2.2",
     "hardhat": "^2.14.0",
-    "husky": "^8.0.3",
     "jest": "^29.6.1",
+    "jest-dev-server": "^9.0.0",
     "jest-extended": "^4.0.1",
     "jest-fail-on-console": "^3.1.1",
     "jest-fetch-mock": "^3.0.3",
     "jest-styled-components": "^7.0.8",
-    "jpeg-js": "^0.4.4",
-    "lint-staged": "^14.0.0",
-    "mini-css-extract-plugin": "^2.7.6",
-    "patch-package": "^7.0.0",
+    "ms.macro": "^2.0.0",
     "path-browserify": "^1.0.1",
-    "png-ts": "^0.0.3",
-    "postinstall-postinstall": "^2.1.0",
     "prettier": "^2.8.8",
     "process": "^0.11.10",
     "react-scripts": "^5.0.1",
     "resize-observer-polyfill": "^1.5.1",
     "serve": "^11.3.2",
     "source-map-explorer": "^2.5.3",
-    "start-server-and-test": "^2.0.0",
-    "swc-loader": "^0.2.3",
-    "terser": "^5.19.4",
-    "terser-webpack-plugin": "^5.3.9",
     "ts-jest": "^29.1.1",
     "ts-transform-graphql-tag": "^0.2.1",
-    "tsafe": "^1.6.4",
     "typechain": "^5.0.0",
-    "typescript": "^4.9.4",
-    "webpack": "^5.88.2",
+    "typescript": "^4.4.3",
     "webpack-retry-chunk-load-plugin": "^3.1.1",
-    "wrangler": "^3.7.0",
+    "wrangler": "https://prerelease-registry.devprod.cloudflare.dev/workers-sdk/runs/4925945367/npm-package-wrangler-3048",
     "yarn-deduplicate": "^6.0.0"
   },
   "dependencies": {
     "@apollo/client": "^3.7.2",
     "@coinbase/wallet-sdk": "^3.6.4",
+    "@cypress/code-coverage": "^3.10.0",
     "@fontsource/ibm-plex-mono": "^4.5.1",
     "@fontsource/inter": "^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/cli": "^2.15.0",
+    "@graphql-codegen/client-preset": "^1.2.1",
+    "@graphql-codegen/typescript": "^2.8.3",
+    "@graphql-codegen/typescript-operations": "^2.5.8",
     "@graphql-codegen/typescript-react-apollo": "^3.3.7",
-    "@graphql-codegen/typescript-resolvers": "^3.2.1",
+    "@graphql-codegen/typescript-resolvers": "^2.7.8",
     "@juggle/resize-observer": "^3.4.0",
-    "@lingui/core": "^4.3.0",
-    "@lingui/macro": "^4.3.0",
-    "@lingui/react": "^4.3.0",
+    "@lingui/core": "^3.14.0",
+    "@lingui/macro": "^3.14.0",
+    "@lingui/react": "^3.14.0",
     "@looksrare/sdk": "^0.10.2",
     "@metamask/jazzicon": "^2.0.0",
     "@opensea/seaport-js": "^1.2.0",
     "@popperjs/core": "^2.4.4",
     "@reach/dialog": "^0.10.3",
     "@reach/portal": "^0.10.3",
-    "@reduxjs/toolkit": "^1.9.3",
+    "@reduxjs/toolkit": "^1.6.1",
     "@sentry/react": "^7.45.0",
     "@sentry/tracing": "^7.45.0",
     "@sentry/types": "^7.45.0",
     "@types/react-window-infinite-loader": "^1.0.6",
     "@uniswap/analytics": "^1.4.0",
-    "@uniswap/analytics-events": "^2.23.0",
+    "@uniswap/analytics-events": "^2.14.0",
+    "@uniswap/conedison": "^1.8.0",
     "@uniswap/governance": "^1.0.2",
     "@uniswap/liquidity-staker": "^1.0.2",
     "@uniswap/merkle-distributor": "^1.0.1",
@@ -201,7 +183,7 @@
     "@uniswap/sdk-core": "^4.0.3",
     "@uniswap/smart-order-router": "^3.15.0",
     "@uniswap/token-lists": "^1.0.0-beta.33",
-    "@uniswap/uniswapx-sdk": "^1.3.0",
+    "@uniswap/uniswapx-sdk": "^1.1.0",
     "@uniswap/universal-router-sdk": "^1.5.6",
     "@uniswap/v2-core": "^1.0.1",
     "@uniswap/v2-periphery": "^1.1.0-beta.0",
@@ -209,10 +191,10 @@
     "@uniswap/v3-core": "^1.0.1",
     "@uniswap/v3-periphery": "^1.1.1",
     "@uniswap/v3-sdk": "^3.10.0",
-    "@vanilla-extract/css": "^1.12.0",
-    "@vanilla-extract/css-utils": "^0.1.3",
-    "@vanilla-extract/dynamic": "^2.0.3",
-    "@vanilla-extract/sprinkles": "^1.6.1",
+    "@vanilla-extract/css": "^1.7.2",
+    "@vanilla-extract/css-utils": "^0.1.2",
+    "@vanilla-extract/dynamic": "^2.0.2",
+    "@vanilla-extract/sprinkles": "^1.4.1",
     "@visx/axis": "^2.12.2",
     "@visx/event": "^2.6.0",
     "@visx/glyph": "^2.10.0",
@@ -220,16 +202,16 @@
     "@visx/react-spring": "^2.12.2",
     "@visx/responsive": "^2.10.0",
     "@visx/shape": "^2.11.1",
-    "@web3-react/coinbase-wallet": "^8.2.2",
-    "@web3-react/core": "^8.2.2",
-    "@web3-react/eip1193": "^8.2.2",
-    "@web3-react/empty": "^8.2.2",
-    "@web3-react/gnosis-safe": "^8.2.3",
-    "@web3-react/metamask": "^8.2.3",
-    "@web3-react/network": "^8.2.2",
-    "@web3-react/types": "^8.2.2",
-    "@web3-react/url": "^8.2.2",
-    "@web3-react/walletconnect-v2": "^8.5.0",
+    "@web3-react/coinbase-wallet": "^8.2.0",
+    "@web3-react/core": "^8.2.0",
+    "@web3-react/eip1193": "^8.2.0",
+    "@web3-react/empty": "^8.2.0",
+    "@web3-react/gnosis-safe": "^8.2.1",
+    "@web3-react/metamask": "^8.2.0",
+    "@web3-react/network": "^8.2.0",
+    "@web3-react/types": "^8.2.0",
+    "@web3-react/url": "^8.2.0",
+    "@web3-react/walletconnect-v2": "^8.3.7",
     "ajv": "^8.11.0",
     "ajv-formats": "^2.1.1",
     "array.prototype.flat": "^1.2.4",
@@ -239,7 +221,6 @@
     "copy-to-clipboard": "^3.2.0",
     "d3": "^7.6.1",
     "ethers": "^5.7.2",
-    "ext-name": "^5.0.0",
     "focus-visible": "^5.2.0",
     "get-graphql-schema": "^2.1.2",
     "graphql": "^16.5.0",
@@ -248,9 +229,7 @@
     "inter-ui": "^3.13.1",
     "jotai": "^1.3.7",
     "jsbi": "^3.1.4",
-    "localforage": "^1.10.0",
     "make-plural": "^7.0.0",
-    "ms": "^2.1.3",
     "multicodec": "^3.0.1",
     "multihashes": "^4.0.2",
     "node-vibrant": "^3.2.1-alpha.1",
@@ -263,6 +242,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-feather": "^2.0.8",
+    "react-ga4": "^1.4.1",
     "react-infinite-scroll-component": "^6.1.0",
     "react-is": "^17.0.2",
     "react-markdown": "^4.3.1",
@@ -278,7 +258,7 @@
     "react-window-infinite-loader": "^1.0.8",
     "rebass": "^4.0.7",
     "redux": "^4.1.2",
-    "redux-persist": "^6.0.0",
+    "redux-localstorage-simple": "^2.3.1",
     "statsig-react": "^1.22.0",
     "styled-components": "^5.3.5",
     "tiny-invariant": "^1.2.0",

patches/@vercel+og+0.5.8.patch

@@ -1,49 +0,0 @@
-diff --git a/node_modules/@vercel/og/dist/index.edge.js b/node_modules/@vercel/og/dist/index.edge.js
-index 5187f88..eda01d0 100644
---- a/node_modules/@vercel/og/dist/index.edge.js
-+++ b/node_modules/@vercel/og/dist/index.edge.js
-@@ -18673,8 +18673,8 @@ var Resvg2 = class extends Resvg {
- };
- 
- // src/index.edge.ts
--import resvg_wasm from "./resvg.wasm?module";
--import yoga_wasm from "./yoga.wasm?module";
-+import resvg_wasm from "./resvg.wasm";
-+import yoga_wasm from "./yoga.wasm";
- 
- // src/emoji/index.ts
- var U200D = String.fromCharCode(8205);
-@@ -18809,18 +18809,15 @@ async function render(satori, resvg, opts, defaultFonts, element) {
- // src/index.edge.ts
- var initializedResvg = initWasm(resvg_wasm);
- var initializedYoga = initYoga(yoga_wasm).then((yoga2) => Ll(yoga2));
--var fallbackFont = fetch(new URL("./noto-sans-v27-latin-regular.ttf", import.meta.url)).then((res) => res.arrayBuffer());
- var ImageResponse = class {
-   constructor(element, options = {}) {
-     const result = new ReadableStream({
-       async start(controller) {
-         await initializedYoga;
-         await initializedResvg;
--        const fontData = await fallbackFont;
-         const fonts = [
-           {
-             name: "sans serif",
--            data: fontData,
-             weight: 700,
-             style: "normal"
-           }
-diff --git a/node_modules/@vercel/og/dist/types.d.ts b/node_modules/@vercel/og/dist/types.d.ts
-index dde26cc..d075e99 100644
---- a/node_modules/@vercel/og/dist/types.d.ts
-+++ b/node_modules/@vercel/og/dist/types.d.ts
-@@ -28,9 +28,8 @@ declare type ImageOptions = {
-      * A list of fonts to use.
-      *
-      * @type {{ data: ArrayBuffer; name: string; weight?: 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900; style?: 'normal' | 'italic' }[]}
--     * @default Noto Sans Latin Regular.
-      */
--    fonts?: SatoriOptions['fonts'];
-+    fonts: SatoriOptions['fonts'];
-     /**
-      * Using a specific Emoji style. Defaults to `twemoji`.
-      *

patches/@web3-react+coinbase-wallet+8.2.2.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/@web3-react/coinbase-wallet/dist/index.js b/node_modules/@web3-react/coinbase-wallet/dist/index.js
-index f38d06e..4f8fa19 100644
---- a/node_modules/@web3-react/coinbase-wallet/dist/index.js
-+++ b/node_modules/@web3-react/coinbase-wallet/dist/index.js
-@@ -62,7 +62,7 @@ class CoinbaseWallet extends types_1.Connector {
-         return __awaiter(this, void 0, void 0, function* () {
-             if (this.eagerConnection)
-                 return;
--            yield (this.eagerConnection = Promise.resolve().then(() => __importStar(require('@coinbase/wallet-sdk'))).then((m) => {
-+            yield (this.eagerConnection = Promise.resolve().then(async () => __importStar(await import('@coinbase/wallet-sdk'))).then((m) => {
-                 const _a = this.options, { url } = _a, options = __rest(_a, ["url"]);
-                 this.coinbaseWallet = new m.default(options);
-                 this.provider = this.coinbaseWallet.makeWeb3Provider(url);

patches/@web3-react+gnosis-safe+8.2.3.patch

@@ -1,15 +0,0 @@
-diff --git a/node_modules/@web3-react/gnosis-safe/dist/index.js b/node_modules/@web3-react/gnosis-safe/dist/index.js
-index 015a33c..4cd7cde 100644
---- a/node_modules/@web3-react/gnosis-safe/dist/index.js
-+++ b/node_modules/@web3-react/gnosis-safe/dist/index.js
-@@ -68,8 +68,8 @@ class GnosisSafe extends types_1.Connector {
-             if (this.eagerConnection)
-                 return;
-             // kick off import early to minimize waterfalls
--            const SafeAppProviderPromise = Promise.resolve().then(() => __importStar(require('@safe-global/safe-apps-provider'))).then(({ SafeAppProvider }) => SafeAppProvider);
--            yield (this.eagerConnection = Promise.resolve().then(() => __importStar(require('@safe-global/safe-apps-sdk'))).then((m) => __awaiter(this, void 0, void 0, function* () {
-+            const SafeAppProviderPromise = Promise.resolve().then(async () => __importStar(await import('@safe-global/safe-apps-provider'))).then(({ SafeAppProvider }) => SafeAppProvider);
-+            yield (this.eagerConnection = Promise.resolve().then(async () => __importStar(await import('@safe-global/safe-apps-sdk'))).then((m) => __awaiter(this, void 0, void 0, function* () {
-                 this.sdk = new m.default(this.options);
-                 const safe = yield Promise.race([
-                     this.sdk.safe.getInfo(),

patches/@web3-react+metamask+8.2.3.patch

@@ -1,13 +0,0 @@
-diff --git a/node_modules/@web3-react/metamask/dist/index.js b/node_modules/@web3-react/metamask/dist/index.js
-index c8476dd..c0bfce7 100644
---- a/node_modules/@web3-react/metamask/dist/index.js
-+++ b/node_modules/@web3-react/metamask/dist/index.js
-@@ -54,7 +54,7 @@ class MetaMask extends types_1.Connector {
-         return __awaiter(this, void 0, void 0, function* () {
-             if (this.eagerConnection)
-                 return;
--            return (this.eagerConnection = Promise.resolve().then(() => __importStar(require('@metamask/detect-provider'))).then((m) => __awaiter(this, void 0, void 0, function* () {
-+            return (this.eagerConnection = Promise.resolve().then(async () => __importStar(await import('@metamask/detect-provider'))).then((m) => __awaiter(this, void 0, void 0, function* () {
-                 var _a, _b;
-                 const provider = yield m.default(this.options);
-                 if (provider) {

patches/@web3-react+walletconnect-v2+8.5.0.patch

@@ -1,28 +0,0 @@
-diff --git a/node_modules/@web3-react/walletconnect-v2/dist/index.js b/node_modules/@web3-react/walletconnect-v2/dist/index.js
-index 1a36d14..908b8c5 100644
---- a/node_modules/@web3-react/walletconnect-v2/dist/index.js
-+++ b/node_modules/@web3-react/walletconnect-v2/dist/index.js
-@@ -84,7 +84,7 @@ class WalletConnect extends types_1.Connector {
-         return __awaiter(this, void 0, void 0, function* () {
-             const rpcMap = this.rpcMap ? (0, utils_1.getBestUrlMap)(this.rpcMap, this.timeout) : undefined;
-             const chainProps = this.getChainProps(this.chains, this.optionalChains, desiredChainId);
--            const ethProviderModule = yield Promise.resolve().then(() => __importStar(require('@walletconnect/ethereum-provider')));
-+            const ethProviderModule = yield Promise.resolve().then(async () => __importStar(await import('@walletconnect/ethereum-provider')));
-             this.provider = yield ethProviderModule.default.init(Object.assign(Object.assign(Object.assign({}, this.options), chainProps), { rpcMap: yield rpcMap }));
-             return this.provider
-                 .on('disconnect', this.disconnectListener)
-diff --git a/node_modules/@web3-react/walletconnect-v2/dist/utils.js b/node_modules/@web3-react/walletconnect-v2/dist/utils.js
-index 17539b6..9ea6371 100644
---- a/node_modules/@web3-react/walletconnect-v2/dist/utils.js
-+++ b/node_modules/@web3-react/walletconnect-v2/dist/utils.js
-@@ -62,8 +62,8 @@ function getBestUrl(urls, timeout) {
-         if (urls.length === 1)
-             return urls[0];
-         const [HttpConnection, JsonRpcProvider] = yield Promise.all([
--            Promise.resolve().then(() => __importStar(require('@walletconnect/jsonrpc-http-connection'))).then(({ HttpConnection }) => HttpConnection),
--            Promise.resolve().then(() => __importStar(require('@walletconnect/jsonrpc-provider'))).then(({ JsonRpcProvider }) => JsonRpcProvider),
-+            Promise.resolve().then(async () => __importStar(await import('@walletconnect/jsonrpc-http-connection'))).then(({ HttpConnection }) => HttpConnection),
-+            Promise.resolve().then(async () => __importStar(await import('@walletconnect/jsonrpc-provider'))).then(({ JsonRpcProvider }) => JsonRpcProvider),
-         ]);
-         // the below returns the first url for which there's been a successful call, prioritized by index
-         return new Promise((resolve) => {

public/.well-known/assetlinks.json

@@ -5,25 +5,29 @@
       "namespace": "android_app",
       "package_name": "com.uniswap",
       "sha256_cert_fingerprints":
-        ["97:A5:81:51:DA:AF:8F:6E:65:3A:90:1E:82:12:6C:FB:61:2D:36:C7:CF:20:61:6B:A3:4C:52:CA:BC:58:43:8E", "F9:E9:E3:F0:04:28:66:62:81:44:50:7E:D6:A9:5F:B9:65:39:02:70:1D:13:74:15:D3:E1:A3:1B:D4:38:3A:1F"]
+        ["97:A5:81:51:DA:AF:8F:6E:65:3A:90:1E:82:12:6C:FB:61:2D:36:C7:CF:20:61:6B:A3:4C:52:CA:BC:58:43:8E"]
     }
   },
-  {
-    "relation": ["delegate_permission/common.handle_all_urls"],
-    "target": {
-      "namespace": "android_app",
-      "package_name": "com.uniswap.beta",
-      "sha256_cert_fingerprints":
-        ["E5:39:87:DC:4D:FD:4C:1B:A6:74:36:7D:3A:3B:6B:ED:9E:B3:66:89:92:8A:1B:B8:FC:1B:22:56:56:B4:46:A3", "54:4B:62:33:17:9B:5F:A8:E6:5D:D3:A6:E5:9D:80:5F:A5:02:7F:E2:14:B8:C1:7A:AC:4B:8D:E0:65:49:87:41"]
+  [
+    {
+      "relation": ["delegate_permission/common.handle_all_urls"],
+      "target": {
+        "namespace": "android_app",
+        "package_name": "com.uniswap.beta",
+        "sha256_cert_fingerprints":
+          ["E5:39:87:DC:4D:FD:4C:1B:A6:74:36:7D:3A:3B:6B:ED:9E:B3:66:89:92:8A:1B:B8:FC:1B:22:56:56:B4:46:A3"]
+      }
     }
-  },
-  {
-    "relation": ["delegate_permission/common.handle_all_urls"],
-    "target": {
-      "namespace": "android_app",
-      "package_name": "com.uniswap.dev",
-      "sha256_cert_fingerprints":
-        ["5A:6D:23:50:2F:1E:0D:01:DC:96:65:F3:3A:18:4C:4C:8C:67:E0:09:99:9B:B1:9B:BF:44:99:D0:D1:D0:FC:5E", "02:E6:1C:76:8C:75:C3:78:C8:8C:FE:7B:2E:8F:4B:E1:FA:47:F2:F6:1A:DB:57:69:4A:41:99:C6:71:2C:AB:E3", "FA:C6:17:45:DC:09:03:78:6F:B9:ED:E6:2A:96:2B:39:9F:73:48:F0:BB:6F:89:9B:83:32:66:75:91:03:3B:9C"]
+  ],
+  [
+    {
+      "relation": ["delegate_permission/common.handle_all_urls"],
+      "target": {
+        "namespace": "android_app",
+        "package_name": "com.uniswap.dev",
+        "sha256_cert_fingerprints":
+          ["A8:A7:D4:DE:46:8E:BE:F6:DE:3B:62:2B:A7:26:60:F2:9A:4C:CD:AF:A6:96:C9:E5:7C:91:68:A1:29:2A:48:D3"]
+      }
     }
-  }
+  ]
 ]

public/CODEOWNERS

@@ -0,0 +1 @@
+@uniswap/web-admins

public/apple-app-site-association

@@ -22,22 +22,6 @@
           {
             "#": "/address/*",
             "comment": "Wallet address"
-          },
-          {
-            "/": "/nfts/asset/*",
-            "comment": "NFT Item"
-          },
-          {
-            "/": "/nfts/collection/*",
-            "comment": "NFT Collection"
-          },
-          {
-            "/": "/tokens/*",
-            "comment": "Token address"
-          },
-          {
-            "/": "/address/*",
-            "comment": "Wallet address"
           }
         ]
       }