diff --git a/apps/web/src/app/(evm)/(trade)/swap/page.tsx b/apps/web/src/app/(evm)/[chainId]/(trade)/swap/page.tsx
similarity index 85%
rename from apps/web/src/app/(evm)/(trade)/swap/page.tsx
rename to apps/web/src/app/(evm)/[chainId]/(trade)/swap/page.tsx
index a20b52c293..61a110f7fa 100644
--- a/apps/web/src/app/(evm)/(trade)/swap/page.tsx
+++ b/apps/web/src/app/(evm)/[chainId]/(trade)/swap/page.tsx
@@ -9,7 +9,7 @@ export const metadata = {
export default function SwapSimplePage() {
return (
-
+
diff --git a/apps/web/src/app/(evm)/(trade)/swap/providers.tsx b/apps/web/src/app/(evm)/[chainId]/(trade)/swap/providers.tsx
similarity index 100%
rename from apps/web/src/app/(evm)/(trade)/swap/providers.tsx
rename to apps/web/src/app/(evm)/[chainId]/(trade)/swap/providers.tsx
diff --git a/apps/web/src/app/(evm)/[chainId]/explore/layout.tsx b/apps/web/src/app/(evm)/[chainId]/explore/layout.tsx
index 316c00be23..8b2d76597c 100644
--- a/apps/web/src/app/(evm)/[chainId]/explore/layout.tsx
+++ b/apps/web/src/app/(evm)/[chainId]/explore/layout.tsx
@@ -7,7 +7,9 @@ import React from 'react'
import { GlobalStatsCharts } from 'src/ui/explore/global-stats-charts'
import { PathnameButton } from 'src/ui/pathname-button'
import { PoolsFiltersProvider } from 'src/ui/pool'
+import { SidebarContainer, SidebarProvider } from 'src/ui/sidebar'
import { ChainId, ChainKey } from 'sushi/chain'
+import { Header } from '../header'
export const metadata = {
title: 'Pools 💦',
@@ -24,51 +26,56 @@ export default async function ExploreLayout({
}
return (
- <>
-
-
-
-
-
-
-
-
- All Pools
-
-
- {isSteerChainId(chainId) ? (
-
-
+
+
+
+
+
+
+
+
+
+
- Smart Pools
-
-
- ) : (
-
- Smart Pools
-
- )}
-
+ {isSteerChainId(chainId) ? (
+
+
+ Smart Pools
+
+
+ ) : (
+
+ Smart Pools
+
+ )}
+
+
+
+
)
}
diff --git a/apps/web/src/app/(evm)/[chainId]/layout.tsx b/apps/web/src/app/(evm)/[chainId]/layout.tsx
index ca377b4691..1d9a3b146a 100644
--- a/apps/web/src/app/(evm)/[chainId]/layout.tsx
+++ b/apps/web/src/app/(evm)/[chainId]/layout.tsx
@@ -1,8 +1,6 @@
import { HotJar } from '@sushiswap/ui'
import { isSupportedChainId } from 'src/config'
-import { SidebarContainer, SidebarProvider } from 'src/ui/sidebar'
-import { Header } from './header'
import notFound from './not-found'
import { Providers } from './providers'
@@ -16,14 +14,7 @@ export default function PoolLayout({
return (
<>
-
-
-
-
- {children}
-
-
-
+
{children}
)
diff --git a/apps/web/src/app/(evm)/[chainId]/pool/layout.tsx b/apps/web/src/app/(evm)/[chainId]/pool/layout.tsx
new file mode 100644
index 0000000000..31073516fc
--- /dev/null
+++ b/apps/web/src/app/(evm)/[chainId]/pool/layout.tsx
@@ -0,0 +1,22 @@
+import { isSupportedChainId } from 'src/config'
+import { SidebarContainer, SidebarProvider } from 'src/ui/sidebar'
+import { Header } from '../header'
+import notFound from '../not-found'
+
+export default function PoolLayout({
+ children,
+ params: { chainId },
+}: { children: React.ReactNode; params: { chainId: string } }) {
+ if (!isSupportedChainId(+chainId)) {
+ return notFound()
+ }
+
+ return (
+
+
+
+ {children}
+
+
+ )
+}
diff --git a/apps/web/src/middleware.ts b/apps/web/src/middleware.ts
index cf1935dcb3..3d64f93657 100644
--- a/apps/web/src/middleware.ts
+++ b/apps/web/src/middleware.ts
@@ -5,9 +5,16 @@ import { isSushiSwapChainId } from 'sushi/config'
export const config = {
matcher: [
'/swap/:path*',
+ '/limit/:path*',
+ '/dca/:path*',
+ '/cross-chain-swap/:path*',
'/pool',
'/pools',
'/explore',
+ '/:chainId/swap/:path*',
+ '/:chainId/limit/:path*',
+ '/:chainId/dca/:path*',
+ '/:chainId/cross-chain-swap/:path*',
'/:chainId/explore/:path*',
'/:chainId/pool/:path*',
'/:chainId/positions/:path*',
@@ -18,44 +25,15 @@ export const config = {
export async function middleware(req: NextRequest) {
const { pathname, searchParams, search } = req.nextUrl
- if (pathname === '/swap' && search !== '') {
- const url = req.nextUrl.clone()
- if (searchParams.has('token0') && searchParams.has('token1')) {
- const token0 = searchParams.get('token0')?.toLowerCase()
- const token1 = searchParams.get('token1')?.toLowerCase()
-
- // Tokens cant be the same
- if (token0 === token1) {
- searchParams.delete('token0')
- searchParams.delete('token1')
- url.search = `?${searchParams.toString()}`
- return NextResponse.redirect(url)
- }
- }
- }
-
- if (pathname === '/cross-chain-swap' && search !== '') {
- const url = req.nextUrl.clone()
- if (searchParams.has('chainId0') && searchParams.has('chainId1')) {
- const chainId0 = searchParams.get('chainId0')?.toLowerCase()
- const chainId1 = searchParams.get('chainId1')?.toLowerCase()
-
- // ChainIds cant be the same
- if (chainId0 === chainId1) {
- searchParams.delete('chainId0')
- searchParams.delete('chainId1')
- searchParams.delete('token0')
- searchParams.delete('token1')
- url.search = `?${searchParams.toString()}`
- return NextResponse.redirect(url)
- }
- }
- }
if (
pathname === '/explore' ||
pathname === '/pools' ||
- pathname === '/pool'
+ pathname === '/pool' ||
+ pathname === '/swap' ||
+ pathname === '/limit' ||
+ pathname === '/dca' ||
+ pathname === '/cross-chain-swap'
) {
const path = pathname === '/pool' ? 'pool' : 'explore/pools'
@@ -74,7 +52,7 @@ export async function middleware(req: NextRequest) {
}
const networkNameMatch = pathname.match(
- /([\w-]+)(?=\/explore|\/pool|\/positions|\/rewards|\/migrate)/,
+ /([\w-]+)(?=\/swap|\/limit|\/dca|\/cross-chain-swap|\/explore|\/pool|\/positions|\/rewards|\/migrate)/,
)
if (networkNameMatch?.length) {
const { chainId, networkName } = getChainInfo(networkNameMatch[0])
@@ -83,6 +61,46 @@ export async function middleware(req: NextRequest) {
const url = req.nextUrl.clone()
url.pathname = pathname.replace(networkName, chainId.toString())
+ if (pathname.includes('cross-chain-swap')) {
+ if (
+ search !== '' &&
+ searchParams.has('token0') &&
+ searchParams.has('token1')
+ ) {
+ const token0 = searchParams.get('token0')?.toLowerCase()
+ const token1 = searchParams.get('token1')?.toLowerCase()
+
+ // Tokens cant be the same
+ if (token0 === token1) {
+ searchParams.delete('token0')
+ searchParams.delete('token1')
+ url.search = `?${searchParams.toString()}`
+ return NextResponse.redirect(url)
+ }
+ }
+ }
+
+ if (pathname.includes('swap')) {
+ if (
+ search !== '' &&
+ searchParams.has('chainId0') &&
+ searchParams.has('chainId1')
+ ) {
+ const chainId0 = searchParams.get('chainId0')?.toLowerCase()
+ const chainId1 = searchParams.get('chainId1')?.toLowerCase()
+
+ // ChainIds cant be the same
+ if (chainId0 === chainId1) {
+ searchParams.delete('chainId0')
+ searchParams.delete('chainId1')
+ searchParams.delete('token0')
+ searchParams.delete('token1')
+ url.search = `?${searchParams.toString()}`
+ return NextResponse.redirect(url)
+ }
+ }
+ }
+
return NextResponse.rewrite(url)
}
}
diff --git a/apps/web/src/ui/sidebar/index.tsx b/apps/web/src/ui/sidebar/index.tsx
index e20257a5b8..57d6931b63 100644
--- a/apps/web/src/ui/sidebar/index.tsx
+++ b/apps/web/src/ui/sidebar/index.tsx
@@ -133,7 +133,7 @@ const Sidebar: FC
= ({ nonEVMNetwork }) => {
)
return !isOpen ? null : (
-