Skip to content

Commit f7ffc29

Browse files
authored
Merge pull request #1497 from scroll-tech/sepolia
Merge pull request #1496
2 parents 5f6cea8 + e22317b commit f7ffc29

File tree

5 files changed

+9
-10
lines changed

5 files changed

+9
-10
lines changed

src/app/blog/[blogId]/detail.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ const BlogDetail = props => {
6161
const blogsWithLang = useMemo(() => filterBlogsByLanguage(blogSource, language), [blogSource, language])
6262

6363
useEffect(() => {
64+
// TODO: no _lang_ in blogId
6465
async function fetchCurrentBlog() {
6566
const regex = /([^_]*?)_lang_[^_]+/g
6667
const blogIdMatch = blogId?.match(regex)

src/app/blog/page.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import ArticleCard from "@/components/ArticleCard"
1313
import SectionWrapper from "@/components/SectionWrapper"
1414
import { LANGUAGE_MAP, getBlogCategoryList, getBlogSortList } from "@/constants"
1515
import useCheckViewport from "@/hooks/useCheckViewport"
16-
import useUserLanguage from "@/hooks/useUserLanguage"
1716
import { filterBlogsByLanguage } from "@/utils"
1817

1918
const BlogContainer = styled(Box)(({ theme }) => ({
@@ -165,7 +164,7 @@ const BlogList = styled("ul")(({ theme }) => ({
165164
const Blog = () => {
166165
const searchParams = useSearchParams()
167166
const { isDesktop } = useCheckViewport()
168-
const [language] = useUserLanguage()
167+
const language = "en"
169168
const BLOG_CATEGORY_LIST = useMemo(() => getBlogCategoryList(language), [language])
170169
const BLOG_SORT_LIST = useMemo(() => getBlogSortList(language), [language])
171170
const BLOG_COPY = useMemo(() => LANGUAGE_MAP[language], [language])

src/components/Header/NavbarItem.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,18 @@ const NavbarItem = props => {
2020
display: "flex",
2121
alignItems: "center",
2222
"&:hover": {
23-
// WebkitTextStroke: "0.2px var(--mui-palette-primary-main)",
24-
fontWeight: 500,
2523
color: "primary.main",
2624
},
25+
"&:hover .navbar-label": {
26+
WebkitTextStroke: "0.4px var(--mui-palette-primary-main)",
27+
},
2728
"&.active": {
28-
// WebkitTextStroke: "0.4px var(--mui-palette-primary-main)",
2929
fontWeight: 600,
3030
color: "primary.main",
3131
},
32+
"&.active .navbar-label": {
33+
WebkitTextStroke: "unset",
34+
},
3235
}}
3336
{...restProps}
3437
>

src/components/Header/desktop_header.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import React, { useState } from "react"
33

44
import { Box, Container, Fade, Paper, Popper, Stack } from "@mui/material"
55

6-
import LanguageSelect from "@/components/LanguageSelect"
76
import ScrollLink from "@/components/Link"
87
import Logo from "@/components/ScrollLogo"
98
import WalletToolkit from "@/components/WalletToolkit"
@@ -61,7 +60,7 @@ const DesktopHeader = ({ currentMenu }) => {
6160
onMouseEnter={e => handleMouseEnter(e, item.key)}
6261
onMouseLeave={handleMouseLeave}
6362
>
64-
{item.label}
63+
<span className="navbar-label">{item.label}</span>
6564
{item.key === hoveringNavbarItemKey && (
6665
<Popper
6766
open={true}
@@ -170,7 +169,6 @@ const DesktopHeader = ({ currentMenu }) => {
170169
<Stack direction="row" spacing={["0.8rem"]} sx={{ justifySelf: "flex-end" }} alignItems="center">
171170
{!isSepolia && <GasPriceViewer></GasPriceViewer>}
172171
{showWalletConnector && <WalletToolkit dark={dark}></WalletToolkit>}
173-
{showLanguageSelect && <LanguageSelect></LanguageSelect>}
174172
</Stack>
175173
</Box>
176174
</Container>

src/components/Header/mobile_header.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { Fragment, useEffect, useLayoutEffect, useState } from "react"
44
import { Box, Collapse, List, Stack } from "@mui/material"
55
import { styled } from "@mui/system"
66

7-
import LanguageSelect from "@/components/LanguageSelect"
87
import Link from "@/components/Link"
98
import WalletToolkit from "@/components/WalletToolkit"
109
import useShowLanguageSelect from "@/hooks/useShowLanguageSelect"
@@ -144,7 +143,6 @@ const MobileHeader = ({ currentMenu }) => {
144143
</Link>
145144
<Stack direction="row" spacing="1.6rem" alignItems="center">
146145
{showWalletConnector && <WalletToolkit dark={dark}></WalletToolkit>}
147-
{showLanguageSelect && <LanguageSelect></LanguageSelect>}
148146

149147
<Box
150148
sx={{

0 commit comments

Comments
 (0)