From dbd2f348fbcf7009f6e0abacb7eb30423e32adf7 Mon Sep 17 00:00:00 2001
From: "plebeius.eth" <mottoes_recap0u@icloud.com>
Date: Thu, 18 Jan 2024 21:07:16 +0100
Subject: [PATCH] fix(topbar): subscriptions were showing in default sub list

---
 package.json                       |  6 +++---
 src/components/sidebar/sidebar.tsx |  2 +-
 src/components/topbar/topbar.tsx   | 10 +++++-----
 yarn.lock                          |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 2178f056..fe6750e3 100644
--- a/package.json
+++ b/package.json
@@ -27,12 +27,12 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-i18next": "13.2.2",
-    "react-markdown": "^9.0.1",
+    "react-markdown": "9.0.1",
     "react-router-dom": "6.16.0",
     "react-scripts": "5.0.1",
     "react-virtuoso": "4.6.0",
-    "rehype-sanitize": "^6.0.0",
-    "remark-gfm": "^4.0.0",
+    "rehype-sanitize": "6.0.0",
+    "remark-gfm": "4.0.0",
     "tcp-port-used": "1.0.2",
     "typescript": "5.2.2",
     "zustand": "4.4.3"
diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
index 1778c9de..ddc366d4 100644
--- a/src/components/sidebar/sidebar.tsx
+++ b/src/components/sidebar/sidebar.tsx
@@ -204,7 +204,7 @@ const Sidebar = ({ address, cid, createdAt, description, downvoteCount = 0, role
       {roles && <ModeratorsList roles={roles} />}
       <div className={styles.footer}>
         <ul>
-          <li className={styles.footerTitle}>about</li>
+          <li className={styles.footerTitle}>{t('about')}</li>
           <li>
             <a href='https://plebbit.com' target='_blank' rel='noopener noreferrer'>
               plebbit
diff --git a/src/components/topbar/topbar.tsx b/src/components/topbar/topbar.tsx
index dbcc7ed4..123d37b3 100644
--- a/src/components/topbar/topbar.tsx
+++ b/src/components/topbar/topbar.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { useAccount } from '@plebbit/plebbit-react-hooks';
 import { getShortAddress } from '@plebbit/plebbit-js';
 import styles from './topbar.module.css';
-import { SubplebbitWithDisplay, useDefaultAndSubscriptionsSubplebbits } from '../../lib/utils/addresses-utils';
+import { SubplebbitWithDisplay, useDefaultSubplebbitAddresses } from '../../lib/utils/addresses-utils';
 import useTimeFilter from '../../hooks/use-time-filter';
 import { isAllView, isHomeView, isSubplebbitView } from '../../lib/utils/view-utils';
 
@@ -12,7 +12,7 @@ const sortTypes = ['hot', 'new', 'active', 'controversialAll', 'topAll'];
 
 const TopBar = () => {
   const account = useAccount();
-  const subplebbitAddresses = useDefaultAndSubscriptionsSubplebbits();
+  const subplebbitAddresses = useDefaultSubplebbitAddresses();
   const { t } = useTranslation();
   const location = useLocation();
   const params = useParams();
@@ -155,11 +155,11 @@ const TopBar = () => {
               </Link>
             </li>
             <span className={styles.separator}> | </span>
-            {subplebbitAddresses?.map((subplebbit: SubplebbitWithDisplay, index) => (
+            {subplebbitAddresses?.map((address, index) => (
               <li key={index}>
                 {index !== 0 && <span className={styles.separator}>-</span>}
-                <Link to={`/p/${subplebbit.address}`} className={params.subplebbitAddress === subplebbit.address ? styles.selected : styles.choice}>
-                  {subplebbit.displayAddress}
+                <Link to={`/p/${address}`} className={params.subplebbitAddress === address ? styles.selected : styles.choice}>
+                  {address}
                 </Link>
               </li>
             ))}
diff --git a/yarn.lock b/yarn.lock
index 9b3165dd..bff2f365 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -13248,7 +13248,7 @@ react-is@^18.0.0:
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.2.0.tgz#199431eeaaa2e09f86427efbb4f1473edb47609b"
   integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==
 
-react-markdown@^9.0.1:
+react-markdown@9.0.1:
   version "9.0.1"
   resolved "https://registry.yarnpkg.com/react-markdown/-/react-markdown-9.0.1.tgz#c05ddbff67fd3b3f839f8c648e6fb35d022397d1"
   integrity sha512-186Gw/vF1uRkydbsOIkcGXw7aHq0sZOCRFFjGrr7b9+nVZg4UfA4enXCaxm4fUzecU38sWfrNDitGhshuU7rdg==
@@ -13567,7 +13567,7 @@ regjsparser@^0.9.1:
   dependencies:
     jsesc "~0.5.0"
 
-rehype-sanitize@^6.0.0:
+rehype-sanitize@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/rehype-sanitize/-/rehype-sanitize-6.0.0.tgz#16e95f4a67a69cbf0f79e113c8e0df48203db73c"
   integrity sha512-CsnhKNsyI8Tub6L4sm5ZFsme4puGfc6pYylvXo1AeqaGbjOYyzNv3qZPwvs0oMJ39eryyeOdmxwUIo94IpEhqg==
@@ -13580,7 +13580,7 @@ relateurl@^0.2.7:
   resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
   integrity sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==
 
-remark-gfm@^4.0.0:
+remark-gfm@4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/remark-gfm/-/remark-gfm-4.0.0.tgz#aea777f0744701aa288b67d28c43565c7e8c35de"
   integrity sha512-U92vJgBPkbw4Zfu/IiW2oTZLSL3Zpv+uI7My2eq8JxKgqraFdU8YUGicEJCEgSbeaG+QDFqIcwwfMTOEelPxuA==