Merge branch 'mainnet' into sepolia

scroll-tech · Feb 22, 2024 · 6fd8324 · 6fd8324
2 parents 2da663f + 19eb878
commit 6fd8324
Show file tree

Hide file tree

Showing 9 changed files with 295 additions and 41 deletions.
diff --git a/.env.template b/.env.template
@@ -1,4 +1,5 @@
 REACT_APP_VERSION="1.0.0"
+
 REACT_APP_MAIN_ENVIRONMENT = "Mainnet" # used to determine which SCROLL_ENVIRONMENT is to be treated as the main/production one
 REACT_APP_ETH_SYMBOL = "ETH"
 REACT_APP_PREFIX_CLS = "scroll"
@@ -10,7 +11,7 @@ REACT_APP_NFT_VIEWER_URL="https://nft.scroll.io"
 REACT_APP_NFT_API_URI="https://nft.scroll.io"
 REACT_APP_SCROLL_ENVIRONMENT = "Staging"
 REACT_APP_API_BASE_URI = "https://sepolia-api.scroll.io"
-REACT_APP_BRIDGE_API_URI = "https://sepolia-api-bridge.scroll.io/api"
+REACT_APP_BRIDGE_API_URI = "https://sepolia-api-bridge-v2.scroll.io/api"
 REACT_APP_ROLLUPSCAN_API_URI = "https://sepolia-api-re.scroll.io/api"
 REACT_APP_CHAIN_ID_L1 = "11155111"
 REACT_APP_CHAIN_ID_L2 = "534351"
@@ -32,8 +33,8 @@ REACT_APP_L1_USDC_GATEWAY_PROXY_ADDR = ""
 REACT_APP_L2_USDC_GATEWAY_PROXY_ADDR= ""
 REACT_APP_L1_DAI_GATEWAY_PROXY_ADDR = "0x8b0B9c4e9f41b9bbDEfFee24F9f11C328093d248"
 REACT_APP_L2_DAI_GATEWAY_PROXY_ADDR = "0xbF28c28490988026Dca2396148DE50136A54534e"
-REACT_APP_L1_LIDO_GATEWAY_PROXY_ADDR = ""
-REACT_APP_L2_LIDO_GATEWAY_PROXY_ADDR = ""
+REACT_APP_L1_LIDO_GATEWAY_PROXY_ADDR = "0xF22B24fa7c3168f30b17fd97b71bdd3162DDe029"
+REACT_APP_L2_LIDO_GATEWAY_PROXY_ADDR = "0x635B054A092F6aE61Ce0Fddc397A704F6626510D"
 REACT_APP_L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR = "0x65D123d6389b900d954677c26327bfc1C3e88A13"
 REACT_APP_L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR = "0xaDcA915971A336EA2f5b567e662F5bd74AEf9582"
 REACT_APP_L1_SCROLL_MESSENGER = "0x50c7d3e7f7c656493D1D76aaa1a836CedfCBB16A"
@@ -45,4 +46,4 @@ REACT_APP_SCROLL_CHAIN = "0x2D567EcE699Eabe5afCd141eDB7A4f2D0D6ce8a0"
 REACT_APP_L1_MESSAGE_QUEUE = "0xF0B2293F5D834eAe920c6974D50957A1732de763"
 REACT_APP_SCROLL_ORIGINS_NFT="0x90a274D591d5AB1a25f0DD0F06F28533C34D7d9f"
 REACT_APP_SCROLL_ORIGINS_NFT_V2="0xDd7d857F570B0C211abfe05cd914A85BefEC2464"
-REACT_APP_L1_MESSAGE_QUEUE_WITH_GAS_PRICE_ORACLE=""
+REACT_APP_L1_MESSAGE_QUEUE_WITH_GAS_PRICE_ORACLE="0xF0B2293F5D834eAe920c6974D50957A1732de763"
diff --git a/netlify.toml b/netlify.toml
@@ -63,6 +63,10 @@ from = "/blog/scrollsFreshCoat"
 to = "/blog/scrolls-fresh-coat"
 status = 301
 
+[[redirects]]
+from = "/sticker-vote"
+to = "/sticker-winners"
+status = 301
 
 
 

diff --git a/package.json b/package.json
@@ -108,6 +108,7 @@
     "husky": "^8.0.2",
     "less": "^4.1.3",
     "less-loader": "^11.1.0",
+    "lint-staged": "^15.2.2",
     "os-browserify": "^0.3.0",
     "postcss": "^8.4.17",
     "prettier": "^2.8.1",

diff --git a/src/Homepage.tsx b/src/Homepage.tsx
@@ -33,6 +33,8 @@ function Homepage() {
       return window.location.origin + `/og_scroll_brand.png`
     } else if (window.location.pathname.startsWith("/sticker-vote")) {
       return window.location.origin + `/${type}_sticker_vote.png`
+    } else if (window.location.pathname.startsWith("/sticker-winners")) {
+      return window.location.origin + `/${type}_sticker_vote.png`
     }
     return window.location.origin + "/og_scroll.png"
   }

diff --git a/src/pages/sticker-winners/Finalists/Winner.tsx b/src/pages/sticker-winners/Finalists/Winner.tsx
@@ -28,6 +28,7 @@ const useStyles = makeStyles()(theme => ({
     },
 
     [theme.breakpoints.down("sm")]: {
+      width: "100%",
       flexDirection: "column",
       gap: "1.6rem",
     },
@@ -36,7 +37,7 @@ const useStyles = makeStyles()(theme => ({
 
 const Winner = props => {
   const {
-    data: { name, author, images, bg },
+    data: { author, images, bg },
   } = props
   const { classes } = useStyles()
   const { isMobile } = useCheckViewport()
@@ -51,16 +52,16 @@ const Winner = props => {
 
   return (
     <>
-      <Stack direction="column" alignItems="center">
+      <Stack direction="column" sx={{ width: "100%" }} alignItems="center">
         <Typography sx={{ fontSize: ["2rem", "3.2rem"], lineHeight: ["3.2rem", "4rem"], fontWeight: 600, mb: "1.6rem", textAlign: "center" }}>
-          {name} - {author}
+          Finalist - {author}
         </Typography>
         <SuccessionToView className={classes.flex} threshold={isMobile ? 0 : 0.1}>
           {images.map((src, index) => (
             <SuccessionItem key={index}>
               <StickerPicture
                 src={src}
-                alt={`${name}-${author}-${index}`}
+                alt={`${author}-${index}`}
                 bgColor={Array.isArray(bg) ? bg[index] : bg}
                 onClick={handleViewImage}
               ></StickerPicture>

diff --git a/src/pages/sticker-winners/Finalists/data.json b/src/pages/sticker-winners/Finalists/data.json
@@ -1,47 +1,49 @@
 {
   "winner": {
-    "author": "Magda",
-    "images": ["/imgs/sticker/Magda1.png", "/imgs/sticker/Magda2.png"]
+    "author": "MillionDollars",
+    "images": ["/imgs/sticker/MillionDollars1.png", "/imgs/sticker/MillionDollars2.png"]
   },
   "top2-5": [
     {
-      "author": "Coincuddle",
-      "images": ["/imgs/sticker/Coincuddle1.png", "/imgs/sticker/Coincuddle2.png"]
+      "author": "Cozy",
+      "images": ["/imgs/sticker/Cozy1.png", "/imgs/sticker/Cozy2.png"],
+      "bg": "#FFF8F3"
     },
     {
-      "author": "Cozy",
-      "images": ["/imgs/sticker/Cozy1.png", "/imgs/sticker/Cozy2.png"]
+      "author": "Shallot",
+      "images": ["/imgs/sticker/Shallot1.png", "/imgs/sticker/Shallot2.png"]
     },
     {
-      "author": "EssisW.eth",
-      "images": ["/imgs/sticker/EssisW.eth1.gif", "/imgs/sticker/EssisW.eth2.jpg"],
-      "bg": ["#FAECE5", "#FFF3E7"]
+      "author": "Coincuddle",
+      "images": ["/imgs/sticker/Coincuddle1.png", "/imgs/sticker/Coincuddle2.png"]
     },
     {
       "author": "fomomonstr",
-      "images": ["/imgs/sticker/fomomonstr1.png", "/imgs/sticker/fomomonstr2.png"]
+      "images": ["/imgs/sticker/fomomonstr1.png", "/imgs/sticker/fomomonstr2.png"],
+      "bg": "#FFEEDA"
     }
   ],
   "remaining": [
     {
-      "author": "Yol",
-      "images": ["/imgs/sticker/Yol1.png", "/imgs/sticker/Yol2.png"]
+      "author": "EssisW.eth",
+      "images": ["/imgs/sticker/EssisW.eth1.gif", "/imgs/sticker/EssisW.eth2.jpg"],
+      "bg": ["#FAECE5", "#FFF3E7"]
     },
     {
-      "author": "MillionDollars",
-      "images": ["/imgs/sticker/MillionDollars1.png", "/imgs/sticker/MillionDollars2.png"]
+      "author": "Yol",
+      "images": ["/imgs/sticker/Yol1.png", "/imgs/sticker/Yol2.png"]
     },
     {
-      "author": "Shallot",
-      "images": ["/imgs/sticker/Shallot1.png", "/imgs/sticker/Shallot2.png"]
+      "author": "Andre",
+      "images": ["/imgs/sticker/Andre1.jpg", "/imgs/sticker/Andre2.jpg"]
     },
     {
-      "author": "Cozy",
-      "images": ["/imgs/sticker/Cozy1.png", "/imgs/sticker/Cozy2.png"]
+      "author": "afifridwan",
+      "images": ["/imgs/sticker/afifridwan1.gif", "/imgs/sticker/afifridwan2.gif"]
     },
     {
-      "author": "Coincuddle",
-      "images": ["/imgs/sticker/Coincuddle1.png", "/imgs/sticker/Coincuddle2.png"]
+      "author": "Magda",
+      "images": ["/imgs/sticker/Magda1.png", "/imgs/sticker/Magda2.png"]
     }
   ]
 }
diff --git a/src/pages/sticker-winners/Header/index.tsx b/src/pages/sticker-winners/Header/index.tsx
@@ -32,12 +32,14 @@ const useStyles = makeStyles()(theme => ({
     },
   },
   award: {
-    padding: "0.8rem 2rem",
+    padding: "1.5rem 2rem",
     border: `3px solid ${theme.palette.text.primary}`,
-    height: "8rem",
     backgroundColor: theme.palette.themeBackground.light,
     borderRadius: "1.6rem",
     textAlign: "center",
+    [theme.breakpoints.down("md")]: {
+      padding: "0.6rem 2rem",
+    },
     [theme.breakpoints.down("sm")]: {
       borderWidth: "2px",
     },
@@ -89,7 +91,7 @@ const Award = () => {
     <Container sx={{ mt: "2rem", pb: ["3.6rem", "4.2rem"] }}>
       <Stack direction="row" justifyContent="center" alignItems="center" className={classes.award}>
         <Typography
-          sx={{ fontSize: ["1.8rem", "3.2rem"], lineHeight: ["2.4rem", "4rem"], fontWeight: 500, fontFamily: "var(--developer-page-font-family)" }}
+          sx={{ fontSize: ["1.8rem", "3.2rem"], lineHeight: ["2.4rem", "4.4rem"], fontWeight: 500, fontFamily: "var(--developer-page-font-family)" }}
         >
           Top 1 prize: <strong>1000 USD</strong> {isPortrait ? <br></br> : "|"} Top 2-5 prize: <strong>200 USD</strong> each
         </Typography>

diff --git a/src/routes/index.tsx b/src/routes/index.tsx
@@ -19,7 +19,7 @@ import RollupScanChunk from "@/pages/rollup/chunk"
 import RollupScanChunkDetail from "@/pages/rollup/chunk/detail"
 import RollupScan from "@/pages/rollup/index"
 import StickerVote from "@/pages/sticker-vote"
-// import StickerWinners from "@/pages/sticker-winners"
+import StickerWinners from "@/pages/sticker-winners"
 import Terms from "@/pages/terms"
 import { isSepolia } from "@/utils"
 
@@ -211,12 +211,12 @@ const mainnetRoutes = [
     element: <StickerVote />,
     description: "Vote for your favourite sticker designs.",
   },
-  // {
-  //   name: "Scroll Sticker Winners",
-  //   path: "/sticker-winners",
-  //   element: <StickerWinners />,
-  //   description: "Congratulations to the winners of the sticker contest.",
-  // },
+  {
+    name: "Scroll Sticker Winners",
+    path: "/sticker-winners",
+    element: <StickerWinners />,
+    description: "Congratulations to the winners of the sticker contest.",
+  },
 ]
 
 const routes = isSepolia ? sepoliaRoutes : mainnetRoutes