From 4435ff120ba7011c50ccc6bb22e2b26fedd4e878 Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Tue, 11 Jun 2024 15:13:04 +0200
Subject: [PATCH] fix bugs

---
 .../board-buttons/board-buttons.tsx           | 34 ++++++++++++++++---
 src/components/catalog-row/catalog-row.tsx    |  2 +-
 src/lib/utils/view-utils.ts                   |  4 ++-
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/components/board-buttons/board-buttons.tsx b/src/components/board-buttons/board-buttons.tsx
index e4928b7e..8edccd0e 100644
--- a/src/components/board-buttons/board-buttons.tsx
+++ b/src/components/board-buttons/board-buttons.tsx
@@ -17,10 +17,22 @@ interface BoardButtonsProps {
 
 const CatalogButton = ({ address, isInAllView, isInSubscriptionsView }: BoardButtonsProps) => {
   const { t } = useTranslation();
-  const link = isInAllView ? `/p/all/catalog` : isInSubscriptionsView ? `/p/subscriptions/catalog` : `/p/${address}/catalog`;
+  const params = useParams();
+
+  const createCatalogLink = () => {
+    if (isInAllView) {
+      if (params?.timeFilterName) return `/p/all/catalog/${params.timeFilterName}`;
+      return `/p/all/catalog`;
+    } else if (isInSubscriptionsView) {
+      if (params?.timeFilterName) return `/p/subscriptions/catalog/${params.timeFilterName}`;
+      return `/p/subscriptions/catalog`;
+    }
+    return `/p/${address}/catalog`;
+  };
+
   return (
     <button className='button'>
-      <Link to={link}>{t('catalog')}</Link>
+      <Link to={createCatalogLink()}>{t('catalog')}</Link>
     </button>
   );
 };
@@ -38,10 +50,22 @@ const SubscribeButton = ({ address }: BoardButtonsProps) => {
 
 const ReturnButton = ({ address, isInAllView, isInSubscriptionsView }: BoardButtonsProps) => {
   const { t } = useTranslation();
-  const link = isInAllView ? `/p/all` : isInSubscriptionsView ? `/p/subscriptions` : `/p/${address}`;
+  const params = useParams();
+
+  const createReturnLink = () => {
+    if (isInAllView) {
+      if (params?.timeFilterName) return `/p/all/${params.timeFilterName}`;
+      return `/p/all`;
+    } else if (isInSubscriptionsView) {
+      if (params?.timeFilterName) return `/p/subscriptions/${params.timeFilterName}`;
+      return `/p/subscriptions`;
+    }
+    return `/p/${address}`;
+  };
+
   return (
     <button className='button'>
-      <Link to={link}>{t('return')}</Link>
+      <Link to={createReturnLink()}>{t('return')}</Link>
     </button>
   );
 };
@@ -66,7 +90,7 @@ const SortOptions = () => {
   };
   return (
     <>
-      {t('sort_by')}:&nbsp;
+      <span className='capitalize'>{t('sort_by')}</span>:&nbsp;
       <select value={sortType} onChange={handleSortChange}>
         <option value='active'>{t('bump_order')}</option>
         <option value='new'>{t('creation_date')}</option>
diff --git a/src/components/catalog-row/catalog-row.tsx b/src/components/catalog-row/catalog-row.tsx
index 05f102f2..e562ae7d 100644
--- a/src/components/catalog-row/catalog-row.tsx
+++ b/src/components/catalog-row/catalog-row.tsx
@@ -164,7 +164,7 @@ const CatalogPost = ({ post }: { post: Comment }) => {
   return (
     <>
       <div className={styles.post}>
-        <div onMouseOver={() => setHoveredCid(cid)} onMouseLeave={() => setHoveredCid(null)}>
+        <div onMouseOver={() => setHoveredCid(isDescription ? 'd' : isRules ? 'r' : cid)} onMouseLeave={() => setHoveredCid(null)}>
           {hasThumbnail ? (
             <Link to={postLink}>
               <div
diff --git a/src/lib/utils/view-utils.ts b/src/lib/utils/view-utils.ts
index 06424533..cd580663 100644
--- a/src/lib/utils/view-utils.ts
+++ b/src/lib/utils/view-utils.ts
@@ -20,11 +20,13 @@ export const isCatalogView = (pathname: string, params: ParamsType): boolean =>
   const decodedPathname = decodeURIComponent(pathname);
 
   return (
+    decodedPathname === `/p/${subplebbitAddress}/catalog` ||
     decodedPathname === `/p/${subplebbitAddress}/catalog/settings` ||
-    decodedPathname === `/p/all/catalog/settings` ||
     decodedPathname === `/p/all/catalog` ||
+    decodedPathname === `/p/all/catalog/settings` ||
     decodedPathname === `/p/all/catalog/${timeFilterName}` ||
     decodedPathname === `/p/subscriptions/catalog` ||
+    decodedPathname === `/p/subscriptions/catalog/settings` ||
     decodedPathname === `/p/subscriptions/catalog/${timeFilterName}`
   );
 };