From 9a569240862207b8d69c6d1fde90e2e25127ea62 Mon Sep 17 00:00:00 2001 From: "plebeius.eth" Date: Sat, 4 May 2024 21:33:25 +0200 Subject: [PATCH] revert use titles in board-nav --- src/components/board-nav/board-nav.tsx | 32 +++++++++++--------------- 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/src/components/board-nav/board-nav.tsx b/src/components/board-nav/board-nav.tsx index f5659669..21b75a69 100644 --- a/src/components/board-nav/board-nav.tsx +++ b/src/components/board-nav/board-nav.tsx @@ -3,14 +3,14 @@ import { Link, useLocation, useNavigate, useParams } from 'react-router-dom'; import { useTranslation } from 'react-i18next'; import { isCatalogView } from '../../lib/utils/view-utils'; import styles from './board-nav.module.css'; -import useDefaultSubplebbits, { MultisubSubplebbit } from '../../hooks/use-default-subplebbits'; +import { useDefaultSubplebbitAddresses } from '../../hooks/use-default-subplebbits'; interface BoardNavProps { - defaultSubplebbits: MultisubSubplebbit[]; + subplebbitAddresses: string[]; subplebbitAddress?: string; } -const BoardNavDesktop = ({ defaultSubplebbits }: BoardNavProps) => { +const BoardNavDesktop = ({ subplebbitAddresses }: BoardNavProps) => { const { t } = useTranslation(); const isInCatalogView = isCatalogView(useLocation().pathname, useParams()); @@ -18,14 +18,12 @@ const BoardNavDesktop = ({ defaultSubplebbits }: BoardNavProps) => {
[ - {defaultSubplebbits.map((subplebbit, index: number) => { - const { address, title } = subplebbit || {}; - const displayAddress = address.includes('.') ? address : address.slice(0, 10).concat('...'); + {subplebbitAddresses.map((address: string, index: number) => { return ( {index === 0 ? null : ' '} - {title || displayAddress} - {index !== defaultSubplebbits.length - 1 ? ' /' : null} + {address.includes('.') ? address : address.slice(0, 10).concat('...')} + {index !== subplebbitAddresses.length - 1 ? ' /' : null} ); })} @@ -38,13 +36,12 @@ const BoardNavDesktop = ({ defaultSubplebbits }: BoardNavProps) => { ); }; -const BoardNavMobile = ({ defaultSubplebbits, subplebbitAddress }: BoardNavProps) => { +const BoardNavMobile = ({ subplebbitAddresses, subplebbitAddress }: BoardNavProps) => { const { t } = useTranslation(); const navigate = useNavigate(); const displaySubplebbitAddress = subplebbitAddress && subplebbitAddress.length > 30 ? subplebbitAddress.slice(0, 30).concat('...') : subplebbitAddress; - const subplebbitAddresses = new Set(defaultSubplebbits.map((sub) => sub.address.toLowerCase())); - const currentSubplebbitIsInList = subplebbitAddress && subplebbitAddresses.has(subplebbitAddress.toLowerCase()); + const currentSubplebbitIsInList = subplebbitAddresses.some((address: string) => address === subplebbitAddress); const isInCatalogView = isCatalogView(useLocation().pathname, useParams()); @@ -53,12 +50,11 @@ const BoardNavMobile = ({ defaultSubplebbits, subplebbitAddress }: BoardNavProps {!currentSubplebbitIsInList && subplebbitAddress && } - {defaultSubplebbits.map((subplebbit, index) => { - const { address, title } = subplebbit || {}; - const displayAddress = address.includes('.') ? address : address.slice(0, 10).concat('...'); + {subplebbitAddresses.map((address: any, index: number) => { + const subplebbitAddress = address?.includes('.') ? address : address?.slice(0, 10).concat('...'); return ( ); })} @@ -126,7 +122,7 @@ if (!window.STICKY_MENU_SCROLL_LISTENER) { } const BoardNav = () => { - const defaultSubplebbits = useDefaultSubplebbits(); + const subplebbitAddresses = useDefaultSubplebbitAddresses(); const params = useParams(); const accountComment = useAccountComment({ commentIndex: params?.accountCommentIndex as any }); @@ -134,8 +130,8 @@ const BoardNav = () => { return ( <> - - + + ); };