Commit aaf105ef authored by vignesh mohankumar's avatar vignesh mohankumar Committed by GitHub

fix: add redirect from /tokens to /tokens/ethereum (#4816)

parent 974308f9
...@@ -169,15 +169,17 @@ export default function App() { ...@@ -169,15 +169,17 @@ export default function App() {
{tokensFlag === TokensVariant.Enabled && ( {tokensFlag === TokensVariant.Enabled && (
<> <>
<Route <Route
path="/tokens/:chainName" path="tokens"
element={ element={
<Suspense fallback={<LoadingTokens />}> <Suspense fallback={<LoadingTokens />}>
<Tokens /> <Tokens />
</Suspense> </Suspense>
} }
/> >
<Route path=":chainName" />
</Route>
<Route <Route
path="/tokens/:chainName/:tokenAddress" path="tokens/:chainName/:tokenAddress"
element={ element={
<Suspense fallback={<LoadingTokenDetails />}> <Suspense fallback={<LoadingTokenDetails />}>
<TokenDetails /> <TokenDetails />
......
...@@ -9,11 +9,11 @@ import SearchBar from 'components/Tokens/TokenTable/SearchBar' ...@@ -9,11 +9,11 @@ import SearchBar from 'components/Tokens/TokenTable/SearchBar'
import TimeSelector from 'components/Tokens/TokenTable/TimeSelector' import TimeSelector from 'components/Tokens/TokenTable/TimeSelector'
import TokenTable, { LoadingTokenTable } from 'components/Tokens/TokenTable/TokenTable' import TokenTable, { LoadingTokenTable } from 'components/Tokens/TokenTable/TokenTable'
import { FavoriteTokensVariant, useFavoriteTokensFlag } from 'featureFlags/flags/favoriteTokens' import { FavoriteTokensVariant, useFavoriteTokensFlag } from 'featureFlags/flags/favoriteTokens'
import { isValidBackendChainName } from 'graphql/data/util' import { isValidBackendChainName, useGlobalChainName } from 'graphql/data/util'
import { useOnGlobalChainSwitch } from 'hooks/useGlobalChainSwitch' import { useOnGlobalChainSwitch } from 'hooks/useGlobalChainSwitch'
import { useResetAtom } from 'jotai/utils' import { useResetAtom } from 'jotai/utils'
import { useEffect } from 'react' import { useEffect } from 'react'
import { useLocation, useNavigate } from 'react-router-dom' import { useLocation, useNavigate, useParams } from 'react-router-dom'
import styled from 'styled-components/macro' import styled from 'styled-components/macro'
import { ThemedText } from 'theme' import { ThemedText } from 'theme'
...@@ -70,13 +70,24 @@ const FiltersWrapper = styled.div` ...@@ -70,13 +70,24 @@ const FiltersWrapper = styled.div`
const Tokens = () => { const Tokens = () => {
const resetFilterString = useResetAtom(filterStringAtom) const resetFilterString = useResetAtom(filterStringAtom)
const location = useLocation() const location = useLocation()
const navigate = useNavigate()
const { chainName } = useParams<{ chainName?: string }>()
const globalChainName = useGlobalChainName()
useEffect(() => { useEffect(() => {
resetFilterString() resetFilterString()
}, [location, resetFilterString]) }, [location, resetFilterString])
const navigate = useNavigate() useEffect(() => {
if (!chainName) {
navigate(`/tokens/${globalChainName.toLowerCase()}`)
}
}, [chainName, globalChainName, navigate])
useOnGlobalChainSwitch((chain) => { useOnGlobalChainSwitch((chain) => {
if (isValidBackendChainName(chain)) navigate(`/tokens/${chain.toLowerCase()}`) if (isValidBackendChainName(chain)) {
navigate(`/tokens/${chain.toLowerCase()}`)
}
}) })
return ( return (
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment