Merge pull request #1055 from scroll-tech/sepolia

merge sepolia into mainnet
scroll-tech · May 17, 2024 · d05f092 · d05f092
2 parents 8c46235 + a9c881f
commit d05f092
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 60 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scroll.io",
-  "version": "5.0.89",
+  "version": "5.0.90",
   "private": false,
   "license": "MIT",
   "scripts": {

diff --git a/src/components/Header/desktop_header.tsx b/src/components/Header/desktop_header.tsx
@@ -11,7 +11,7 @@ import WalletToolkit from "@/components/WalletToolkit"
 import useCheckViewport from "@/hooks/useCheckViewport"
 import useShowWalletConnector from "@/hooks/useShowWalletToolkit"
 
-import Announcement from "./announcement"
+// import Announcement from "./announcement"
 import { navigations } from "./constants"
 import useCheckCustomNavBarBg from "./useCheckCustomNavBarBg"
 import useCheckTheme from "./useCheckTheme"
@@ -270,7 +270,7 @@ const App = ({ currentMenu }) => {
 
   return (
     <StyledBox bgColor={navbarBg} dark={dark} onMouseEnter={() => setIsHover(true)} onMouseLeave={() => setIsHover(false)}>
-      <Announcement />
+      {/* <Announcement /> */}
       <Container>
         <HeaderContainer>
           <NavLink to="/" className="flex">

diff --git a/src/components/Header/mobile_header.tsx b/src/components/Header/mobile_header.tsx
@@ -9,7 +9,7 @@ import WalletToolkit from "@/components/WalletToolkit"
 import useShowWalletConnector from "@/hooks/useShowWalletToolkit"
 
 import Logo from "../ScrollLogo"
-import Announcement from "./announcement"
+// import Announcement from "./announcement"
 import { navigations } from "./constants"
 import useCheckCustomNavBarBg from "./useCheckCustomNavBarBg"
 import useCheckTheme from "./useCheckTheme"
@@ -233,7 +233,7 @@ const App = ({ currentMenu }) => {
       className={open ? "active" : ""}
       sx={{ backgroundColor: navbarBg && !open ? `themeBackground.${navbarBg}` : dark ? "themeBackground.dark" : "themeBackground.light" }}
     >
-      <Announcement />
+      {/* <Announcement /> */}
       <NavStack direction="row" justifyContent="space-between" alignItems="center">
         <NavLink to="/" className="flex">
           <Box onClick={() => toggleDrawer(false)}>

diff --git a/src/pages/sessions/SessionZeroMarks/index.tsx b/src/pages/sessions/SessionZeroMarks/index.tsx
@@ -1,4 +1,4 @@
-import dayjs from "dayjs"
+// import dayjs from "dayjs"
 import useStorage from "squirrel-gill"
 import useSWR from "swr"
 
@@ -37,54 +37,54 @@ const BridgePoints = () => {
           throw new Error("Wallet address or signed terms missing.")
         }
 
-        const now = dayjs().unix()
-        const timestamp = bridgeBalances[walletAddress]?.timestamp ?? 0
-        const isDataExpired = dayjs.unix(now).diff(dayjs.unix(timestamp), "day") > 1
+        // const now = dayjs().unix()
+        // const timestamp = bridgeBalances[walletAddress]?.timestamp ?? 0
+        // const isDataExpired = dayjs.unix(now).diff(dayjs.unix(timestamp), "day") > 1
 
-        if (isDataExpired) {
-          const list = await scrollRequest(url)
-          const tokensMarks = tokenList.map(item => {
-            const withMarks = list.filter(item => item.points).find(i => i.bridge_asset.toUpperCase() === item.symbol.toUpperCase())
-            let marks = withMarks?.points ?? 0
+        // if (isDataExpired) {
+        const list = await scrollRequest(url)
+        const tokensMarks = tokenList.map(item => {
+          const withMarks = list.filter(item => item.points).find(i => i.bridge_asset.toUpperCase() === item.symbol.toUpperCase())
+          let marks = withMarks?.points ?? 0
 
-            if (item.additionalToken) {
-              const additionalToken = list.filter(item => item.points).find(i => i.bridge_asset.toUpperCase() === item.additionalToken.toUpperCase())
-              if (additionalToken) {
-                marks += additionalToken.points ?? 0
-              }
+          if (item.additionalToken) {
+            const additionalToken = list.filter(item => item.points).find(i => i.bridge_asset.toUpperCase() === item.additionalToken.toUpperCase())
+            if (additionalToken) {
+              marks += additionalToken.points ?? 0
             }
+          }
 
-            return {
-              ...item,
-              marks,
-            }
-          })
-          const gasMarksResult = list.find(item => item.bridge_asset === "gas-points")
-          const gasMarks = gasList.map(item => ({
-            ...item,
-            amount: gasMarksResult?.amount ?? 0,
-            marks: gasMarksResult?.points ?? 0,
-          }))
-          setBridgeBalances({
-            ...bridgeBalances,
-            [walletAddress]: {
-              tokensMarks,
-              gasMarks,
-              timestamp: walletMarks[walletAddress]?.timestamp ?? 0,
-            },
-          })
           return {
-            tokensMarks,
-            gasMarks,
+            ...item,
+            marks,
           }
-        } else {
-          const tokensMarks = bridgeBalances[walletAddress]?.tokensMarks ?? []
-          const gasMarks = bridgeBalances[walletAddress]?.gasMarks ?? []
-          return {
+        })
+        const gasMarksResult = list.find(item => item.bridge_asset === "gas-points")
+        const gasMarks = gasList.map(item => ({
+          ...item,
+          amount: gasMarksResult?.amount ?? 0,
+          marks: gasMarksResult?.points ?? 0,
+        }))
+        setBridgeBalances({
+          ...bridgeBalances,
+          [walletAddress]: {
             tokensMarks,
             gasMarks,
-          }
+            timestamp: walletMarks[walletAddress]?.timestamp ?? 0,
+          },
+        })
+        return {
+          tokensMarks,
+          gasMarks,
         }
+        // } else {
+        //   const tokensMarks = bridgeBalances[walletAddress]?.tokensMarks ?? []
+        //   const gasMarks = bridgeBalances[walletAddress]?.gasMarks ?? []
+        //   return {
+        //     tokensMarks,
+        //     gasMarks,
+        //   }
+        // }
       } catch (e) {
         return defaultMarks
       }

diff --git a/src/pages/sessions/TotalMarks/index.tsx b/src/pages/sessions/TotalMarks/index.tsx
@@ -1,4 +1,4 @@
-import dayjs from "dayjs"
+// import dayjs from "dayjs"
 import { motion } from "framer-motion"
 import { isNumber } from "lodash"
 import useStorage from "squirrel-gill"
@@ -50,21 +50,22 @@ const TotalPoints = () => {
         if (!walletAddress) {
           throw new Error("Wallet address or signed terms missing.")
         }
-        const now = dayjs().unix()
-        const timestamp = walletMarks[walletAddress]?.timestamp ?? 0
-        const isDataExpired = dayjs.unix(now).diff(dayjs.unix(timestamp), "day") > 1
-        if (isDataExpired) {
-          const data = await scrollRequest(url)
-          const points = data[0].points
+        // const now = dayjs().unix()
+        // const timestamp = walletMarks[walletAddress]?.timestamp ?? 0
+        // const isDataExpired = dayjs.unix(now).diff(dayjs.unix(timestamp), "day") > 1
+        // if (isDataExpired) {
+        const data = await scrollRequest(url)
+        const points = data[0].points
 
-          setWalletMarks({
-            ...walletMarks,
-            [walletAddress]: data[0],
-          })
-          return points
-        } else {
-          return walletMarks[walletAddress].points
-        }
+        setWalletMarks({
+          ...walletMarks,
+          [walletAddress]: data[0],
+        })
+        return points
+        // }
+        //  else {
+        //   return walletMarks[walletAddress].points
+        // }
       } catch (e) {
         return null
       }