Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/app/blog/[blogId]/detail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ const BlogDetail = props => {
const blogsWithLang = useMemo(() => filterBlogsByLanguage(blogSource, language), [blogSource, language])

useEffect(() => {
// TODO: no _lang_ in blogId
async function fetchCurrentBlog() {
const regex = /([^_]*?)_lang_[^_]+/g
const blogIdMatch = blogId?.match(regex)
Expand Down
3 changes: 1 addition & 2 deletions src/app/blog/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import ArticleCard from "@/components/ArticleCard"
import SectionWrapper from "@/components/SectionWrapper"
import { LANGUAGE_MAP, getBlogCategoryList, getBlogSortList } from "@/constants"
import useCheckViewport from "@/hooks/useCheckViewport"
import useUserLanguage from "@/hooks/useUserLanguage"
import { filterBlogsByLanguage } from "@/utils"

const BlogContainer = styled(Box)(({ theme }) => ({
Expand Down Expand Up @@ -165,7 +164,7 @@ const BlogList = styled("ul")(({ theme }) => ({
const Blog = () => {
const searchParams = useSearchParams()
const { isDesktop } = useCheckViewport()
const [language] = useUserLanguage()
const language = "en"
const BLOG_CATEGORY_LIST = useMemo(() => getBlogCategoryList(language), [language])
const BLOG_SORT_LIST = useMemo(() => getBlogSortList(language), [language])
const BLOG_COPY = useMemo(() => LANGUAGE_MAP[language], [language])
Expand Down
9 changes: 6 additions & 3 deletions src/components/Header/NavbarItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,18 @@ const NavbarItem = props => {
display: "flex",
alignItems: "center",
"&:hover": {
// WebkitTextStroke: "0.2px var(--mui-palette-primary-main)",
fontWeight: 500,
color: "primary.main",
},
"&:hover .navbar-label": {
WebkitTextStroke: "0.4px var(--mui-palette-primary-main)",
},
"&.active": {
// WebkitTextStroke: "0.4px var(--mui-palette-primary-main)",
fontWeight: 600,
color: "primary.main",
},
"&.active .navbar-label": {
WebkitTextStroke: "unset",
},
}}
{...restProps}
>
Expand Down
4 changes: 1 addition & 3 deletions src/components/Header/desktop_header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import React, { useState } from "react"

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

import LanguageSelect from "@/components/LanguageSelect"
import ScrollLink from "@/components/Link"
import Logo from "@/components/ScrollLogo"
import WalletToolkit from "@/components/WalletToolkit"
Expand Down Expand Up @@ -61,7 +60,7 @@ const DesktopHeader = ({ currentMenu }) => {
onMouseEnter={e => handleMouseEnter(e, item.key)}
onMouseLeave={handleMouseLeave}
>
{item.label}
<span className="navbar-label">{item.label}</span>
{item.key === hoveringNavbarItemKey && (
<Popper
open={true}
Expand Down Expand Up @@ -170,7 +169,6 @@ const DesktopHeader = ({ currentMenu }) => {
<Stack direction="row" spacing={["0.8rem"]} sx={{ justifySelf: "flex-end" }} alignItems="center">
{!isSepolia && <GasPriceViewer></GasPriceViewer>}
{showWalletConnector && <WalletToolkit dark={dark}></WalletToolkit>}
{showLanguageSelect && <LanguageSelect></LanguageSelect>}
</Stack>
</Box>
</Container>
Expand Down
2 changes: 0 additions & 2 deletions src/components/Header/mobile_header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Fragment, useEffect, useLayoutEffect, useState } from "react"
import { Box, Collapse, List, Stack } from "@mui/material"
import { styled } from "@mui/system"

import LanguageSelect from "@/components/LanguageSelect"
import Link from "@/components/Link"
import WalletToolkit from "@/components/WalletToolkit"
import useShowLanguageSelect from "@/hooks/useShowLanguageSelect"
Expand Down Expand Up @@ -144,7 +143,6 @@ const MobileHeader = ({ currentMenu }) => {
</Link>
<Stack direction="row" spacing="1.6rem" alignItems="center">
{showWalletConnector && <WalletToolkit dark={dark}></WalletToolkit>}
{showLanguageSelect && <LanguageSelect></LanguageSelect>}

<Box
sx={{
Expand Down