Skip to content

Commit

Permalink
Merge pull request #1148 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 27, 2024
2 parents c5a6771 + 47207ef commit 893d639
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 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.110",
"version": "5.0.111",
"private": false,
"license": "MIT",
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions src/pages/sessions-one/SessionOneMarks/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const SessionOneMarks = () => {
id={SESSIONS_ONE_DEX}
icon={SESSIONS_SECTION_MAP[SESSIONS_ONE_DEX].icon}
title={SESSIONS_SECTION_MAP[SESSIONS_ONE_DEX].label}
description="Marks are rewarded to users who deposit eligible assets into selected DEXs’ liquidity pools. Liquidity deposits with tighter ranges or more market depth are awarded Marks at a higher rate. "
description="Marks are given to users who deposit eligible assets into selected DEXs’ liquidity pools. Liquidity deposits with tighter ranges or more market depth are given Marks at a higher rate. "
data={marks?.dex}
isLoading={isLoading}
></MarkList>
Expand All @@ -58,7 +58,7 @@ const SessionOneMarks = () => {
id={SESSIONS_ONE_LENDING}
icon={SESSIONS_SECTION_MAP[SESSIONS_ONE_LENDING].icon}
title={SESSIONS_SECTION_MAP[SESSIONS_ONE_LENDING].label}
description="Marks are rewarded to users who deposit eligible assets into selected lending markets. Marks are not rewarded for recursive supplying/borrowing."
description="Marks are given to users who deposit eligible assets into selected lending markets. Marks are not given for recursive supplying/borrowing."
data={marks?.lending}
isLoading={isLoading}
></MarkList>
Expand All @@ -68,7 +68,7 @@ const SessionOneMarks = () => {
id={SESSIONS_ONE_ACTIVITIES}
icon={SESSIONS_SECTION_MAP[SESSIONS_ONE_ACTIVITIES].icon}
title={SESSIONS_SECTION_MAP[SESSIONS_ONE_ACTIVITIES].label}
description="Marks are rewarded to users who participate in Scroll native projects."
description="Marks are given to users who participate in Scroll native projects."
data={projectList?.activities}
isLoading={isLoading}
></MarkList> */}
Expand Down
4 changes: 2 additions & 2 deletions src/pages/sessions-one/SessionZeroMarks/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const BridgePoints = () => {
type={MarksType.ELIGIBLE_ASSETS}
icon={SESSIONS_SECTION_MAP[SESSIONS_ZERO_ASSETS].icon}
title={SESSIONS_SECTION_MAP[SESSIONS_ZERO_ASSETS].label}
description="Marks are rewarded to all eligible bridged assets since Scroll's mainnet launch on October 10th, 2023, based on amount and time held on Scroll."
description="Marks are given to all eligible bridged assets since Scroll's mainnet launch on October 10th, 2023, based on amount and time held on Scroll."
data={marks?.tokensMarks}
isLoading={isLoading}
></MarkList>
Expand All @@ -89,7 +89,7 @@ const BridgePoints = () => {
type={MarksType.GAS_SPENT}
icon={SESSIONS_SECTION_MAP[SESSIONS_ZERO_GAS].icon}
title={SESSIONS_SECTION_MAP[SESSIONS_ZERO_GAS].label}
description="Marks have been awarded to users with more than $5 total gas spent on Scroll from the mainnet launch on Oct 10th, 2023 to Apr 29th, 2024 12pm UTC."
description="Marks have been given to users with more than $5 total gas spent on Scroll from the mainnet launch on Oct 10th, 2023 to Apr 29th, 2024 12pm UTC."
data={marks?.gasMarks}
isLoading={isLoading}
></MarkList>
Expand Down
2 changes: 1 addition & 1 deletion src/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ const mainnetRoutes = [
name: "Scroll Sessions",
path: "/sessions",
element: <Sessions />,
description: "Get rewarded for your engagement with Scroll Marks! Join Sessions now!",
description: "Receive Marks for your engagement with Scroll. Join Sessions now!",
},
{
name: "Scroll Sessions Terms of Use",
Expand Down

0 comments on commit 893d639

Please sign in to comment.