From 0f4ca592f23f5d6c78694eb3f5716e9d0ad5b982 Mon Sep 17 00:00:00 2001 From: eddie <66155195+just-toby@users.noreply.github.com> Date: Thu, 16 Nov 2023 13:36:57 -0800 Subject: [PATCH] fix: remove /increase route (#7603) * fix: remove /increase route * fix: rename confusing components --- public/app-sitemap.xml | 6 ------ .../PoolDetails/PoolDetailsStatsButtons.test.tsx | 2 +- .../Pools/PoolDetails/PoolDetailsStatsButtons.tsx | 2 +- src/hooks/useIsPoolsPage.ts | 3 +-- src/pages/AddLiquidity/redirects.tsx | 2 +- src/pages/AddLiquidityV2/redirects.tsx | 2 +- src/pages/Pool/PositionPage.tsx | 2 +- src/pages/RouteDefinitions.tsx | 15 ++++----------- src/pages/__snapshots__/routes.test.ts.snap | 12 +----------- 9 files changed, 11 insertions(+), 35 deletions(-) diff --git a/public/app-sitemap.xml b/public/app-sitemap.xml index a74beeecf0..0544085bac 100644 --- a/public/app-sitemap.xml +++ b/public/app-sitemap.xml @@ -72,12 +72,6 @@ weekly 0.6 - - https://app.uniswap.org/increase - 2023-10-11T19:57:27.976Z - weekly - 0.6 - https://app.uniswap.org/migrate/v2 2023-10-11T19:57:27.976Z diff --git a/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.test.tsx b/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.test.tsx index 034a69cb85..152801e3e8 100644 --- a/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.test.tsx +++ b/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.test.tsx @@ -88,7 +88,7 @@ describe('PoolDetailsStatsButton', () => { await act(() => userEvent.click(screen.getByTestId('pool-details-add-liquidity-button'))) expect(global.window.location.href).toContain( - '/increase/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/500' + '/add/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/500' ) }) }) diff --git a/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.tsx b/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.tsx index dae1bf8c42..3aaa7404d7 100644 --- a/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.tsx +++ b/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.tsx @@ -68,7 +68,7 @@ export function PoolDetailsStatsButtons({ chainId, token0, token1, feeTier, load navigate( toSwap ? `/swap?inputCurrency=${currencyId(currency0)}&outputCurrency=${currencyId(currency1)}` - : `/increase/${currencyId(currency0)}/${currencyId(currency1)}/${feeTier}${tokenId ? `/${tokenId}` : ''}` + : `/add/${currencyId(currency0)}/${currencyId(currency1)}/${feeTier}${tokenId ? `/${tokenId}` : ''}` ) } } diff --git a/src/hooks/useIsPoolsPage.ts b/src/hooks/useIsPoolsPage.ts index a102eefb1b..e4eeab53b7 100644 --- a/src/hooks/useIsPoolsPage.ts +++ b/src/hooks/useIsPoolsPage.ts @@ -6,7 +6,6 @@ export function useIsPoolsPage() { pathname.startsWith('/pools') || pathname.startsWith('/pool') || pathname.startsWith('/add') || - pathname.startsWith('/remove') || - pathname.startsWith('/increase') + pathname.startsWith('/remove') ) } diff --git a/src/pages/AddLiquidity/redirects.tsx b/src/pages/AddLiquidity/redirects.tsx index 83bda5984f..66847e3a96 100644 --- a/src/pages/AddLiquidity/redirects.tsx +++ b/src/pages/AddLiquidity/redirects.tsx @@ -4,7 +4,7 @@ import { Navigate, useParams } from 'react-router-dom' import { WRAPPED_NATIVE_CURRENCY } from '../../constants/tokens' import AddLiquidity from './index' -export default function RedirectDuplicateTokenIds() { +export default function AddLiquidityWithTokenRedirects() { const { currencyIdA, currencyIdB } = useParams<{ currencyIdA: string; currencyIdB: string; feeAmount?: string }>() const { chainId } = useWeb3React() diff --git a/src/pages/AddLiquidityV2/redirects.tsx b/src/pages/AddLiquidityV2/redirects.tsx index 16f106f0e2..ddcbc44dda 100644 --- a/src/pages/AddLiquidityV2/redirects.tsx +++ b/src/pages/AddLiquidityV2/redirects.tsx @@ -2,7 +2,7 @@ import { Navigate, useParams } from 'react-router-dom' import AddLiquidityV2 from './index' -export default function RedirectDuplicateTokenIdsV2() { +export default function AddLiquidityV2WithTokenRedirects() { const { currencyIdA, currencyIdB } = useParams<{ currencyIdA: string; currencyIdB: string }>() if (currencyIdA && currencyIdB && currencyIdA.toLowerCase() === currencyIdB.toLowerCase()) { diff --git a/src/pages/Pool/PositionPage.tsx b/src/pages/Pool/PositionPage.tsx index e742e6dded..04223f7f21 100644 --- a/src/pages/Pool/PositionPage.tsx +++ b/src/pages/Pool/PositionPage.tsx @@ -706,7 +706,7 @@ function PositionPageContent() { {currency0 && currency1 && feeAmount && tokenId ? ( import('nft/pages/explore')) const Collection = lazy(() => import('nft/pages/collection')) const Profile = lazy(() => import('nft/pages/profile')) const Asset = lazy(() => import('nft/pages/asset/Asset')) -const AddLiquidity = lazy(() => import('pages/AddLiquidity')) const Explore = lazy(() => import('pages/Explore')) -const RedirectDuplicateTokenIds = lazy(() => import('pages/AddLiquidity/redirects')) -const RedirectDuplicateTokenIdsV2 = lazy(() => import('pages/AddLiquidityV2/redirects')) +const AddLiquidityWithTokenRedirects = lazy(() => import('pages/AddLiquidity/redirects')) +const AddLiquidityV2WithTokenRedirects = lazy(() => import('pages/AddLiquidityV2/redirects')) const RedirectExplore = lazy(() => import('pages/Explore/redirects')) const MigrateV2 = lazy(() => import('pages/MigrateV2')) const MigrateV2Pair = lazy(() => import('pages/MigrateV2/MigrateV2Pair')) @@ -174,23 +173,17 @@ export const routes: RouteDefinition[] = [ createRouteDefinition({ path: '/add/v2', nestedPaths: [':currencyIdA', ':currencyIdA/:currencyIdB'], - getElement: () => , + getElement: () => , }), createRouteDefinition({ path: '/add', - nestedPaths: [':currencyIdA', ':currencyIdA/:currencyIdB', ':currencyIdA/:currencyIdB/:feeAmount'], - getElement: () => , - }), - - createRouteDefinition({ - path: '/increase', nestedPaths: [ ':currencyIdA', ':currencyIdA/:currencyIdB', ':currencyIdA/:currencyIdB/:feeAmount', ':currencyIdA/:currencyIdB/:feeAmount/:tokenId', ], - getElement: () => , + getElement: () => , }), createRouteDefinition({ path: '/remove/v2/:currencyIdA/:currencyIdB', getElement: () => }), createRouteDefinition({ path: '/remove/:tokenId', getElement: () => }), diff --git a/src/pages/__snapshots__/routes.test.ts.snap b/src/pages/__snapshots__/routes.test.ts.snap index 5bb8372beb..a835bb3dc7 100644 --- a/src/pages/__snapshots__/routes.test.ts.snap +++ b/src/pages/__snapshots__/routes.test.ts.snap @@ -136,16 +136,6 @@ Array [ ], "path": "/add/v2", }, - Object { - "enabled": [Function], - "getElement": [Function], - "nestedPaths": Array [ - ":currencyIdA", - ":currencyIdA/:currencyIdB", - ":currencyIdA/:currencyIdB/:feeAmount", - ], - "path": "/add", - }, Object { "enabled": [Function], "getElement": [Function], @@ -155,7 +145,7 @@ Array [ ":currencyIdA/:currencyIdB/:feeAmount", ":currencyIdA/:currencyIdB/:feeAmount/:tokenId", ], - "path": "/increase", + "path": "/add", }, Object { "enabled": [Function],