From 5429fafebe72578650e1352091e5e9116149e34e Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Sun, 27 Oct 2024 16:37:21 +0100
Subject: [PATCH] style(topbar): don't show '.eth'/'.sol' for every address

---
 src/components/topbar/topbar.tsx         | 9 ++++++---
 src/views/home/boards-box/boards-box.tsx | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/topbar/topbar.tsx b/src/components/topbar/topbar.tsx
index f2fa6a39..21996c2b 100644
--- a/src/components/topbar/topbar.tsx
+++ b/src/components/topbar/topbar.tsx
@@ -1,5 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { useAccountComment } from '@plebbit/plebbit-react-hooks';
+import Plebbit from '@plebbit/plebbit-js/dist/browser/index.js';
 import { Link, useLocation, useNavigate, useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { isAllView, isCatalogView, isSubscriptionsView } from '../../lib/utils/view-utils';
@@ -70,7 +71,9 @@ const TopBarDesktop = () => {
         {subplebbits.map((sub: any, index: any) => (
           <span key={index}>
             {index === 0 ? null : ' '}
-            <Link to={`/p/${sub.address}${isInCatalogView ? '/catalog' : ''}`}>{sub.address.includes('.') ? sub.address : sub.address.slice(0, 10).concat('...')}</Link>
+            <Link to={`/p/${sub.address}${isInCatalogView ? '/catalog' : ''}`}>
+              {sub.address.endsWith('.eth') || sub.address.endsWith('.sol') ? sub.address.slice(0, -4) : sub.address.slice(0, 10).concat('...')}
+            </Link>
             {index !== subplebbits.length - 1 ? ' /' : null}
           </span>
         ))}
@@ -138,10 +141,10 @@ const TopBarMobile = ({ subplebbitAddress }: { subplebbitAddress: string }) => {
       <option value='all'>all</option>
       <option value='subscriptions'>subscriptions</option>
       {subplebbitAddresses.map((address: any, index: number) => {
-        const subplebbitAddress = address?.includes('.') ? address : address?.slice(0, 10).concat('...');
+        const subplebbitAddress = address?.includes('.') ? address : Plebbit.getShortAddress(address);
         return (
           <option key={index} value={address}>
-            {subplebbitAddress}
+            {subplebbitAddress.endsWith('.eth') || subplebbitAddress.endsWith('.sol') ? subplebbitAddress.slice(0, -4) : subplebbitAddress}
           </option>
         );
       })}
diff --git a/src/views/home/boards-box/boards-box.tsx b/src/views/home/boards-box/boards-box.tsx
index a02d18f7..9b108dc2 100644
--- a/src/views/home/boards-box/boards-box.tsx
+++ b/src/views/home/boards-box/boards-box.tsx
@@ -22,7 +22,7 @@ const Board = ({ subplebbit, subplebbits, useCatalog }: { subplebbit: Subplebbit
   return (
     <div className={styles.subplebbit} key={address}>
       {(isOffline || isOnlineStatusLoading) && <span className={`${styles.offlineIcon} ${offlineIconClass}`} title={offlineTitle} />}
-      <Link to={boardLink}>{title || address}</Link>
+      <Link to={boardLink}>{title || (address.endsWith('.eth') || address.endsWith('.sol') ? address.slice(0, -4) : address && Plebbit.getShortAddress(address))}</Link>
       {nsfwTag && <span className={styles.nsfw}> ({t(nsfwTag)})</span>}
     </div>
   );