From a31beee6318047e3bed5f02820468360e6b3db5c Mon Sep 17 00:00:00 2001 From: "Tom (plebeius.eth)" Date: Wed, 10 Jul 2024 17:42:38 +0200 Subject: [PATCH] fix(topbar): empty brackets would show for sub category if empty --- src/components/topbar/topbar.tsx | 75 +++++++++++++++++--------------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/src/components/topbar/topbar.tsx b/src/components/topbar/topbar.tsx index aa4a138d..f13a99f5 100644 --- a/src/components/topbar/topbar.tsx +++ b/src/components/topbar/topbar.tsx @@ -63,46 +63,49 @@ const TopBarDesktop = () => { const { plebbitSubs, interestsSubs, randomSubs, internationalSubs, projectsSubs } = categorizeSubplebbits(subplebbits); - const renderSubplebbits = (subplebbits: any) => { - return subplebbits.map((sub: any, index: any) => ( - - {index === 0 ? null : ' '} - {sub.address.includes('.') ? sub.address : sub.address.slice(0, 10).concat('...')} - {index !== subplebbits.length - 1 ? ' /' : null} - - )); - }; + const renderSubplebbits = (subplebbits: any) => + subplebbits.length > 0 && ( + <> + [ + {subplebbits.map((sub: any, index: any) => ( + + {index === 0 ? null : ' '} + {sub.address.includes('.') ? sub.address : sub.address.slice(0, 10).concat('...')} + {index !== subplebbits.length - 1 ? ' /' : null} + + ))} + ]{' '} + + ); return (
- [all / subscriptions]{' '} - {subplebbits && ( - <> - [{renderSubplebbits(plebbitSubs)}] [{renderSubplebbits(projectsSubs)}] [{renderSubplebbits(interestsSubs)}] [{renderSubplebbits(randomSubs)}] [ - {renderSubplebbits(internationalSubs)}] [ - { - e.preventDefault(); - alert('work in progress'); - }} - > - Create - - ] [ - { - e.preventDefault(); - alert('work in progress'); - }} - > - Vote - - ] - - )} + [all / subscriptions] {renderSubplebbits(plebbitSubs)} + {renderSubplebbits(projectsSubs)} + {renderSubplebbits(interestsSubs)} + {renderSubplebbits(randomSubs)} + {renderSubplebbits(internationalSubs)}[ + { + e.preventDefault(); + alert('work in progress'); + }} + > + Create + + ] [ + { + e.preventDefault(); + alert('work in progress'); + }} + > + Vote + + ] [{t('settings')}] [