chore: tron sidebar support

apps/web/src/app/(evm)/[chainId]/header.tsx

@@ -29,8 +29,8 @@ export const Header: FC<{ chainId: ChainId }> = ({ chainId }) => {
     <div className="flex z-20">
       <div
         className={classNames(
-          'hidden lg:flex justify-between items-center px-1 w-56 h-14 flex-shrink-0 bg-gray-100 dark:bg-slate-900 border-r border-gray-200 dark:border-slate-800',
-          !isOpen && 'border-b',
+          'hidden lg:flex justify-between items-center px-1 w-56 h-14 flex-shrink-0 bg-gray-100 dark:bg-slate-900 border-r border-gray-200 dark:border-slate-800 border-b',
+          isOpen && 'border-b-gray-100 dark:border-b-slate-900',
         )}
       >
         <SushiNavigationDropdown className="!px-2">

apps/web/src/app/(evm)/[chainId]/pool/incentivize/layout.tsx

@@ -1,11 +1,18 @@
 import { Container, typographyVariants } from '@sushiswap/ui'
 import { BackButton } from 'src/ui/pool/BackButton'
+import { ChainId } from 'sushi/chain'
+import { isMerklChainId } from 'sushi/config'
+import notFound from '~evm/[chainId]/not-found'
 
-export const metadata = {
-  title: 'Pool 💦',
-}
+export default function Layout({
+  children,
+  params,
+}: { children: React.ReactNode; params: { chainId: string } }) {
+  const chainId = +params.chainId as ChainId
+  if (!isMerklChainId(chainId)) {
+    return notFound(chainId)
+  }
 
-export default function Layout({ children }: { children: React.ReactNode }) {
   return (
     <>
       <Container maxWidth="5xl" className="py-10 px-4">

apps/web/src/app/(evm)/[chainId]/pool/layout.tsx

@@ -5,6 +5,10 @@ import { ChainId } from 'sushi/chain'
 import { Header } from '../header'
 import notFound from '../not-found'
 
+export const metadata = {
+  title: 'Pool 💦',
+}
+
 export default function PoolLayout({
   children,
   params,

apps/web/src/app/(non-evm)/aptos/(positions)/layout.tsx

@@ -4,13 +4,12 @@ import { Container, LinkInternal } from '@sushiswap/ui'
 import { useSearchParams } from 'next/navigation'
 import { Suspense } from 'react'
 import { POOL_SUPPORTED_NETWORKS } from 'src/config'
-import { PathnameButton } from 'src/ui/pool'
+import { PathnameButton, PoolsFiltersProvider } from 'src/ui/pool'
 import { AptosSidebarContainer, SidebarProvider } from 'src/ui/sidebar'
-import { PoolsFiltersProvider } from '~aptos/pool/ui/pools/filters/pool-filters-provider'
 import { Header } from '../header'
 import { Hero } from './hero'
 
-export default function TabsLayout({
+export default function PositionsLayout({
   children,
 }: { children: React.ReactNode }) {
   return (

apps/web/src/app/(non-evm)/aptos/(positions)/pool/page.tsx

@@ -4,23 +4,21 @@ import { Container } from '@sushiswap/ui'
 import { Suspense } from 'react'
 import { POOL_SUPPORTED_NETWORKS } from 'src/config'
 import { TableFiltersNetwork } from 'src/ui/pool/TableFiltersNetwork'
-
-// import { PoolFiltersFarmsOnly } from '~aptos/pool/ui/pools/filters/pool-filters-farms-only'
-import { PoolFiltersSearchToken } from '~aptos/pool/ui/pools/filters/pool-filters-search-token'
-import { PositionsTable } from '~aptos/pool/ui/pools/tables/positions/pool-positions-table'
+import { TableFiltersSearchToken } from 'src/ui/pool/TableFiltersSearchToken'
+import { PositionsTable } from '~aptos/pool/ui/tables/positions/pool-positions-table'
 
 export default function MyPositionsPage() {
   return (
     <Container maxWidth="7xl" className="px-4">
       <div className="flex flex-col sm:flex-row gap-3 mb-4">
-        <PoolFiltersSearchToken />
+        <TableFiltersSearchToken />
         <TableFiltersNetwork
           network="aptos"
           supportedNetworks={POOL_SUPPORTED_NETWORKS}
           unsupportedNetworkHref="/ethereum/pool"
           className="lg:hidden block"
         />
-        {/* <PoolFiltersFarmsOnly /> */}
+        {/* <TableFiltersFarmsOnly /> */}
       </div>
       <Suspense>
         <PositionsTable />

apps/web/src/app/(non-evm)/aptos/(positions)/providers.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import { Suspense } from 'react'
-import { PoolsFiltersProvider } from '~aptos/pool/ui/pools/filters/pool-filters-provider'
+import { PoolsFiltersProvider } from 'src/ui/pool'
 
 export function Providers({ children }: { children: React.ReactNode }) {
   return (

apps/web/src/app/(non-evm)/aptos/explore/layout.tsx

@@ -5,6 +5,10 @@ import { Header } from '../header'
 import { Hero } from './hero'
 import { Providers } from './providers'
 
+export const metadata = {
+  title: 'Pools 💦',
+}
+
 export default function PoolLayout({
   children,
 }: { children: React.ReactNode }) {

apps/web/src/app/(non-evm)/aptos/explore/pools/page.tsx

@@ -2,16 +2,14 @@ import { Container } from '@sushiswap/ui'
 import React from 'react'
 import { POOL_SUPPORTED_NETWORKS } from 'src/config'
 import { TableFiltersNetwork } from 'src/ui/pool/TableFiltersNetwork'
-// import { PoolFiltersFarmsOnly } from '~aptos/pool/ui/pools/filters/pool-filters-farms-only'
-import { PoolFiltersSearchToken } from '~aptos/pool/ui/pools/filters/pool-filters-search-token'
-import { PoolsTable } from '~aptos/pool/ui/pools/tables/pools/pools-table'
+import { TableFiltersSearchToken } from 'src/ui/pool/TableFiltersSearchToken'
+import { PoolsTable } from '~aptos/pool/ui/tables/pools/pools-table'
 
 export default async function PoolsPage() {
   return (
     <Container maxWidth="7xl" className="px-4">
       <div className="flex flex-wrap gap-3 mb-4">
-        <PoolFiltersSearchToken />
-        {/* <PoolFiltersFarmsOnly /> */}
+        <TableFiltersSearchToken />
         <TableFiltersNetwork
           network={'aptos'}
           supportedNetworks={POOL_SUPPORTED_NETWORKS}

apps/web/src/app/(non-evm)/aptos/explore/providers.tsx

@@ -1,7 +1,7 @@
 'use client'
 
 import { Suspense } from 'react'
-import { PoolsFiltersProvider } from '~aptos/pool/ui/pools/filters/pool-filters-provider'
+import { PoolsFiltersProvider } from 'src/ui/pool'
 
 export function Providers({ children }: { children: React.ReactNode }) {
   return (

apps/web/src/app/(non-evm)/aptos/header.tsx

@@ -8,27 +8,32 @@ import {
   SushiNavigationDropdown,
   classNames,
 } from '@sushiswap/ui'
+import { NetworkIcon } from '@sushiswap/ui/icons/NetworkIcon'
 import { SushiIcon } from '@sushiswap/ui/icons/SushiIcon'
 import { SushiWithTextIcon } from '@sushiswap/ui/icons/SushiWithTextIcon'
-import { AptosCircle } from '@sushiswap/ui/icons/network/circle/AptosCircle'
 import React, { FC, Suspense } from 'react'
 import { NonStandardChainId, SUPPORTED_NETWORKS } from 'src/config'
 import { HeaderNetworkSelector } from 'src/lib/wagmi/components/header-network-selector'
 import { SidebarToggle, useSidebar } from 'src/ui/sidebar'
+import { useAccount, useChainId } from 'wagmi'
 import { headerElements } from './_common/header-elements'
 import { UserProfile } from './_common/ui/user-profile/user-profile'
 
 export const Header: FC = () => {
   const { connected } = useWallet()
 
+  const evmChainId = useChainId()
+
+  const { isConnected: isEVMConnected } = useAccount()
+
   const { isOpen } = useSidebar()
 
   return (
     <div className="flex z-20">
       <div
         className={classNames(
-          'hidden lg:flex justify-between items-center px-1 w-56 h-14 flex-shrink-0 bg-gray-100 dark:bg-slate-900 border-r border-gray-200 dark:border-slate-800',
-          !isOpen && 'border-b',
+          'hidden lg:flex justify-between items-center px-1 w-56 h-14 flex-shrink-0 bg-gray-100 dark:bg-slate-900 border-r border-gray-200 dark:border-slate-800 border-b',
+          isOpen && 'border-b-gray-100 dark:border-b-slate-900',
         )}
       >
         <SushiNavigationDropdown className="!px-2">
@@ -38,14 +43,18 @@ export const Header: FC = () => {
           <Badge
             position="bottom-right"
             badgeContent={
-              connected ? (
+              connected || isEVMConnected ? (
                 <div className="bg-green rounded-full w-2 h-2 mr-0.5 mb-0.5" />
               ) : (
                 <div />
               )
             }
           >
-            <AptosCircle width={22} height={22} />
+            <NetworkIcon
+              chainId={connected ? NonStandardChainId.APTOS : evmChainId}
+              width={22}
+              height={22}
+            />
           </Badge>
           <ChevronDownIcon className="w-3 h-3" />
         </SidebarToggle>

apps/web/src/app/(non-evm)/aptos/pool/ui/pools/tables/pools/pools-table.tsx → apps/web/src/app/(non-evm)/aptos/pool/ui/tables/pools/pools-table.tsx

@@ -9,8 +9,8 @@ import {
 } from '@sushiswap/ui'
 import { ColumnDef, SortingState, TableState } from '@tanstack/react-table'
 import React, { useCallback, useMemo, useState } from 'react'
+import { usePoolFilters } from 'src/ui/pool'
 import { TopPool, useTopPools } from '~aptos/pool/lib/use-top-pools'
-import { usePoolFilters } from '~aptos/pool/ui/pools/filters/pool-filters-provider'
 import {
   APR_COLUMN,
   FEES_1D_COLUMN,
@@ -39,7 +39,7 @@ export const PoolsTable = () => {
   const { data: pools, isLoading } = useTopPools()
 
   const rowLink = useCallback((row: TopPool) => {
-    return `/aptos/pool/${row.token0Address}, ${row.token1Address}`
+    return `/aptos/pool/v2/${row.token0Address}, ${row.token1Address}`
   }, [])
 
   const filtered = useMemo(() => {

apps/web/src/app/(non-evm)/aptos/pool/ui/pools/tables/positions/pool-positions-table.tsx → apps/web/src/app/(non-evm)/aptos/pool/ui/tables/positions/pool-positions-table.tsx

@@ -3,9 +3,9 @@ import { Card, CardHeader, CardTitle, DataTable } from '@sushiswap/ui'
 import { PaginationState } from '@tanstack/react-table'
 import { ColumnDef, SortingState, TableState } from '@tanstack/react-table'
 import React, { useCallback, useMemo, useState } from 'react'
+import { usePoolFilters } from 'src/ui/pool'
 import { PoolExtended } from '~aptos/pool/lib/use-pools-extended'
 import { useUserPositionPools } from '~aptos/pool/lib/use-user-position-pools'
-import { usePoolFilters } from '../../filters/pool-filters-provider'
 import { MYPOSITION_TVL_COLUMN, NAME_COLUMN, TVL_COLUMN } from './columns'
 
 const COLUMNS = [
@@ -60,7 +60,7 @@ export const PositionsTable = () => {
   }, [pools, tokenSymbols])
 
   const rowLink = useCallback((row: PoolExtended) => {
-    return `/aptos/pool/${row.id}`
+    return `/aptos/pool/v2/${row.id}`
   }, [])
 
   const state: Partial<TableState> = useMemo(() => {