Redirect to chain page

bitpif · May 27, 2021 · 3defa9d · 3defa9d
1 parent cea2841
commit 3defa9d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/src/App.js b/src/App.js
@@ -126,13 +126,9 @@ function App() {
               strict
               path="/chain/:chain"
               render={({ match }) => {
-                if (['Ethereum', 'Binance', 'Others'].includes(match.params.chain)) {
-                  return <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
-                    <GlobalPage chain={match.params.chain} />
-                  </LayoutWrapper>
-                } else {
-                  return <Redirect to="/home" />
-                }
+                return <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
+                  <GlobalPage chain={match.params.chain} />
+                </LayoutWrapper>
               }}
             />
 

diff --git a/src/pages/GlobalPage.js b/src/pages/GlobalPage.js
@@ -24,6 +24,7 @@ import { PageWrapper, ContentWrapper } from '../components'
 import { fetchAPI } from '../contexts/API'
 import { CHART_API } from '../constants'
 import DropdownSelect from '../components/DropdownSelect'
+import { Redirect } from 'react-router-dom'
 
 const ListOptions = styled(AutoRow)`
   height: 40px;
@@ -47,6 +48,22 @@ function GlobalPage({ chain }) {
   const [oldChain, setOldChain] = useState(undefined);
   const [selectedChain, setSelectedChainRaw] = useState(chain);
   const setSelectedChain = (newSelectedChain) => setSelectedChainRaw(newSelectedChain === 'All' ? undefined : newSelectedChain)
+  // breakpoints
+  const below800 = useMedia('(max-width: 800px)')
+  // scrolling refs
+  useEffect(() => {
+    document.querySelector('body').scrollTo({
+      behavior: 'smooth',
+      top: 0
+    })
+  }, [])
+
+  if (selectedChain !== chain) {
+    if (selectedChain === undefined) {
+      return <Redirect to="/home" />
+    }
+    return <Redirect to={`/chain/${selectedChain}`} />
+  }
 
   let { totalVolumeUSD, volumeChangeUSD } = globalData
 
@@ -108,17 +125,6 @@ function GlobalPage({ chain }) {
     topToken.tvl = tokensList[0]?.tvl
   }
 
-  // breakpoints
-  const below800 = useMedia('(max-width: 800px)')
-
-  // scrolling refs
-  useEffect(() => {
-    document.querySelector('body').scrollTo({
-      behavior: 'smooth',
-      top: 0
-    })
-  }, [])
-
   document.title = `DefiLlama - DeFi Dashboard`;
 
   const chart = selectedChain === undefined ? <GlobalChart display="liquidity" /> :