Skip to content

Commit

Permalink
Merge pull request #1116 from scroll-tech/sepolia
Browse files Browse the repository at this point in the history
merge sepolia into mainnet
  • Loading branch information
Holybasil authored Jun 6, 2024
2 parents 237d71a + 66030b5 commit 13d6355
Show file tree
Hide file tree
Showing 6 changed files with 54 additions and 17 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "scroll.io",
"version": "5.0.103",
"version": "5.0.104",
"private": false,
"license": "MIT",
"scripts": {
Expand Down
Binary file added src/assets/images/common/scrolly-sad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/pages/career/News/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const News = () => {
const { classes } = useStyles()

const handleClick = news => {
window.location.href = news.link
window.open(news.link, "_blank")
}

return (
Expand Down
34 changes: 19 additions & 15 deletions src/pages/ecosystem/Protocols/ProtocolList/ProtocolCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -183,21 +183,25 @@ const ProtocolCard = props => {
</Box>
)}
</Stack>
<LinesEllipsis
className={classes.desc}
text={desc}
maxLine={isExpended ? 100 : isMobile ? 4 : 2}
ellipsis={
<>
&thinsp;...&thinsp;
<TextButton sx={{ fontWeight: 400, color: "#5b5b5b" }} underline="always" onClick={handleClickMore}>
More
</TextButton>
</>
}
basedOn="words"
onReflow={handleReflow}
/>
{desc ? (
<LinesEllipsis
className={classes.desc}
text={desc}
maxLine={isExpended ? 100 : isMobile ? 4 : 2}
ellipsis={
<>
&thinsp;...&thinsp;
<TextButton sx={{ fontWeight: 400, color: "#5b5b5b" }} underline="always" onClick={handleClickMore}>
More
</TextButton>
</>
}
basedOn="words"
onReflow={handleReflow}
/>
) : (
<Typography className={classes.desc}>(empty)</Typography>
)}

{!isDesktop && (
<Box className={classes.tagWrapper}>
Expand Down
27 changes: 27 additions & 0 deletions src/pages/sessions-restricted/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import Img from "react-cool-img"

import { Container, Typography } from "@mui/material"

import ScrollySad from "@/assets/images/common/scrolly-sad.png"

const SessionsRestricted = () => {
return (
<Container
sx={{
height: ["calc(100vh - 6.2rem - 5rem)", "calc(100vh - 6.5rem - 13.4rem )"],
display: "flex",
flexDirection: "column",
justifyContent: "center",
alignItems: "center",
gap: ["1.6rem", "3.2rem"],
}}
>
<Img src={ScrollySad} width={120} height={120}></Img>
<Typography sx={{ fontSize: ["1.8rem", "2.4rem"], lineHeight: ["2.8rem", "3.2rem"], fontWeight: 600, textAlign: "center" }}>
Scroll Sessions is not available<br></br>in your region.
</Typography>
</Container>
)
}

export default SessionsRestricted
6 changes: 6 additions & 0 deletions src/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import RollupScanChunk from "@/pages/rollup/chunk"
import RollupScanChunkDetail from "@/pages/rollup/chunk/detail"
import RollupScan from "@/pages/rollup/index"
import Sessions from "@/pages/sessions"
import SessionsRestricted from "@/pages/sessions-restricted"
import SessionsTerms from "@/pages/sessions-terms"
import StickerVote from "@/pages/sticker-vote"
import StickerWinners from "@/pages/sticker-winners"
Expand Down Expand Up @@ -224,6 +225,11 @@ const mainnetRoutes = [
path: "/sessions-terms-of-use",
element: <SessionsTerms />,
},
{
name: "Scroll Sessions Restricted",
path: "/sessions-restricted",
element: <SessionsRestricted />,
},
]

const routes = isSepolia ? sepoliaRoutes : mainnetRoutes
Expand Down

0 comments on commit 13d6355

Please sign in to comment.