fix: env

scroll-tech · Aug 13, 2024 · 88aa915 · 88aa915
1 parent d54e528
commit 88aa915
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 94 deletions.
diff --git a/.env.template b/.env.template
@@ -64,4 +64,5 @@ REACT_APP_CANVAS_BACKEND_URI="https://skelly-backend-git-sepolia-scroll-tech.ver
 REACT_APP_FFRONTENDS_URL = "https://scroll-skelly.env.scroll.io"
 REACT_APP_EAS_EXPLORER_URL = "https://scroll-sepolia.easscan.org"
 REACT_APP_ETHEREUM_YEAR_BADGE_API_URI = "https://genesis-nft-backend-git-sepolia-scroll-tech.vercel.app"
-REACT_APP_BADGE_LIST_URL = "https://raw.githubusercontent.com/scroll-tech/canvas-badges/main/scroll.badgelist.sepolia.json"
+REACT_APP_BADGE_REGISTRY_URL="https://badge-registry.canvas.scroll.cat"
+REACT_APP_BADGE_INDEXER_URL="https://canvas-indexer.scroll.cat"
diff --git a/netlify.toml b/netlify.toml
@@ -164,63 +164,10 @@ REACT_APP_CANVAS_BACKEND_URI="https://skelly-backend-git-sepolia-scroll-tech.ver
 REACT_APP_FFRONTENDS_URL = "https://scroll-skelly.env.scroll.io"
 REACT_APP_EAS_EXPLORER_URL = "https://scroll-sepolia.easscan.org"
 REACT_APP_ETHEREUM_YEAR_BADGE_API_URI = "https://genesis-nft-backend-git-sepolia-scroll-tech.vercel.app"
-REACT_APP_BADGE_LIST_URL="https://raw.githubusercontent.com/scroll-tech/canvas-badges/main/scroll.badgelist.sepolia.json"
+REACT_APP_BADGE_REGISTRY_URL="https://badge-registry.canvas.scroll.cat"
+REACT_APP_BADGE_INDEXER_URL="https://canvas-indexer.scroll.cat"
 
 
-[context.scroll-skelly.environment]
-REACT_APP_SCROLL_ENVIRONMENT = "Staging"
-REACT_APP_API_BASE_URI = "https://sepolia-api.scroll.io"
-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"
-REACT_APP_EXTERNAL_RPC_URI_L1 = "https://ethereum-sepolia.blockpi.network/v1/rpc/public"
-REACT_APP_EXTERNAL_RPC_URI_L2 = "https://sepolia-rpc.scroll.io"
-REACT_APP_EXTERNAL_EXPLORER_URI_L1 = "https://sepolia.etherscan.io"
-REACT_APP_EXTERNAL_EXPLORER_URI_L2 = "https://sepolia.scrollscan.com"
-REACT_APP_L2_SCAN_URI = "https://scroll-sepolia.l2scan.co"
-REACT_APP_EXTERNAL_EXPLORER_URI_DORA = "https://www.ondora.xyz/network/scroll-sepolia"
-REACT_APP_ETHERSCAN_L2 = "https://sepolia.scrollscan.com"
-REACT_APP_SCROLL_VENUS_URI = "https://sepolia-venus.scroll.io"
-REACT_APP_L2_SWAP_URI = "https://uniswap-showcase.sepolia.scroll.xyz/"
-REACT_APP_L1_ETH_GATEWAY_PROXY_ADDR = "0x8A54A2347Da2562917304141ab67324615e9866d"
-REACT_APP_L2_ETH_GATEWAY_PROXY_ADDR = "0x91e8ADDFe1358aCa5314c644312d38237fC1101C"
-REACT_APP_L1_WETH_GATEWAY_PROXY_ADDR = "0x3dA0BF44814cfC678376b3311838272158211695"
-REACT_APP_L2_WETH_GATEWAY_PROXY_ADDR = "0x481B20A927206aF7A754dB8b904B052e2781ea27"
-REACT_APP_L1_CUSTOM_ERC20_GATEWAY_PROXY_ADDR = "0x31C994F2017E71b82fd4D8118F140c81215bbb37"
-REACT_APP_L2_CUSTOM_ERC20_GATEWAY_PROXY_ADDR = "0x058dec71E53079F9ED053F3a0bBca877F6f3eAcf"
-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 = "0xF22B24fa7c3168f30b17fd97b71bdd3162DDe029"
-REACT_APP_L2_LIDO_GATEWAY_PROXY_ADDR = "0x635B054A092F6aE61Ce0Fddc397A704F6626510D"
-REACT_APP_L1_PUFFER_GATEWAY_PROXY_ADDR = "0xA033Ff09f2da45f0e9ae495f525363722Df42b2a"
-REACT_APP_L2_PUFFER_GATEWAY_PROXY_ADDR = "0x9eBf2f33526CD571f8b2ad312492cb650870CFd6"
-REACT_APP_L1_STANDARD_ERC20_GATEWAY_PROXY_ADDR = "0x65D123d6389b900d954677c26327bfc1C3e88A13"
-REACT_APP_L2_STANDARD_ERC20_GATEWAY_PROXY_ADDR = "0xaDcA915971A336EA2f5b567e662F5bd74AEf9582"
-REACT_APP_L1_SCROLL_MESSENGER = "0x50c7d3e7f7c656493D1D76aaa1a836CedfCBB16A"
-REACT_APP_L2_SCROLL_MESSENGER = "0xBa50f5340FB9F3Bd074bD638c9BE13eCB36E603d"
-REACT_APP_L1_GATEWAY_ROUTER_PROXY_ADDR = "0x13FBE0D0e5552b8c9c4AE9e2435F38f37355998a"
-REACT_APP_L2_GATEWAY_ROUTER_PROXY_ADDR = "0x9aD3c5617eCAa556d6E166787A97081907171230"
-REACT_APP_L1_GAS_PRICE_ORACLE = "0x5300000000000000000000000000000000000002"
-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="0xF0B2293F5D834eAe920c6974D50957A1732de763"
-REACT_APP_L1_BATCH_BRIDGE_GATEWAY_PROXY_ADDR = "0xE86ad3312FA693aDeD34dEc3899176d97ac883B2"
-REACT_APP_OPEN_BLOCK_URI = "https://5x6x869ic0.execute-api.us-east-1.amazonaws.com"
-
-REACT_APP_EAS_ADDRESS="0xaEF4103A04090071165F78D45D83A0C0782c2B2a"
-REACT_APP_BADGE_SCHEMA="0xa35b5470ebb301aa5d309a8ee6ea258cad680ea112c86e456d5f2254448afc74"
-REACT_APP_PROFILE_REGISTRY_ADDRESS="0x26aa585d5Da74A373E58c4fA723E1E1f6FD6474f"
-REACT_APP_EAS_GRAPHQL_URL="https://scroll-sepolia.easscan.org/graphql"
-REACT_APP_CANVAS_BACKEND_URI="https://skelly-backend-git-sepolia-scroll-tech.vercel.app"
-REACT_APP_FFRONTENDS_URL = "https://scroll-skelly.env.scroll.io"
-REACT_APP_EAS_EXPLORER_URL = "https://scroll-sepolia.easscan.org"
-REACT_APP_ETHEREUM_YEAR_BADGE_API_URI = "https://genesis-nft-backend-git-sepolia-scroll-tech.vercel.app"
-REACT_APP_BADGE_LIST_URL="https://raw.githubusercontent.com/scroll-tech/canvas-badges/main/scroll.badgelist.sepolia.json"
 
 
 [context.sepolia.environment]
@@ -276,7 +223,8 @@ REACT_APP_CANVAS_BACKEND_URI="https://skelly-backend-git-sepolia-scroll-tech.ver
 REACT_APP_FFRONTENDS_URL = "https://sepolia.env.scroll.io"
 REACT_APP_EAS_EXPLORER_URL = "https://scroll-sepolia.easscan.org"
 REACT_APP_ETHEREUM_YEAR_BADGE_API_URI = "https://genesis-nft-backend-git-sepolia-scroll-tech.vercel.app"
-REACT_APP_BADGE_LIST_URL="https://raw.githubusercontent.com/scroll-tech/canvas-badges/main/scroll.badgelist.sepolia.json"
+REACT_APP_BADGE_REGISTRY_URL="https://badge-registry.canvas.scroll.cat"
+REACT_APP_BADGE_INDEXER_URL="https://canvas-indexer.scroll.cat"
 
 
 [context.mainnet.environment]
@@ -331,6 +279,7 @@ REACT_APP_CANVAS_BACKEND_URI="https://canvas.scroll.cat"
 REACT_APP_FFRONTENDS_URL = "https://scroll.io"
 REACT_APP_EAS_EXPLORER_URL = "https://scroll.easscan.org"
 REACT_APP_ETHEREUM_YEAR_BADGE_API_URI = "https://nft.scroll.io"
-REACT_APP_BADGE_LIST_URL="https://raw.githubusercontent.com/scroll-tech/canvas-badges/main/scroll.badgelist.json"
+REACT_APP_BADGE_REGISTRY_URL="https://badge-registry.canvas.scroll.cat"
+REACT_APP_BADGE_INDEXER_URL="https://canvas-indexer.scroll.cat"
 
 
diff --git a/public/imgs/canvas-badge/Ambient.png b/public/imgs/canvas-badge/Ambient.png
diff --git a/public/imgs/canvas-badge/Zebra.png b/public/imgs/canvas-badge/Zebra.png
diff --git a/public/imgs/canvas-badge/bg.png b/public/imgs/canvas-badge/bg.png
diff --git a/public/imgs/canvas-badge/bg.webp b/public/imgs/canvas-badge/bg.webp
diff --git a/public/imgs/canvas-badge/canvas_bg.png b/public/imgs/canvas-badge/canvas_bg.png
diff --git a/src/components/SectionHeader/index.tsx b/src/components/SectionHeader/index.tsx
@@ -5,7 +5,7 @@ import useCheckViewport from "@/hooks/useCheckViewport"
 
 const ActionWrapper = styled(Box)(({ theme }) => ({
   display: "flex",
-  flex: 1,
+  width: "100%",
   justifyContent: "flex-end",
 }))
 
@@ -18,30 +18,28 @@ const SectionHeader = props => {
       direction={isPortrait ? "column" : "row"}
       spacing={isPortrait && action ? "4.8rem" : "0"}
       justifyContent="space-between"
-      alignItems={!content ? "center" : isPortrait ? "flex-start" : "flex-end"}
+      alignItems={isPortrait ? "flex-start" : "flex-end"}
       {...rest}
     >
-      <Stack direction="column" sx={{ maxWidth: ["100%", action && content ? "60rem" : "100%"] }}>
+      <Stack direction="column" sx={{ maxWidth: ["100%", action ? "60rem" : "100%"] }}>
         <Typography
           sx={{
             fontSize: ["3.2rem", "4.6rem"],
             fontWeight: 500,
+            mb: ["0.8rem", "1.4rem"],
             color: theme => (dark ? theme.palette.primary.contrastText : "unset"),
           }}
         >
           {title}
         </Typography>
-        {content && (
-          <Typography
-            sx={{
-              mt: ["0.8rem", "1.4rem"],
-              fontSize: ["1.8rem", "2.4rem"],
-              color: theme => (dark ? theme.palette.primary.contrastText : "unset"),
-            }}
-          >
-            {content}
-          </Typography>
-        )}
+        <Typography
+          sx={{
+            fontSize: ["1.8rem", "2.4rem"],
+            color: theme => (dark ? theme.palette.primary.contrastText : "unset"),
+          }}
+        >
+          {content}
+        </Typography>
       </Stack>
       <ActionWrapper>{action}</ActionWrapper>
     </Stack>

diff --git a/src/contexts/RainbowProvider/index.tsx b/src/contexts/RainbowProvider/index.tsx
@@ -67,7 +67,6 @@ const Web3ContextProvider = props => {
     <RainbowContext.Provider
       value={{
         provider,
-        // walletCurrentAddress: "0x78f218b168964dcF899fA8f2F49B95ee640e843A",
         walletCurrentAddress: address,
         walletName: activeConnector?.name,
         chainId,

diff --git a/src/hooks/useNotionBadge.ts b/src/hooks/useNotionBadge.ts
diff --git a/src/routes/index.tsx b/src/routes/index.tsx
@@ -5,7 +5,7 @@ import BrandKit from "@/pages/brand-kit"
 import Bridge from "@/pages/bridge"
 import BridgeFAQ from "@/pages/bridge/FAQ"
 import ScrollCanvas from "@/pages/canvas"
-import CanvasAndBadge from "@/pages/canvas-badge"
+import CanvasAndBadges from "@/pages/canvas-badge"
 import CanvasDashboard from "@/pages/canvas/Dashboard"
 import CanvasBadge from "@/pages/canvas/badge"
 import CanvasBadgeContract from "@/pages/canvas/badgeContract"
@@ -279,7 +279,7 @@ const mainnetRoutes = [
   {
     name: "Canvas And Badges",
     path: "/canvas-and-badges",
-    element: <CanvasAndBadge />,
+    element: <CanvasAndBadges />,
   },
 ]