From 217687bd1a101b8e9ad89981fb28f11a65e3107c Mon Sep 17 00:00:00 2001
From: yasuke0x0 <yasuke0x0@gmail.com>
Date: Thu, 2 Jan 2025 18:30:36 +0100
Subject: [PATCH] *

---
 public/index.html           |   6 +-
 src/App.js                  | 279 ++++++++++++++++++------------------
 src/apollo/client.js        |  20 +--
 src/contexts/Application.js |   6 +-
 src/contexts/PairData.js    |  11 +-
 5 files changed, 167 insertions(+), 155 deletions(-)

diff --git a/public/index.html b/public/index.html
index 7ae548ff9..71bd4d44a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -10,11 +10,11 @@
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
     -->
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <script src="https://unpkg.com/react/umd/react.production.min.js" crossorigin></script>
+<!--    <script src="https://unpkg.com/react/umd/react.production.min.js" crossorigin></script>-->
 
-    <script src="https://unpkg.com/react-dom/umd/react-dom.production.min.js" crossorigin></script>
+<!--    <script src="https://unpkg.com/react-dom/umd/react-dom.production.min.js" crossorigin></script>-->
 
-    <script src="https://unpkg.com/react-bootstrap@next/dist/react-bootstrap.min.js" crossorigin></script>
+<!--    <script src="https://unpkg.com/react-bootstrap@next/dist/react-bootstrap.min.js" crossorigin></script>-->
     <!--
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
diff --git a/src/App.js b/src/App.js
index d5582a1f8..b06c616c9 100644
--- a/src/App.js
+++ b/src/App.js
@@ -2,12 +2,12 @@ import React, { useState } from 'react'
 import styled from 'styled-components'
 import { ApolloProvider } from 'react-apollo'
 import { client } from './apollo/client'
-import { Route, Switch, BrowserRouter, Redirect } from 'react-router-dom'
+import { BrowserRouter, Redirect, Route, Switch } from 'react-router-dom'
 import GlobalPage from './pages/GlobalPage'
 import TokenPage from './pages/TokenPage'
 import PairPage from './pages/PairPage'
 import Link from './components/Link'
-import { useGlobalData, useGlobalChartData } from './contexts/GlobalData'
+import { useGlobalChartData, useGlobalData } from './contexts/GlobalData'
 import { isAddress } from './utils'
 import AccountPage from './pages/AccountPage'
 import AllTokensPage from './pages/AllTokensPage'
@@ -23,72 +23,72 @@ import GoogleAnalyticsReporter from './components/analytics/GoogleAnalyticsRepor
 import { PAIR_BLACKLIST, TOKEN_BLACKLIST } from './constants'
 
 const AppWrapper = styled.div`
-  position: relative;
-  width: 100%;
+    position: relative;
+    width: 100%;
 `
 const ContentWrapper = styled.div`
-  display: grid;
-  grid-template-columns: ${({ open }) => (open ? '220px 1fr 200px' : '220px 1fr 64px')};
-
-  @media screen and (max-width: 1400px) {
-    grid-template-columns: 220px 1fr;
-  }
-
-  @media screen and (max-width: 1080px) {
-    grid-template-columns: 1fr;
-    max-width: 100vw;
-    overflow: hidden;
-    grid-gap: 0;
-  }
+    display: grid;
+    grid-template-columns: ${({ open }) => (open ? '220px 1fr 200px' : '220px 1fr 64px')};
+
+    @media screen and (max-width: 1400px) {
+        grid-template-columns: 220px 1fr;
+    }
+
+    @media screen and (max-width: 1080px) {
+        grid-template-columns: 1fr;
+        max-width: 100vw;
+        overflow: hidden;
+        grid-gap: 0;
+    }
 `
 
 const Right = styled.div`
-  position: fixed;
-  right: 0;
-  bottom: 0rem;
-  z-index: 99;
-  width: ${({ open }) => (open ? '220px' : '64px')};
-  height: ${({ open }) => (open ? 'fit-content' : '64px')};
-  overflow: auto;
-  background-color: ${({ theme }) => theme.bg1};
-  @media screen and (max-width: 1400px) {
-    display: none;
-  }
+    position: fixed;
+    right: 0;
+    bottom: 0rem;
+    z-index: 99;
+    width: ${({ open }) => (open ? '220px' : '64px')};
+    height: ${({ open }) => (open ? 'fit-content' : '64px')};
+    overflow: auto;
+    background-color: ${({ theme }) => theme.bg1};
+    @media screen and (max-width: 1400px) {
+        display: none;
+    }
 `
 
 const Center = styled.div`
-  height: 100%;
-  z-index: 9999;
-  transition: width 0.25s ease;
-  background-color: ${({ theme }) => theme.onlyLight};
+    height: 100%;
+    z-index: 9999;
+    transition: width 0.25s ease;
+    background-color: ${({ theme }) => theme.onlyLight};
 `
 
 const BannerWrapper = styled.div`
-  width: 100%;
-  display: flex;
-  justify-content: center;
+    width: 100%;
+    display: flex;
+    justify-content: center;
 `
 
 const WarningBanner = styled.div`
-  background-color: #ff6871;
-  padding: 1.5rem;
-  color: white;
-  width: 100%;
-  text-align: center;
-  font-weight: 500;
+    background-color: #ff6871;
+    padding: 1.5rem;
+    color: white;
+    width: 100%;
+    text-align: center;
+    font-weight: 500;
 `
 
 const UrlBanner = styled.div`
-  background-color: #ff007a;
-  padding: 1rem;
-  color: white;
-  width: 100%;
-  text-align: center;
-  font-weight: 500;
+    background-color: #ff007a;
+    padding: 1rem;
+    color: white;
+    width: 100%;
+    text-align: center;
+    font-weight: 500;
 `
 
 const Decorator = styled.span`
-  text-decoration: underline;
+    text-decoration: underline;
 `
 
 /**
@@ -139,98 +139,99 @@ function App() {
             </WarningBanner>
           </BannerWrapper>
         )}
+        {/*{globalData && Object.keys(globalData).length > 0 &&*/}
+        {/*globalChartData && Object.keys(globalChartData).length > 0 ?     */}
         {globalData &&
-        Object.keys(globalData).length > 0 &&
-        globalChartData &&
-        Object.keys(globalChartData).length > 0 ? (
-          <BrowserRouter>
-            <Route component={GoogleAnalyticsReporter} />
-            <Switch>
-              <Route
-                exacts
-                strict
-                path="/token/:tokenAddress"
-                render={({ match }) => {
-                  if (
-                    isAddress(match.params.tokenAddress.toLowerCase()) &&
-                    !Object.keys(TOKEN_BLACKLIST).includes(match.params.tokenAddress.toLowerCase())
-                  ) {
-                    return (
-                      <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
-                        <TokenPage address={match.params.tokenAddress.toLowerCase()} />
-                      </LayoutWrapper>
-                    )
-                  } else {
-                    return <Redirect to="/home" />
-                  }
-                }}
-              />
-              <Route
-                exacts
-                strict
-                path="/pair/:pairAddress"
-                render={({ match }) => {
-                  if (
-                    isAddress(match.params.pairAddress.toLowerCase()) &&
-                    !Object.keys(PAIR_BLACKLIST).includes(match.params.pairAddress.toLowerCase())
-                  ) {
-                    return (
-                      <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
-                        <PairPage pairAddress={match.params.pairAddress.toLowerCase()} />
-                      </LayoutWrapper>
-                    )
-                  } else {
-                    return <Redirect to="/home" />
-                  }
-                }}
-              />
-              <Route
-                exacts
-                strict
-                path="/account/:accountAddress"
-                render={({ match }) => {
-                  if (isAddress(match.params.accountAddress.toLowerCase())) {
-                    return (
-                      <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
-                        <AccountPage account={match.params.accountAddress.toLowerCase()} />
-                      </LayoutWrapper>
-                    )
-                  } else {
-                    return <Redirect to="/home" />
-                  }
-                }}
-              />
-
-              <Route path="/home">
-                <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
-                  <GlobalPage />
-                </LayoutWrapper>
-              </Route>
-
-              <Route path="/tokens">
-                <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
-                  <AllTokensPage />
-                </LayoutWrapper>
-              </Route>
-
-              <Route path="/pairs">
-                <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
-                  <AllPairsPage />
-                </LayoutWrapper>
-              </Route>
-
-              <Route path="/accounts">
-                <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
-                  <AccountLookup />
-                </LayoutWrapper>
-              </Route>
-
-              <Redirect to="/home" />
-            </Switch>
-          </BrowserRouter>
-        ) : (
-          <LocalLoader fill="true" />
-        )}
+        globalChartData ?
+          (
+            <BrowserRouter>
+              <Route component={GoogleAnalyticsReporter} />
+              <Switch>
+                <Route
+                  exacts
+                  strict
+                  path="/token/:tokenAddress"
+                  render={({ match }) => {
+                    if (
+                      isAddress(match.params.tokenAddress.toLowerCase()) &&
+                      !Object.keys(TOKEN_BLACKLIST).includes(match.params.tokenAddress.toLowerCase())
+                    ) {
+                      return (
+                        <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
+                          <TokenPage address={match.params.tokenAddress.toLowerCase()} />
+                        </LayoutWrapper>
+                      )
+                    } else {
+                      return <Redirect to="/home" />
+                    }
+                  }}
+                />
+                <Route
+                  exacts
+                  strict
+                  path="/pair/:pairAddress"
+                  render={({ match }) => {
+                    if (
+                      isAddress(match.params.pairAddress.toLowerCase()) &&
+                      !Object.keys(PAIR_BLACKLIST).includes(match.params.pairAddress.toLowerCase())
+                    ) {
+                      return (
+                        <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
+                          <PairPage pairAddress={match.params.pairAddress.toLowerCase()} />
+                        </LayoutWrapper>
+                      )
+                    } else {
+                      return <Redirect to="/home" />
+                    }
+                  }}
+                />
+                <Route
+                  exacts
+                  strict
+                  path="/account/:accountAddress"
+                  render={({ match }) => {
+                    if (isAddress(match.params.accountAddress.toLowerCase())) {
+                      return (
+                        <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
+                          <AccountPage account={match.params.accountAddress.toLowerCase()} />
+                        </LayoutWrapper>
+                      )
+                    } else {
+                      return <Redirect to="/home" />
+                    }
+                  }}
+                />
+
+                <Route path="/home">
+                  <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
+                    <GlobalPage />
+                  </LayoutWrapper>
+                </Route>
+
+                <Route path="/tokens">
+                  <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
+                    <AllTokensPage />
+                  </LayoutWrapper>
+                </Route>
+
+                <Route path="/pairs">
+                  <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
+                    <AllPairsPage />
+                  </LayoutWrapper>
+                </Route>
+
+                <Route path="/accounts">
+                  <LayoutWrapper savedOpen={savedOpen} setSavedOpen={setSavedOpen}>
+                    <AccountLookup />
+                  </LayoutWrapper>
+                </Route>
+
+                <Redirect to="/home" />
+              </Switch>
+            </BrowserRouter>
+          ) : (
+            <LocalLoader fill="true" />
+          )}
       </AppWrapper>
     </ApolloProvider>
   )
diff --git a/src/apollo/client.js b/src/apollo/client.js
index 5ba7736a4..baafa6766 100644
--- a/src/apollo/client.js
+++ b/src/apollo/client.js
@@ -6,39 +6,43 @@ const SUBGRAPH_API_KEY = process.env.REACT_APP_THE_GRAPH_API_KEY
 
 export const client = new ApolloClient({
   link: new HttpLink({
+    // uri: ` http://localhost:8000/subgraphs/name/uniswap-v2`
     uri: `https://gateway.thegraph.com/api/${SUBGRAPH_API_KEY}/subgraphs/id/EYCKATKGBKLWvSfwvBjzfCBmGwYNdVkduYXVivCsLRFu`,
+
   }),
   cache: new InMemoryCache(),
-  shouldBatch: true,
+  shouldBatch: true
 })
 
 export const healthClient = new ApolloClient({
   link: new HttpLink({
-    uri: 'https://api.thegraph.com/index-node/graphql',
+    uri: 'https://api.thegraph.com/index-node/graphql'
   }),
   cache: new InMemoryCache(),
-  shouldBatch: true,
+  shouldBatch: true
 })
 
 export const v1Client = new ApolloClient({
   link: new HttpLink({
-    uri: `https://gateway.thegraph.com/api/${SUBGRAPH_API_KEY}/subgraphs/id/ESnjgAG9NjfmHypk4Huu4PVvz55fUwpyrRqHF21thoLJ`,
+    uri: `https://gateway.thegraph.com/api/${SUBGRAPH_API_KEY}/subgraphs/id/ESnjgAG9NjfmHypk4Huu4PVvz55fUwpyrRqHF21thoLJ`
   }),
   cache: new InMemoryCache(),
-  shouldBatch: true,
+  shouldBatch: true
 })
 
 export const stakingClient = new ApolloClient({
   link: new HttpLink({
-    uri: 'https://api.thegraph.com/subgraphs/name/way2rach/talisman',
+    uri: 'https://api.thegraph.com/subgraphs/name/way2rach/talisman'
   }),
   cache: new InMemoryCache(),
-  shouldBatch: true,
+  shouldBatch: true
 })
 
 export const blockClient = new ApolloClient({
   link: new HttpLink({
+    // uri: `http://localhost:8000/subgraphs/name/eth-blocks`
     uri: `https://gateway.thegraph.com/api/${SUBGRAPH_API_KEY}/subgraphs/id/9A6bkprqEG2XsZUYJ5B2XXp6ymz9fNcn4tVPxMWDztYC`,
+
   }),
-  cache: new InMemoryCache(),
+  cache: new InMemoryCache()
 })
diff --git a/src/contexts/Application.js b/src/contexts/Application.js
index ab435c553..2362acdee 100644
--- a/src/contexts/Application.js
+++ b/src/contexts/Application.js
@@ -178,9 +178,9 @@ export function useLatestBlocks() {
         .query({
           query: SUBGRAPH_HEALTH,
         })
-        .then((res) => {
-          const syncedBlock = res.data.indexingStatusForCurrentVersion.chains[0].latestBlock.number
-          const headBlock = res.data.indexingStatusForCurrentVersion.chains[0].chainHeadBlock.number
+        .then((res  ) => {
+          const syncedBlock = res.data.indexingStatusForCurrentVersion?.chains[0].latestBlock.number
+          const headBlock = res.data.indexingStatusForCurrentVersion?.chains[0].chainHeadBlock.number
           if (syncedBlock && headBlock) {
             updateLatestBlock(syncedBlock)
             updateHeadBlock(headBlock)
diff --git a/src/contexts/PairData.js b/src/contexts/PairData.js
index bd883502e..0125e9f7d 100644
--- a/src/contexts/PairData.js
+++ b/src/contexts/PairData.js
@@ -183,8 +183,15 @@ export default function Provider({ children }) {
 }
 
 async function getBulkPairData(pairList, ethPrice) {
-  const [t1, t2, tWeek] = getTimestampsForChanges()
-  let [{ number: b1 }, { number: b2 }, { number: bWeek }] = await getBlocksFromTimestamps([t1, t2, tWeek])
+  const [t1, t2, tWeek] = getTimestampsForChanges();
+
+  // Fetch block data safely
+  let blocks = await getBlocksFromTimestamps([t1, t2, tWeek]);
+
+  // Apply fallback values for blocks
+  let b1 = blocks[0]?.number || 443284;
+  let b2 = blocks[1]?.number || 443284;
+  let bWeek = blocks[2]?.number || 443284;
 
   try {
     let current = await client.query({