From dc3dddf410376874470c5e897189f67d280d1b44 Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Wed, 4 Dec 2024 17:10:50 +0100
Subject: [PATCH 01/11] fix(plebbit options): schema error prevented to save

---
 .../avatar-settings.module.css                |  4 --
 .../plebbit-options/plebbit-options.tsx       | 59 ++++++++++++++++---
 2 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/src/views/settings/avatar-settings/avatar-settings.module.css b/src/views/settings/avatar-settings/avatar-settings.module.css
index c83041b8..cb4838d7 100644
--- a/src/views/settings/avatar-settings/avatar-settings.module.css
+++ b/src/views/settings/avatar-settings/avatar-settings.module.css
@@ -82,10 +82,6 @@
   text-transform: lowercase;
 }
 
-.hideAvatarsCheckbox label {
-  cursor: pointer;
-}
-
 .hideAvatarsCheckbox input {
   margin-right: .5em;
 }
diff --git a/src/views/settings/plebbit-options/plebbit-options.tsx b/src/views/settings/plebbit-options/plebbit-options.tsx
index c38c4944..487f8b39 100644
--- a/src/views/settings/plebbit-options/plebbit-options.tsx
+++ b/src/views/settings/plebbit-options/plebbit-options.tsx
@@ -163,15 +163,40 @@ const PlebbitOptions = () => {
   const plebbitDataPathRef = useRef<HTMLInputElement>(null);
 
   const handleSave = async () => {
-    const ipfsGatewayUrls = ipfsGatewayUrlsRef.current?.value.split('\n').map((url) => url.trim());
+    const ipfsGatewayUrls = ipfsGatewayUrlsRef.current?.value
+      .split('\n')
+      .map((url) => url.trim())
+      .filter((url) => url !== '');
+
     const mediaIpfsGatewayUrl = mediaIpfsGatewayUrlRef.current?.value.trim();
-    const pubsubHttpClientsOptions = pubsubProvidersRef.current?.value.split('\n').map((url) => url.trim());
-    const ethRpcUrls = ethRpcRef.current?.value.split('\n').map((url) => url.trim());
-    const solRpcUrls = solRpcRef.current?.value.split('\n').map((url) => url.trim());
-    const maticRpcUrls = maticRpcRef.current?.value.split('\n').map((url) => url.trim());
-    const avaxRpcUrls = avaxRpcRef.current?.value.split('\n').map((url) => url.trim());
-    const plebbitRpcClientsOptions = plebbitRpcRef.current?.value.trim();
-    const dataPath = plebbitDataPathRef.current?.value.trim();
+
+    const pubsubHttpClientsOptions = pubsubProvidersRef.current?.value
+      .split('\n')
+      .map((url) => url.trim())
+      .filter((url) => url !== '');
+
+    const ethRpcUrls = ethRpcRef.current?.value
+      .split('\n')
+      .map((url) => url.trim())
+      .filter((url) => url !== '');
+
+    const solRpcUrls = solRpcRef.current?.value
+      .split('\n')
+      .map((url) => url.trim())
+      .filter((url) => url !== '');
+
+    const maticRpcUrls = maticRpcRef.current?.value
+      .split('\n')
+      .map((url) => url.trim())
+      .filter((url) => url !== '');
+
+    const avaxRpcUrls = avaxRpcRef.current?.value
+      .split('\n')
+      .map((url) => url.trim())
+      .filter((url) => url !== '');
+
+    const plebbitRpcClientsOptions = plebbitRpcRef.current?.value.trim() ? [plebbitRpcRef.current.value.trim()] : undefined;
+    const dataPath = plebbitDataPathRef.current?.value.trim() || undefined;
 
     const chainProviders = {
       eth: {
@@ -191,6 +216,21 @@ const PlebbitOptions = () => {
         chainId: 43114,
       },
     };
+    const accountToSave = {
+      ...account,
+      mediaIpfsGatewayUrl,
+      plebbitOptions: {
+        ...plebbitOptions,
+        ipfsGatewayUrls,
+        pubsubHttpClientsOptions,
+        chainProviders,
+        plebbitRpcClientsOptions,
+        dataPath,
+      },
+    };
+
+    console.log('existing account', account);
+    console.log('saving account', accountToSave);
 
     try {
       await setAccount({
@@ -205,7 +245,8 @@ const PlebbitOptions = () => {
           dataPath,
         },
       });
-      alert('Options saved.');
+      alert('Options saved, reloading...');
+      window.location.reload();
     } catch (e) {
       if (e instanceof Error) {
         alert('Error saving options: ' + e.message);

From cfe004cf07614f523fe5788d508bc23dc7218ef3 Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Wed, 4 Dec 2024 20:53:23 +0100
Subject: [PATCH 02/11] feat(settings): add http routers setting to plebbit
 options

---
 .../plebbit-options/plebbit-options.tsx       | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/views/settings/plebbit-options/plebbit-options.tsx b/src/views/settings/plebbit-options/plebbit-options.tsx
index 487f8b39..032d4308 100644
--- a/src/views/settings/plebbit-options/plebbit-options.tsx
+++ b/src/views/settings/plebbit-options/plebbit-options.tsx
@@ -12,6 +12,7 @@ interface SettingsProps {
   solRpcRef?: RefObject<HTMLTextAreaElement>;
   maticRpcRef?: RefObject<HTMLTextAreaElement>;
   avaxRpcRef?: RefObject<HTMLTextAreaElement>;
+  httpRoutersRef?: RefObject<HTMLTextAreaElement>;
   plebbitRpcRef?: RefObject<HTMLInputElement>;
   plebbitDataPathRef?: RefObject<HTMLInputElement>;
 }
@@ -68,6 +69,19 @@ const PubsubProvidersSettings = ({ pubsubProvidersRef }: SettingsProps) => {
   );
 };
 
+const HttpRoutersSettings = ({ httpRoutersRef }: SettingsProps) => {
+  const account = useAccount();
+  const { plebbitOptions } = account || {};
+  const { httpRoutersOptions } = plebbitOptions || {};
+  const httpRoutersDefaultValue = httpRoutersOptions?.join('\n');
+
+  return (
+    <div className={styles.httpRoutersSettings}>
+      <textarea defaultValue={httpRoutersDefaultValue} ref={httpRoutersRef} autoCorrect='off' autoComplete='off' spellCheck='false' rows={2} />
+    </div>
+  );
+};
+
 const BlockchainProvidersSettings = ({ ethRpcRef, solRpcRef, maticRpcRef, avaxRpcRef }: SettingsProps) => {
   const account = useAccount();
   const { plebbitOptions } = account || {};
@@ -159,6 +173,7 @@ const PlebbitOptions = () => {
   const solRpcRef = useRef<HTMLTextAreaElement>(null);
   const maticRpcRef = useRef<HTMLTextAreaElement>(null);
   const avaxRpcRef = useRef<HTMLTextAreaElement>(null);
+  const httpRoutersRef = useRef<HTMLTextAreaElement>(null);
   const plebbitRpcRef = useRef<HTMLInputElement>(null);
   const plebbitDataPathRef = useRef<HTMLInputElement>(null);
 
@@ -195,6 +210,11 @@ const PlebbitOptions = () => {
       .map((url) => url.trim())
       .filter((url) => url !== '');
 
+    const httpRoutersOptions = httpRoutersRef.current?.value
+      .split('\n')
+      .map((url) => url.trim())
+      .filter((url) => url !== '');
+
     const plebbitRpcClientsOptions = plebbitRpcRef.current?.value.trim() ? [plebbitRpcRef.current.value.trim()] : undefined;
     const dataPath = plebbitDataPathRef.current?.value.trim() || undefined;
 
@@ -216,21 +236,6 @@ const PlebbitOptions = () => {
         chainId: 43114,
       },
     };
-    const accountToSave = {
-      ...account,
-      mediaIpfsGatewayUrl,
-      plebbitOptions: {
-        ...plebbitOptions,
-        ipfsGatewayUrls,
-        pubsubHttpClientsOptions,
-        chainProviders,
-        plebbitRpcClientsOptions,
-        dataPath,
-      },
-    };
-
-    console.log('existing account', account);
-    console.log('saving account', accountToSave);
 
     try {
       await setAccount({
@@ -241,6 +246,7 @@ const PlebbitOptions = () => {
           ipfsGatewayUrls,
           pubsubHttpClientsOptions,
           chainProviders,
+          httpRoutersOptions,
           plebbitRpcClientsOptions,
           dataPath,
         },
@@ -271,6 +277,12 @@ const PlebbitOptions = () => {
           <PubsubProvidersSettings pubsubProvidersRef={pubsubProvidersRef} />
         </span>
       </div>
+      <div className={styles.category}>
+        <span className={styles.categoryTitle}>http routers</span>
+        <span className={styles.categorySettings}>
+          <HttpRoutersSettings httpRoutersRef={httpRoutersRef} />
+        </span>
+      </div>
       <div className={styles.category}>
         <span className={styles.categoryTitle}>blockchain providers</span>
         <span className={styles.categorySettings}>

From 580a5989df55c613e5a8f0c6cf2336ba230af298 Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Wed, 4 Dec 2024 21:17:25 +0100
Subject: [PATCH 03/11] fix(post page): loading text could cause horizontal
 scroll on mobile

---
 src/views/post-page/post-page.module.css | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/views/post-page/post-page.module.css b/src/views/post-page/post-page.module.css
index 9a9df228..9b823e7e 100644
--- a/src/views/post-page/post-page.module.css
+++ b/src/views/post-page/post-page.module.css
@@ -38,11 +38,6 @@
   margin-right: 15px;
 }
 
-.loadingString {
-  padding: 5px;
-  position: absolute;
-}
-
 .dropdown {
   display: inline;
   position: relative;
@@ -87,12 +82,13 @@
   margin-left: 3px;
 }
 
+.loadingString {
+  padding: 5px;
+}
+
 .stateString {
-  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  width: calc(100vw - 28px);
-  width: 100vw;
   color: var(--text-info);
   font-size: x-small;
 }

From 9f73a49822fe7c3808f241777913af45fba88f87 Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Wed, 4 Dec 2024 22:26:36 +0100
Subject: [PATCH 04/11] fix(settings): crypto address setting would show error
 for an already set address

---
 .../settings/address-settings/address-settings.tsx     | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/settings/address-settings/address-settings.tsx b/src/views/settings/address-settings/address-settings.tsx
index 904b1d3c..98dd90f7 100644
--- a/src/views/settings/address-settings/address-settings.tsx
+++ b/src/views/settings/address-settings/address-settings.tsx
@@ -8,7 +8,7 @@ const AddressSettings = () => {
   const account = useAccount();
 
   const [cryptoState, setCryptoState] = useState({
-    cryptoAddress: '',
+    cryptoAddress: account?.author?.shortAddress.includes('.') ? account.author.shortAddress : '',
     checkingCryptoAddress: false,
     showResolvingMessage: false,
     resolveString: t('crypto_address_verification'),
@@ -58,6 +58,12 @@ const AddressSettings = () => {
     if (!cryptoState.cryptoAddress || !cryptoState.cryptoAddress.includes('.')) {
       alert(t('enter_crypto_address'));
       return;
+    } else if (cryptoState.cryptoAddress === account?.author?.address) {
+      setSavedCryptoAddress(true);
+      setTimeout(() => {
+        setSavedCryptoAddress(false);
+      }, 2000);
+      return;
     } else if (resolvedAddress && resolvedAddress !== account?.signer?.address) {
       alert(t('crypto_address_not_yours'));
       return;
@@ -107,7 +113,7 @@ const AddressSettings = () => {
           <input
             type='text'
             placeholder='address.eth/.sol'
-            defaultValue={cryptoState.cryptoAddress || (account?.author?.shortAddress.includes('.') ? account.author.shortAddress : '')}
+            value={cryptoState.cryptoAddress}
             onChange={(e) => setCryptoState((prevState) => ({ ...prevState, cryptoAddress: e.target.value }))}
           />
           <button className={styles.infoButton} onClick={() => setShowCryptoAddressInfo(!showCryptoAddressInfo)}>

From ecf6a7b39da12442270d8de2fb4a27093fbb599c Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Thu, 5 Dec 2024 14:43:53 +0100
Subject: [PATCH 05/11] fix(feed): posts could change position causing
 displacement

---
 src/components/post/post.tsx        |  2 +-
 src/hooks/use-comment-media-info.ts | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/components/post/post.tsx b/src/components/post/post.tsx
index f054d590..f4174846 100644
--- a/src/components/post/post.tsx
+++ b/src/components/post/post.tsx
@@ -8,6 +8,7 @@ import { getHasThumbnail } from '../../lib/utils/media-utils';
 import { getPostScore } from '../../lib/utils/post-utils';
 import { getHostname } from '../../lib/utils/url-utils';
 import { getFormattedTimeAgo, formatLocalizedUTCTimestamp } from '../../lib/utils/time-utils';
+import { useCommentMediaInfo } from '../../hooks/use-comment-media-info';
 import CommentEditForm from '../comment-edit-form';
 import ExpandButton from './expand-button';
 import Expando from './expando';
@@ -17,7 +18,6 @@ import Thumbnail from './thumbnail';
 import useDownvote from '../../hooks/use-downvote';
 import useUpvote from '../../hooks/use-upvote';
 import _ from 'lodash';
-import { useCommentMediaInfo } from '../../hooks/use-comment-media-info';
 
 interface PostAuthorProps {
   authorAddress: string;
diff --git a/src/hooks/use-comment-media-info.ts b/src/hooks/use-comment-media-info.ts
index 711fa75e..db4f60dd 100644
--- a/src/hooks/use-comment-media-info.ts
+++ b/src/hooks/use-comment-media-info.ts
@@ -1,17 +1,26 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useLocation, useParams } from 'react-router-dom';
 import { Comment } from '@plebbit/plebbit-react-hooks';
 import { getCommentMediaInfo, fetchWebpageThumbnailIfNeeded } from '../lib/utils/media-utils';
+import { isPendingView, isPostView } from '../lib/utils/view-utils';
 
 export const useCommentMediaInfo = (comment: Comment) => {
+  const location = useLocation();
+  const params = useParams();
+  const isInPostView = isPostView(location.pathname, params);
+  const isInPendingView = isPendingView(location.pathname, params);
   // some sites have CORS access, so the thumbnail can be fetched client-side, which is helpful if subplebbit.settings.fetchThumbnailUrls is false
   const initialCommentMediaInfo = useMemo(() => getCommentMediaInfo(comment), [comment]);
   const [commentMediaInfo, setCommentMediaInfo] = useState(initialCommentMediaInfo);
   const fetchThumbnail = useCallback(async () => {
+    if (!isInPostView && !isInPendingView) {
+      return; // don't fetch in feed view, it displaces the posts
+    }
     if (initialCommentMediaInfo?.type === 'webpage' && !initialCommentMediaInfo.thumbnail) {
       const newMediaInfo = await fetchWebpageThumbnailIfNeeded(initialCommentMediaInfo);
       setCommentMediaInfo(newMediaInfo);
     }
-  }, [initialCommentMediaInfo]);
+  }, [initialCommentMediaInfo, isInPostView, isInPendingView]);
   useEffect(() => {
     fetchThumbnail();
   }, [fetchThumbnail]);

From 5dcfc8fecece68cc1ffbfd5394b98c28a466be9e Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Thu, 5 Dec 2024 14:49:39 +0100
Subject: [PATCH 06/11] rename variables

---
 src/components/header/header.tsx    | 31 +++++++++++++++--------------
 src/components/post/post.tsx        | 21 +++++++++----------
 src/components/reply/reply.tsx      |  8 ++++----
 src/components/sidebar/sidebar.tsx  | 14 ++++++-------
 src/hooks/use-comment-media-info.ts | 10 +++++-----
 src/lib/utils/view-utils.ts         |  4 ++--
 src/views/post-page/post-page.tsx   |  6 +++---
 7 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/src/components/header/header.tsx b/src/components/header/header.tsx
index 96bf87ec..e249cd44 100644
--- a/src/components/header/header.tsx
+++ b/src/components/header/header.tsx
@@ -15,8 +15,8 @@ import {
   isHomeAboutView,
   isHomeView,
   isInboxView,
-  isPendingView,
-  isPostView,
+  isPendingPostView,
+  isPostPageView,
   isProfileView,
   isProfileCommentsView,
   isProfileDownvotedView,
@@ -62,11 +62,11 @@ const CommentsButton = () => {
   const { t } = useTranslation();
   const params = useParams();
   const location = useLocation();
-  const isInPostView = isPostView(location.pathname, params);
+  const isInPostPageView = isPostPageView(location.pathname, params);
   const isInHomeAboutView = isHomeAboutView(location.pathname);
 
   return (
-    <li className={isInPostView && !isInHomeAboutView ? styles.selected : styles.choice}>
+    <li className={isInPostPageView && !isInHomeAboutView ? styles.selected : styles.choice}>
       <Link to={`/p/${params.subplebbitAddress}/c/${params.commentCid}`}>{t('comments')}</Link>
     </li>
   );
@@ -242,8 +242,8 @@ const HeaderTabs = () => {
   const isInHomeAboutView = isHomeAboutView(location.pathname);
   const isInHomeView = isHomeView(location.pathname);
   const isInInboxView = isInboxView(location.pathname);
-  const isInPendingView = isPendingView(location.pathname, params);
-  const isInPostView = isPostView(location.pathname, params);
+  const isInPendingPostView = isPendingPostView(location.pathname, params);
+  const isInPostPageView = isPostPageView(location.pathname, params);
   const isInProfileView = isProfileView(location.pathname);
   const isInSubplebbitView = isSubplebbitView(location.pathname, params);
   const isInSubplebbitSettingsView = isSubplebbitSettingsView(location.pathname, params);
@@ -253,13 +253,13 @@ const HeaderTabs = () => {
   const isInSettingsView = isSettingsView(location.pathname);
   const isInSettingsPlebbitOptionsView = isSettingsPlebbitOptionsView(location.pathname);
 
-  if (isInPostView) {
+  if (isInPostPageView) {
     return <CommentsButton />;
   } else if (isInHomeView || isInHomeAboutView || (isInSubplebbitView && !isInSubplebbitSubmitView && !isInSubplebbitSettingsView) || isInAllView) {
     return <SortItems />;
-  } else if ((isInProfileView || isInAuthorView) && !isInPendingView) {
+  } else if ((isInProfileView || isInAuthorView) && !isInPendingPostView) {
     return <AuthorHeaderTabs />;
-  } else if (isInPendingView) {
+  } else if (isInPendingPostView) {
     return <span className={styles.pageName}>{t('pending')}</span>;
   } else if (isInInboxView) {
     return <InboxHeaderTabs />;
@@ -279,7 +279,7 @@ const HeaderTitle = ({ title, shortAddress }: { title: string; shortAddress: str
   const isInAllView = isAllView(location.pathname);
   const isInAuthorView = isAuthorView(location.pathname);
   const isInInboxView = isInboxView(location.pathname);
-  const isInPostView = isPostView(location.pathname, params);
+  const isInPostPageView = isPostPageView(location.pathname, params);
   const isInProfileView = isProfileView(location.pathname);
   const isInSettingsView = isSettingsView(location.pathname);
   const isInSettingsPlebbitOptionsView = isSettingsPlebbitOptionsView(location.pathname);
@@ -302,7 +302,7 @@ const HeaderTitle = ({ title, shortAddress }: { title: string; shortAddress: str
         {subplebbitTitle}: {submitTitle}
       </>
     );
-  } else if (isInPostView || (isInSubplebbitView && !isInSubplebbitSettingsView)) {
+  } else if (isInPostPageView || (isInSubplebbitView && !isInSubplebbitSettingsView)) {
     return subplebbitTitle;
   } else if (isInSubplebbitSettingsView) {
     return (
@@ -346,7 +346,7 @@ const Header = () => {
   const isInHomeView = isHomeView(location.pathname);
   const isInHomeAboutView = isHomeAboutView(location.pathname);
   const isInInboxView = isInboxView(location.pathname);
-  const isInPostView = isPostView(location.pathname, params);
+  const isInPostPageView = isPostPageView(location.pathname, params);
   const isInProfileView = isProfileView(location.pathname);
   const isInSettingsView = isSettingsView(location.pathname);
   const isInSubplebbitView = isSubplebbitView(location.pathname, params);
@@ -356,11 +356,12 @@ const Header = () => {
   const isInSubplebbitSettingsView = isSubplebbitSettingsView(location.pathname, params);
   const isInNotFoundView = useNotFoundStore((state) => state.isNotFound);
 
-  const hasFewTabs = isInPostView || isInSubmitView || isInSubplebbitSubmitView || isInSubplebbitSettingsView || isInSettingsView || isInInboxView || isInSettingsView;
+  const hasFewTabs =
+    isInPostPageView || isInSubmitView || isInSubplebbitSubmitView || isInSubplebbitSettingsView || isInSettingsView || isInInboxView || isInSettingsView;
   const hasStickyHeader =
     isInHomeView ||
     isInNotFoundView ||
-    (isInSubplebbitView && !isInSubplebbitSubmitView && !isInSubplebbitSettingsView && !isInPostView && !isInHomeAboutView && !isInSubplebbitAboutView) ||
+    (isInSubplebbitView && !isInSubplebbitSubmitView && !isInSubplebbitSettingsView && !isInPostPageView && !isInHomeAboutView && !isInSubplebbitAboutView) ||
     (isInProfileView && !isInHomeAboutView) ||
     (isInAllView && !isInAllAboutView) ||
     (isInAuthorView && !isInHomeAboutView);
@@ -405,7 +406,7 @@ const Header = () => {
       {isMobile && !isInSubplebbitSubmitView && (
         <ul className={`${styles.tabMenu} ${isInProfileView ? styles.horizontalScroll : ''}`}>
           <HeaderTabs />
-          {(isInHomeView || isInHomeAboutView || isInSubplebbitView || isInHomeAboutView || isInAllView || isInPostView) && <AboutButton />}
+          {(isInHomeView || isInHomeAboutView || isInSubplebbitView || isInHomeAboutView || isInAllView || isInPostPageView) && <AboutButton />}
         </ul>
       )}
     </div>
diff --git a/src/components/post/post.tsx b/src/components/post/post.tsx
index f4174846..b07453d4 100644
--- a/src/components/post/post.tsx
+++ b/src/components/post/post.tsx
@@ -3,7 +3,7 @@ import styles from './post.module.css';
 import { Link, useLocation, useParams } from 'react-router-dom';
 import { Comment, useAuthorAddress, useBlock, useComment, useEditedComment, useSubplebbit, useSubscribe } from '@plebbit/plebbit-react-hooks';
 import { useTranslation } from 'react-i18next';
-import { isAllView, isPostView, isProfileHiddenView, isSubplebbitView } from '../../lib/utils/view-utils';
+import { isAllView, isPostPageView, isProfileHiddenView, isSubplebbitView } from '../../lib/utils/view-utils';
 import { getHasThumbnail } from '../../lib/utils/media-utils';
 import { getPostScore } from '../../lib/utils/post-utils';
 import { getHostname } from '../../lib/utils/url-utils';
@@ -117,13 +117,13 @@ const Post = ({ index, post = {} }: PostProps) => {
   const authorRole = subplebbit?.roles?.[post.author?.address]?.role;
 
   const isInAllView = isAllView(location.pathname);
-  const isInPostView = isPostView(location.pathname, params);
+  const isInPostPageView = isPostPageView(location.pathname, params);
   const isInProfileHiddenView = isProfileHiddenView(location.pathname);
   const isInSubplebbitView = isSubplebbitView(location.pathname, params);
 
   const commentMediaInfo = useCommentMediaInfo(post);
 
-  const [isExpanded, setIsExpanded] = useState(isInPostView);
+  const [isExpanded, setIsExpanded] = useState(isInPostPageView);
   const toggleExpanded = () => setIsExpanded(!isExpanded);
 
   const [isEditing, setIsEditing] = useState(false);
@@ -137,7 +137,7 @@ const Post = ({ index, post = {} }: PostProps) => {
 
   const hasThumbnail = getHasThumbnail(commentMediaInfo, link);
   const linkUrl = getHostname(link);
-  const linkClass = `${isInPostView ? (link ? styles.externalLink : styles.internalLink) : styles.link} ${pinned ? styles.pinnedLink : ''}`;
+  const linkClass = `${isInPostPageView ? (link ? styles.externalLink : styles.internalLink) : styles.link} ${pinned ? styles.pinnedLink : ''}`;
 
   const { blocked, unblock } = useBlock({ cid });
 
@@ -145,7 +145,7 @@ const Post = ({ index, post = {} }: PostProps) => {
   const { subscribe, subscribed } = useSubscribe({ subplebbitAddress });
 
   // show gray dotted border around last clicked post
-  const isLastClicked = sessionStorage.getItem('lastClickedPost') === cid && !isInPostView;
+  const isLastClicked = sessionStorage.getItem('lastClickedPost') === cid && !isInPostPageView;
   const handlePostClick = () => {
     if (cid) {
       if (sessionStorage.getItem('lastClickedPost') === cid) {
@@ -177,7 +177,7 @@ const Post = ({ index, post = {} }: PostProps) => {
                   <div className={`${styles.arrowCommon} ${downvoted ? styles.downvoted : styles.arrowDown}`} onClick={() => cid && downvote()} />
                 </div>
               </div>
-              {hasThumbnail && (!isInPostView || commentMediaInfo?.type === 'webpage') && !spoiler && (
+              {hasThumbnail && (!isInPostPageView || commentMediaInfo?.type === 'webpage') && !spoiler && (
                 <span className={removed ? styles.blur : ''}>
                   <Thumbnail
                     cid={cid}
@@ -193,8 +193,8 @@ const Post = ({ index, post = {} }: PostProps) => {
             </div>
             <div className={styles.entry}>
               <div className={styles.topMatter}>
-                <p className={`${styles.title} ${removed && !isInPostView ? styles.blur : ''}`}>
-                  {isInPostView && link ? (
+                <p className={`${styles.title} ${removed && !isInPostPageView ? styles.blur : ''}`}>
+                  {isInPostPageView && link ? (
                     <a href={link} className={linkClass} target='_blank' rel='noopener noreferrer' onClick={handlePostClick}>
                       {postTitle ?? '-'}
                     </a>
@@ -219,7 +219,7 @@ const Post = ({ index, post = {} }: PostProps) => {
                     </span>
                   )}
                 </p>
-                {!isInPostView && (!(commentMediaInfo?.type === 'webpage') || (commentMediaInfo?.type === 'webpage' && content?.trim().length > 0)) && (
+                {!isInPostPageView && (!(commentMediaInfo?.type === 'webpage') || (commentMediaInfo?.type === 'webpage' && content?.trim().length > 0)) && (
                   <ExpandButton
                     commentMediaInfo={commentMediaInfo}
                     content={content}
@@ -231,7 +231,8 @@ const Post = ({ index, post = {} }: PostProps) => {
                 )}
                 <div className={styles.tagline}>
                   {t('submitted')} <span title={postDate}>{getFormattedTimeAgo(timestamp)}</span>{' '}
-                  {edit && isInPostView && <span className={styles.timeEdit}>{t('last_edited', { timestamp: getFormattedTimeAgo(edit.timestamp) })}</span>} {t('post_by')}
+                  {edit && isInPostPageView && <span className={styles.timeEdit}>{t('last_edited', { timestamp: getFormattedTimeAgo(edit.timestamp) })}</span>}{' '}
+                  {t('post_by')}
                   <PostAuthor
                     authorAddress={author?.address}
                     authorRole={authorRole}
diff --git a/src/components/reply/reply.tsx b/src/components/reply/reply.tsx
index a5cbf44b..a0debfa2 100644
--- a/src/components/reply/reply.tsx
+++ b/src/components/reply/reply.tsx
@@ -20,7 +20,7 @@ import ReplyForm from '../reply-form';
 import useDownvote from '../../hooks/use-downvote';
 import useStateString from '../../hooks/use-state-string';
 import useUpvote from '../../hooks/use-upvote';
-import { isInboxView, isPostContextView, isPostView } from '../../lib/utils/view-utils';
+import { isInboxView, isPostContextView, isPostPageView } from '../../lib/utils/view-utils';
 import Plebbit from '@plebbit/plebbit-js/dist/browser/index.js';
 import Markdown from '../markdown';
 import { getHostname } from '../../lib/utils/url-utils';
@@ -283,7 +283,7 @@ const Reply = ({ cidOfReplyWithContext, depth = 0, isSingleComment, isSingleRepl
   const params = useParams();
   const isInInboxView = isInboxView(location.pathname);
   const isInPostContextView = isPostContextView(location.pathname, params, location.search);
-  const isInPostView = isPostView(location.pathname, params);
+  const isInPostPageView = isPostPageView(location.pathname, params);
 
   const authorRole = subplebbit?.roles?.[author?.address]?.role;
   const { shortAuthorAddress } = useAuthorAddress({ comment: reply });
@@ -324,10 +324,10 @@ const Reply = ({ cidOfReplyWithContext, depth = 0, isSingleComment, isSingleRepl
   const { blocked, unblock } = useBlock({ cid });
   const [collapsed, setCollapsed] = useState(blocked);
   useEffect(() => {
-    if (blocked || (isInPostView && (deleted || removed) && childrenCount === 0)) {
+    if (blocked || (isInPostPageView && (deleted || removed) && childrenCount === 0)) {
       setCollapsed(true);
     }
-  }, [blocked, isInPostView, deleted, removed, childrenCount]);
+  }, [blocked, isInPostPageView, deleted, removed, childrenCount]);
   const handleCollapseButton = () => {
     if (blocked) {
       unblock();
diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
index 51fde8fa..1eedff8f 100644
--- a/src/components/sidebar/sidebar.tsx
+++ b/src/components/sidebar/sidebar.tsx
@@ -12,8 +12,8 @@ import {
   isAllView,
   isHomeAboutView,
   isHomeView,
-  isPendingView,
-  isPostView,
+  isPendingPostView,
+  isPostPageView,
   isSubplebbitAboutView,
   isSubplebbitSettingsView,
   isSubplebbitsView,
@@ -219,8 +219,8 @@ const Sidebar = ({ comment, isSubCreatedButNotYetPublished, settings, subplebbit
   const isInAllView = isAllView(location.pathname);
   const isInHomeAboutView = isHomeAboutView(location.pathname);
   const isInHomeView = isHomeView(location.pathname);
-  const isInPendingView = isPendingView(location.pathname, params);
-  const isInPostView = isPostView(location.pathname, params);
+  const isInPendingPostView = isPendingPostView(location.pathname, params);
+  const isInPostPageView = isPostPageView(location.pathname, params);
   const isInSubplebbitsView = isSubplebbitsView(location.pathname);
   const isInSubplebbitAboutView = isSubplebbitAboutView(location.pathname, params);
 
@@ -229,7 +229,7 @@ const Sidebar = ({ comment, isSubCreatedButNotYetPublished, settings, subplebbit
   const subplebbitCreator = findSubplebbitCreator(roles);
   const creatorAddress = subplebbitCreator === 'anonymous' ? 'anonymous' : `${Plebbit.getShortAddress(subplebbitCreator)}`;
   const submitRoute =
-    isInHomeView || isInHomeAboutView || isInAllView ? '/submit' : isInPendingView ? `/p/${pendingPost?.subplebbitAddress}/submit` : `/p/${address}/submit`;
+    isInHomeView || isInHomeAboutView || isInAllView ? '/submit' : isInPendingPostView ? `/p/${pendingPost?.subplebbitAddress}/submit` : `/p/${address}/submit`;
 
   const { blocked, unblock, block } = useBlock({ address });
 
@@ -271,7 +271,7 @@ const Sidebar = ({ comment, isSubCreatedButNotYetPublished, settings, subplebbit
   return (
     <div className={`${isMobile ? styles.mobileSidebar : styles.sidebar}`}>
       <SearchBar />
-      {isInPostView && <PostInfo comment={comment} />}
+      {isInPostPageView && <PostInfo comment={comment} />}
       <Link to={submitRoute}>
         {/* TODO: add .largeButtonDisabled and disabledButtonDescription classnames for subs that don't accept posts */}
         <div className={styles.largeButton}>
@@ -279,7 +279,7 @@ const Sidebar = ({ comment, isSubCreatedButNotYetPublished, settings, subplebbit
           <div className={styles.nub} />
         </div>
       </Link>
-      {!isInHomeView && !isInHomeAboutView && !isInAllView && !isInPendingView && !isInSubplebbitsView && !isInHomeAboutView && (
+      {!isInHomeView && !isInHomeAboutView && !isInAllView && !isInPendingPostView && !isInSubplebbitsView && !isInHomeAboutView && (
         <div className={styles.titleBox}>
           <Link className={styles.title} to={`/p/${address}`}>
             {subplebbit?.address}
diff --git a/src/hooks/use-comment-media-info.ts b/src/hooks/use-comment-media-info.ts
index db4f60dd..1d2600c0 100644
--- a/src/hooks/use-comment-media-info.ts
+++ b/src/hooks/use-comment-media-info.ts
@@ -2,25 +2,25 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useLocation, useParams } from 'react-router-dom';
 import { Comment } from '@plebbit/plebbit-react-hooks';
 import { getCommentMediaInfo, fetchWebpageThumbnailIfNeeded } from '../lib/utils/media-utils';
-import { isPendingView, isPostView } from '../lib/utils/view-utils';
+import { isPendingPostView, isPostPageView } from '../lib/utils/view-utils';
 
 export const useCommentMediaInfo = (comment: Comment) => {
   const location = useLocation();
   const params = useParams();
-  const isInPostView = isPostView(location.pathname, params);
-  const isInPendingView = isPendingView(location.pathname, params);
+  const isInPostPageView = isPostPageView(location.pathname, params);
+  const isInPendingPostView = isPendingPostView(location.pathname, params);
   // some sites have CORS access, so the thumbnail can be fetched client-side, which is helpful if subplebbit.settings.fetchThumbnailUrls is false
   const initialCommentMediaInfo = useMemo(() => getCommentMediaInfo(comment), [comment]);
   const [commentMediaInfo, setCommentMediaInfo] = useState(initialCommentMediaInfo);
   const fetchThumbnail = useCallback(async () => {
-    if (!isInPostView && !isInPendingView) {
+    if (!isInPostPageView && !isInPendingPostView) {
       return; // don't fetch in feed view, it displaces the posts
     }
     if (initialCommentMediaInfo?.type === 'webpage' && !initialCommentMediaInfo.thumbnail) {
       const newMediaInfo = await fetchWebpageThumbnailIfNeeded(initialCommentMediaInfo);
       setCommentMediaInfo(newMediaInfo);
     }
-  }, [initialCommentMediaInfo, isInPostView, isInPendingView]);
+  }, [initialCommentMediaInfo, isInPostPageView, isInPendingPostView]);
   useEffect(() => {
     fetchThumbnail();
   }, [fetchThumbnail]);
diff --git a/src/lib/utils/view-utils.ts b/src/lib/utils/view-utils.ts
index 07073e54..898e0605 100644
--- a/src/lib/utils/view-utils.ts
+++ b/src/lib/utils/view-utils.ts
@@ -85,11 +85,11 @@ export const isInboxUnreadView = (pathname: string): boolean => {
   return pathname === `/inbox/unread`;
 };
 
-export const isPendingView = (pathname: string, params: ParamsType): boolean => {
+export const isPendingPostView = (pathname: string, params: ParamsType): boolean => {
   return pathname === `/profile/${params.accountCommentIndex}`;
 };
 
-export const isPostView = (pathname: string, params: ParamsType): boolean => {
+export const isPostPageView = (pathname: string, params: ParamsType): boolean => {
   // some subs might use emojis in their address, so we need to decode the pathname
   const decodedPathname = decodeURIComponent(pathname);
   return params.subplebbitAddress && params.commentCid ? decodedPathname.startsWith(`/p/${params.subplebbitAddress}/c/${params.commentCid}`) : false;
diff --git a/src/views/post-page/post-page.tsx b/src/views/post-page/post-page.tsx
index 98e38245..f8377629 100644
--- a/src/views/post-page/post-page.tsx
+++ b/src/views/post-page/post-page.tsx
@@ -10,7 +10,7 @@ import PostComponent from '../../components/post';
 import Sidebar from '../../components/sidebar';
 import useReplies from '../../hooks/use-replies';
 import useStateString from '../../hooks/use-state-string';
-import { isPendingView, isPostContextView } from '../../lib/utils/view-utils';
+import { isPendingPostView, isPostContextView } from '../../lib/utils/view-utils';
 import findTopParentCidOfReply from '../../lib/utils/cid-utils';
 import _ from 'lodash';
 
@@ -148,7 +148,7 @@ const PostWithContext = ({ post }: { post: Comment }) => {
 const PostPage = () => {
   const params = useParams();
   const location = useLocation();
-  const isInPendingView = isPendingView(location.pathname, params);
+  const isInPendingPostView = isPendingPostView(location.pathname, params);
   const isInPostContextView = isPostContextView(location.pathname, params, location.search);
 
   const post = useComment({ commentCid: params?.commentCid });
@@ -169,7 +169,7 @@ const PostPage = () => {
       <div className={styles.sidebar}>
         <Sidebar subplebbit={subplebbit} comment={post} />
       </div>
-      {isInPendingView && params?.accountCommentIndex ? (
+      {isInPendingPostView && params?.accountCommentIndex ? (
         <PendingPost commentIndex={+params?.accountCommentIndex || undefined} />
       ) : isInPostContextView ? (
         <PostWithContext post={post} />

From df74a8097d22ddd7d8c3785b3d0086ecb5ab5185 Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Thu, 5 Dec 2024 18:25:00 +0100
Subject: [PATCH 07/11] adjust padding

---
 src/views/pending-post/pending-post.module.css | 2 +-
 src/views/post-page/post-page.module.css       | 2 +-
 src/views/profile/profile.module.css           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/pending-post/pending-post.module.css b/src/views/pending-post/pending-post.module.css
index 87b36837..9e167eac 100644
--- a/src/views/pending-post/pending-post.module.css
+++ b/src/views/pending-post/pending-post.module.css
@@ -1,5 +1,5 @@
 .container {
-  padding: 7px 5px 0px 5px;
+  padding: 7px 5px 32px 5px;
 }
 
 .stateString {
diff --git a/src/views/post-page/post-page.module.css b/src/views/post-page/post-page.module.css
index 9b823e7e..5229e5b8 100644
--- a/src/views/post-page/post-page.module.css
+++ b/src/views/post-page/post-page.module.css
@@ -1,5 +1,5 @@
 .content {
-  padding: 7px 5px 0px 5px;
+  padding: 7px 5px 32px 5px;
 }
 
 .replyArea {
diff --git a/src/views/profile/profile.module.css b/src/views/profile/profile.module.css
index c0f95cf1..2dbc528d 100644
--- a/src/views/profile/profile.module.css
+++ b/src/views/profile/profile.module.css
@@ -1,5 +1,5 @@
 .content {
-  padding: 7px 5px 0px 5px;
+  padding: 7px 5px 32px 5px;
 }
 
 .infobar {

From 4263b44458d42bf7e3748d314d48923f67bdea2d Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Fri, 6 Dec 2024 12:50:19 +0100
Subject: [PATCH 08/11] fix(avatar settings): add timestamp field to let users
 add existing signature

---
 .../avatar-settings/avatar-settings.module.css       |  2 +-
 .../settings/avatar-settings/avatar-settings.tsx     | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/views/settings/avatar-settings/avatar-settings.module.css b/src/views/settings/avatar-settings/avatar-settings.module.css
index cb4838d7..4225999b 100644
--- a/src/views/settings/avatar-settings/avatar-settings.module.css
+++ b/src/views/settings/avatar-settings/avatar-settings.module.css
@@ -69,7 +69,7 @@
 }
 
 .copyMessage a {
-  color: var(--text-primary);
+  color: var(--link-primary);
 }
 
 .copyMessage a:hover {
diff --git a/src/views/settings/avatar-settings/avatar-settings.tsx b/src/views/settings/avatar-settings/avatar-settings.tsx
index 38155fca..730a030e 100644
--- a/src/views/settings/avatar-settings/avatar-settings.tsx
+++ b/src/views/settings/avatar-settings/avatar-settings.tsx
@@ -192,6 +192,18 @@ const AvatarSettings = () => {
               }}
             />
           </div>
+          <div className={styles.avatarSettingInput}>
+            <span className={styles.settingTitle}>{t('timestamp')}</span>
+            <input
+              type='text'
+              placeholder='Timestamp'
+              autoCorrect='off'
+              autoComplete='off'
+              spellCheck='false'
+              value={timestamp}
+              onChange={(e) => setTimestamp(Number(e.target.value))}
+            />
+          </div>
           <div className={styles.pasteSignature}>
             <span className={styles.settingTitle}>{t('paste_signature')}</span>
             <input

From 6e6d7cc8b7fb496e00087438a10ee96b4dbf2430 Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Fri, 6 Dec 2024 15:10:59 +0100
Subject: [PATCH 09/11] add "are you sure?" UI dialogs instead of using window
 alerts

---
 public/translations/ar/default.json           |  5 ++-
 public/translations/bn/default.json           |  5 ++-
 public/translations/cs/default.json           |  5 ++-
 public/translations/da/default.json           |  5 ++-
 public/translations/de/default.json           |  5 ++-
 public/translations/el/default.json           |  5 ++-
 public/translations/en/default.json           |  5 ++-
 public/translations/es/default.json           |  5 ++-
 public/translations/fa/default.json           |  5 ++-
 public/translations/fi/default.json           |  5 ++-
 public/translations/fil/default.json          |  5 ++-
 public/translations/fr/default.json           |  5 ++-
 public/translations/he/default.json           |  5 ++-
 public/translations/hi/default.json           |  5 ++-
 public/translations/hu/default.json           |  5 ++-
 public/translations/id/default.json           |  5 ++-
 public/translations/it/default.json           |  5 ++-
 public/translations/ja/default.json           |  5 ++-
 public/translations/ko/default.json           |  5 ++-
 public/translations/mr/default.json           |  5 ++-
 public/translations/nl/default.json           |  5 ++-
 public/translations/no/default.json           |  5 ++-
 public/translations/pl/default.json           |  5 ++-
 public/translations/pt/default.json           |  5 ++-
 public/translations/ro/default.json           |  5 ++-
 public/translations/ru/default.json           |  5 ++-
 public/translations/sq/default.json           |  5 ++-
 public/translations/sv/default.json           |  5 ++-
 public/translations/te/default.json           |  5 ++-
 public/translations/th/default.json           |  5 ++-
 public/translations/tr/default.json           |  5 ++-
 public/translations/uk/default.json           |  5 ++-
 public/translations/ur/default.json           |  5 ++-
 public/translations/vi/default.json           |  5 ++-
 public/translations/zh/default.json           |  5 ++-
 .../edit-menu/edit-menu.module.css            | 20 ++++++++-
 .../comment-tools/edit-menu/edit-menu.tsx     | 42 ++++++++++++++-----
 src/components/sidebar/sidebar.module.css     | 16 +++++++
 src/components/sidebar/sidebar.tsx            | 41 +++++++++++++-----
 src/themes.css                                |  2 +-
 40 files changed, 237 insertions(+), 59 deletions(-)

diff --git a/public/translations/ar/default.json b/public/translations/ar/default.json
index 6f05409a..ed9cb73b 100644
--- a/public/translations/ar/default.json
+++ b/public/translations/ar/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "المحفظة #{{index}}",
   "view_more": "عرض المزيد",
   "submit_community": "قدم مجتمعك",
-  "hide_avatars_from_replies": "إخفاء الصور الرمزية من الردود"
+  "hide_avatars_from_replies": "إخفاء الصور الرمزية من الردود",
+  "yes": "نعم",
+  "no": "لا",
+  "are_you_sure": "هل أنت متأكد؟"
 }
\ No newline at end of file
diff --git a/public/translations/bn/default.json b/public/translations/bn/default.json
index 2288db16..77643eda 100644
--- a/public/translations/bn/default.json
+++ b/public/translations/bn/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "ওয়ালেট #{{index}}",
   "view_more": "আরও দেখুন",
   "submit_community": "আপনার সম্প্রদায় জমা দিন",
-  "hide_avatars_from_replies": "প্রতিক্রিয়া থেকে অ্যাভাটারগুলি লুকান"
+  "hide_avatars_from_replies": "প্রতিক্রিয়া থেকে অ্যাভাটারগুলি লুকান",
+  "yes": "হ্যাঁ",
+  "no": "না",
+  "are_you_sure": "আপনি কি নিশ্চিত?"
 }
\ No newline at end of file
diff --git a/public/translations/cs/default.json b/public/translations/cs/default.json
index 949d7c59..dab9c9f5 100644
--- a/public/translations/cs/default.json
+++ b/public/translations/cs/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "peněženka #{{index}}",
   "view_more": "zobrazit více",
   "submit_community": "Odešlete svou komunitu",
-  "hide_avatars_from_replies": "Skrýt avatary v odpovědích"
+  "hide_avatars_from_replies": "Skrýt avatary v odpovědích",
+  "yes": "ano",
+  "no": "ne",
+  "are_you_sure": "Jste si jistí?"
 }
\ No newline at end of file
diff --git a/public/translations/da/default.json b/public/translations/da/default.json
index 2bb6b20c..520c7f1c 100644
--- a/public/translations/da/default.json
+++ b/public/translations/da/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "tegneboks #{{index}}",
   "view_more": "se mere",
   "submit_community": "Indsend dit fællesskab",
-  "hide_avatars_from_replies": "Skjul avatarer fra svar"
+  "hide_avatars_from_replies": "Skjul avatarer fra svar",
+  "yes": "ja",
+  "no": "nej",
+  "are_you_sure": "Er du sikker?"
 }
\ No newline at end of file
diff --git a/public/translations/de/default.json b/public/translations/de/default.json
index 372460ed..31cf1ab6 100644
--- a/public/translations/de/default.json
+++ b/public/translations/de/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "Wallet #{{index}}",
   "view_more": "mehr anzeigen",
   "submit_community": "Reichen Sie Ihre Gemeinschaft ein",
-  "hide_avatars_from_replies": "Avatare in Antworten ausblenden"
+  "hide_avatars_from_replies": "Avatare in Antworten ausblenden",
+  "yes": "ja",
+  "no": "nein",
+  "are_you_sure": "Bist du sicher?"
 }
\ No newline at end of file
diff --git a/public/translations/el/default.json b/public/translations/el/default.json
index 8a0bce05..5a4603ea 100644
--- a/public/translations/el/default.json
+++ b/public/translations/el/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "πορτοφόλι #{{index}}",
   "view_more": "δείτε περισσότερα",
   "submit_community": "Υποβάλετε την κοινότητά σας",
-  "hide_avatars_from_replies": "Απόκρυψη avatar από τις απαντήσεις"
+  "hide_avatars_from_replies": "Απόκρυψη avatar από τις απαντήσεις",
+  "yes": "ναι",
+  "no": "όχι",
+  "are_you_sure": "Είσαι σίγουρος;"
 }
\ No newline at end of file
diff --git a/public/translations/en/default.json b/public/translations/en/default.json
index b6f8b60a..dd23736a 100644
--- a/public/translations/en/default.json
+++ b/public/translations/en/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "wallet #{{index}}",
   "view_more": "view more",
   "submit_community": "Submit your community",
-  "hide_avatars_from_replies": "Hide avatars from replies"
+  "hide_avatars_from_replies": "Hide avatars from replies",
+  "yes": "yes",
+  "no": "no",
+  "are_you_sure": "Are you sure?"
 }
\ No newline at end of file
diff --git a/public/translations/es/default.json b/public/translations/es/default.json
index 261172bd..5fb7fd17 100644
--- a/public/translations/es/default.json
+++ b/public/translations/es/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "billetera #{{index}}",
   "view_more": "ver más",
   "submit_community": "Envía tu comunidad",
-  "hide_avatars_from_replies": "Ocultar avatares de las respuestas"
+  "hide_avatars_from_replies": "Ocultar avatares de las respuestas",
+  "yes": "sí",
+  "no": "no",
+  "are_you_sure": "¿Estás seguro?"
 }
\ No newline at end of file
diff --git a/public/translations/fa/default.json b/public/translations/fa/default.json
index 60efd580..93f13b84 100644
--- a/public/translations/fa/default.json
+++ b/public/translations/fa/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "کیف پول #{{index}}",
   "view_more": "مشاهده بیشتر",
   "submit_community": "جامعه خود را ارسال کنید",
-  "hide_avatars_from_replies": "تصاویر پروفایل را از پاسخ‌ها پنهان کن"
+  "hide_avatars_from_replies": "تصاویر پروفایل را از پاسخ‌ها پنهان کن",
+  "yes": "بله",
+  "no": "نه",
+  "are_you_sure": "آیا مطمئن هستید؟"
 }
\ No newline at end of file
diff --git a/public/translations/fi/default.json b/public/translations/fi/default.json
index 87401ea4..bac08096 100644
--- a/public/translations/fi/default.json
+++ b/public/translations/fi/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "lompakko #{{index}}",
   "view_more": "näytä lisää",
   "submit_community": "Lähetä yhteisösi",
-  "hide_avatars_from_replies": "Piilota avatarit vastauksista"
+  "hide_avatars_from_replies": "Piilota avatarit vastauksista",
+  "yes": "kyllä",
+  "no": "ei",
+  "are_you_sure": "Oletko varma?"
 }
\ No newline at end of file
diff --git a/public/translations/fil/default.json b/public/translations/fil/default.json
index 0ffecc2a..0e8143f2 100644
--- a/public/translations/fil/default.json
+++ b/public/translations/fil/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "wallet #{{index}}",
   "view_more": "tingnan pa",
   "submit_community": "I-submit ang iyong komunidad",
-  "hide_avatars_from_replies": "Itago ang mga avatar mula sa mga sagot"
+  "hide_avatars_from_replies": "Itago ang mga avatar mula sa mga sagot",
+  "yes": "oo",
+  "no": "hindi",
+  "are_you_sure": "Sigurado ka ba?"
 }
\ No newline at end of file
diff --git a/public/translations/fr/default.json b/public/translations/fr/default.json
index 61950de2..5794cbe5 100644
--- a/public/translations/fr/default.json
+++ b/public/translations/fr/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "portefeuille #{{index}}",
   "view_more": "voir plus",
   "submit_community": "Soumettez votre communauté",
-  "hide_avatars_from_replies": "Cacher les avatars des réponses"
+  "hide_avatars_from_replies": "Cacher les avatars des réponses",
+  "yes": "oui",
+  "no": "non",
+  "are_you_sure": "Êtes-vous sûr?"
 }
\ No newline at end of file
diff --git a/public/translations/he/default.json b/public/translations/he/default.json
index 7d2742e5..19d4d625 100644
--- a/public/translations/he/default.json
+++ b/public/translations/he/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "ארנק #{{index}}",
   "view_more": "ראה עוד",
   "submit_community": "שלח את הקהילה שלך",
-  "hide_avatars_from_replies": "הסתרת תמונות פרופיל בתשובות"
+  "hide_avatars_from_replies": "הסתרת תמונות פרופיל בתשובות",
+  "yes": "כן",
+  "no": "לא",
+  "are_you_sure": "האם אתה בטוח?"
 }
\ No newline at end of file
diff --git a/public/translations/hi/default.json b/public/translations/hi/default.json
index 6cb10ef0..a6a1e67e 100644
--- a/public/translations/hi/default.json
+++ b/public/translations/hi/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "वॉलेट #{{index}}",
   "view_more": "और देखें",
   "submit_community": "अपनी समुदाय सबमिट करें",
-  "hide_avatars_from_replies": "उत्तर से अवतार छुपाएं"
+  "hide_avatars_from_replies": "उत्तर से अवतार छुपाएं",
+  "yes": "हां",
+  "no": "नहीं",
+  "are_you_sure": "क्या आप सुनिश्चित हैं?"
 }
\ No newline at end of file
diff --git a/public/translations/hu/default.json b/public/translations/hu/default.json
index c57ea378..9a54faf1 100644
--- a/public/translations/hu/default.json
+++ b/public/translations/hu/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "tárca #{{index}}",
   "view_more": "több megtekintése",
   "submit_community": "Küldje el közösségét",
-  "hide_avatars_from_replies": "Rejtse el az avatarokat a válaszokból"
+  "hide_avatars_from_replies": "Rejtse el az avatarokat a válaszokból",
+  "yes": "igen",
+  "no": "nem",
+  "are_you_sure": "Biztos vagy benne?"
 }
\ No newline at end of file
diff --git a/public/translations/id/default.json b/public/translations/id/default.json
index 28af39c8..97154e5b 100644
--- a/public/translations/id/default.json
+++ b/public/translations/id/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "dompet #{{index}}",
   "view_more": "lihat lebih banyak",
   "submit_community": "Kirim komunitas Anda",
-  "hide_avatars_from_replies": "Sembunyikan avatar dari balasan"
+  "hide_avatars_from_replies": "Sembunyikan avatar dari balasan",
+  "yes": "iya",
+  "no": "tidak",
+  "are_you_sure": "Apakah Anda yakin?"
 }
\ No newline at end of file
diff --git a/public/translations/it/default.json b/public/translations/it/default.json
index d66ec63f..325b08d6 100644
--- a/public/translations/it/default.json
+++ b/public/translations/it/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "wallet #{{index}}",
   "view_more": "altri",
   "submit_community": "Invia la tua comunità",
-  "hide_avatars_from_replies": "Nascondi avatar da commenti"
+  "hide_avatars_from_replies": "Nascondi avatar da commenti",
+  "yes": "sì",
+  "no": "no",
+  "are_you_sure": "Sei sicuro?"
 }
\ No newline at end of file
diff --git a/public/translations/ja/default.json b/public/translations/ja/default.json
index 695f64b7..915583b6 100644
--- a/public/translations/ja/default.json
+++ b/public/translations/ja/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "ウォレット #{{index}}",
   "view_more": "もっと見る",
   "submit_community": "コミュニティを提出してください",
-  "hide_avatars_from_replies": "返信からアバターを非表示にする"
+  "hide_avatars_from_replies": "返信からアバターを非表示にする",
+  "yes": "はい",
+  "no": "いいえ",
+  "are_you_sure": "本当にそうですか？"
 }
\ No newline at end of file
diff --git a/public/translations/ko/default.json b/public/translations/ko/default.json
index 9427cf7f..0cf9c8ff 100644
--- a/public/translations/ko/default.json
+++ b/public/translations/ko/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "지갑 #{{index}}",
   "view_more": "더보기",
   "submit_community": "커뮤니티를 제출하세요",
-  "hide_avatars_from_replies": "답글에서 아바타 숨기기"
+  "hide_avatars_from_replies": "답글에서 아바타 숨기기",
+  "yes": "네",
+  "no": "아니요",
+  "are_you_sure": "정말 확실합니까?"
 }
\ No newline at end of file
diff --git a/public/translations/mr/default.json b/public/translations/mr/default.json
index 9b080c27..f8a6f246 100644
--- a/public/translations/mr/default.json
+++ b/public/translations/mr/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "वॉलेट #{{index}}",
   "view_more": "अधिक पाहा",
   "submit_community": "तुमच्या समुदायाला सबमिट करा",
-  "hide_avatars_from_replies": "उत्तरांमधून अवतार लपवा"
+  "hide_avatars_from_replies": "उत्तरांमधून अवतार लपवा",
+  "yes": "होय",
+  "no": "नाही",
+  "are_you_sure": "तुम्हाला खात्री आहे का?"
 }
\ No newline at end of file
diff --git a/public/translations/nl/default.json b/public/translations/nl/default.json
index 67c34480..496f94ba 100644
--- a/public/translations/nl/default.json
+++ b/public/translations/nl/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "portemonnee #{{index}}",
   "view_more": "meer bekijken",
   "submit_community": "Dien uw gemeenschap in",
-  "hide_avatars_from_replies": "Verberg avatars van reacties"
+  "hide_avatars_from_replies": "Verberg avatars van reacties",
+  "yes": "ja",
+  "no": "nee",
+  "are_you_sure": "Weet je het zeker?"
 }
\ No newline at end of file
diff --git a/public/translations/no/default.json b/public/translations/no/default.json
index 26833f4a..9da7352d 100644
--- a/public/translations/no/default.json
+++ b/public/translations/no/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "lommebok #{{index}}",
   "view_more": "vis mer",
   "submit_community": "Send inn ditt fellesskap",
-  "hide_avatars_from_replies": "Skjul avatarer fra svar"
+  "hide_avatars_from_replies": "Skjul avatarer fra svar",
+  "yes": "ja",
+  "no": "nei",
+  "are_you_sure": "Er du sikker?"
 }
\ No newline at end of file
diff --git a/public/translations/pl/default.json b/public/translations/pl/default.json
index efcc48e8..08c2a715 100644
--- a/public/translations/pl/default.json
+++ b/public/translations/pl/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "portfel #{{index}}",
   "view_more": "zobacz więcej",
   "submit_community": "Prześlij swoją społeczność",
-  "hide_avatars_from_replies": "Ukryj avatary w odpowiedziach"
+  "hide_avatars_from_replies": "Ukryj avatary w odpowiedziach",
+  "yes": "tak",
+  "no": "nie",
+  "are_you_sure": "Jesteś pewny?"
 }
\ No newline at end of file
diff --git a/public/translations/pt/default.json b/public/translations/pt/default.json
index e4160916..80fc3be0 100644
--- a/public/translations/pt/default.json
+++ b/public/translations/pt/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "carteira #{{index}}",
   "view_more": "ver mais",
   "submit_community": "Envie sua comunidade",
-  "hide_avatars_from_replies": "Esconder avatares das respostas"
+  "hide_avatars_from_replies": "Esconder avatares das respostas",
+  "yes": "sim",
+  "no": "não",
+  "are_you_sure": "Tem certeza?"
 }
\ No newline at end of file
diff --git a/public/translations/ro/default.json b/public/translations/ro/default.json
index a117e342..e01be8f8 100644
--- a/public/translations/ro/default.json
+++ b/public/translations/ro/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "portofel #{{index}}",
   "view_more": "vezi mai mult",
   "submit_community": "Trimite comunitatea ta",
-  "hide_avatars_from_replies": "Ascunde avatarele din răspunsuri"
+  "hide_avatars_from_replies": "Ascunde avatarele din răspunsuri",
+  "yes": "da",
+  "no": "nu",
+  "are_you_sure": "Ești sigur?"
 }
\ No newline at end of file
diff --git a/public/translations/ru/default.json b/public/translations/ru/default.json
index 8bb49c0e..8998e40b 100644
--- a/public/translations/ru/default.json
+++ b/public/translations/ru/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "кошелек #{{index}}",
   "view_more": "смотреть больше",
   "submit_community": "Отправьте ваше сообщество",
-  "hide_avatars_from_replies": "Скрыть аватары в ответах"
+  "hide_avatars_from_replies": "Скрыть аватары в ответах",
+  "yes": "да",
+  "no": "нет",
+  "are_you_sure": "Вы уверены?"
 }
\ No newline at end of file
diff --git a/public/translations/sq/default.json b/public/translations/sq/default.json
index 66749be4..12afad50 100644
--- a/public/translations/sq/default.json
+++ b/public/translations/sq/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "portofol #{{index}}",
   "view_more": "shiko më shumë",
   "submit_community": "Dorëzo komunitetin tuaj",
-  "hide_avatars_from_replies": "Fshih avatarët nga përgjigjet"
+  "hide_avatars_from_replies": "Fshih avatarët nga përgjigjet",
+  "yes": "po",
+  "no": "jo",
+  "are_you_sure": "Jeni të sigurt?"
 }
\ No newline at end of file
diff --git a/public/translations/sv/default.json b/public/translations/sv/default.json
index 90062e73..b349530f 100644
--- a/public/translations/sv/default.json
+++ b/public/translations/sv/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "plånbok #{{index}}",
   "view_more": "visa mer",
   "submit_community": "Skicka in ditt samhälle",
-  "hide_avatars_from_replies": "Dölj avatarer från svar"
+  "hide_avatars_from_replies": "Dölj avatarer från svar",
+  "yes": "ja",
+  "no": "nej",
+  "are_you_sure": "Är du säker?"
 }
\ No newline at end of file
diff --git a/public/translations/te/default.json b/public/translations/te/default.json
index c5110b1a..81c59329 100644
--- a/public/translations/te/default.json
+++ b/public/translations/te/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "వాలెట్ #{{index}}",
   "view_more": "మరింత చూడండి",
   "submit_community": "మీ కమ్యూనిటి పంపించండి",
-  "hide_avatars_from_replies": "ప్రతిస్పందనల నుండి అవతార్లను దాచు"
+  "hide_avatars_from_replies": "ప్రతిస్పందనల నుండి అవతార్లను దాచు",
+  "yes": "అవును",
+  "no": "కాదు",
+  "are_you_sure": "మీకు నమ్మకమా?"
 }
\ No newline at end of file
diff --git a/public/translations/th/default.json b/public/translations/th/default.json
index 890aeba9..8e391fd3 100644
--- a/public/translations/th/default.json
+++ b/public/translations/th/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "กระเป๋าเงิน #{{index}}",
   "view_more": "ดูเพิ่มเติม",
   "submit_community": "ส่งชุมชนของคุณ",
-  "hide_avatars_from_replies": "ซ่อนอวาตาร์จากคำตอบ"
+  "hide_avatars_from_replies": "ซ่อนอวาตาร์จากคำตอบ",
+  "yes": "ใช่",
+  "no": "ไม่ใช่",
+  "are_you_sure": "คุณมั่นใจไหม?"
 }
\ No newline at end of file
diff --git a/public/translations/tr/default.json b/public/translations/tr/default.json
index 97e6578c..e3ec66db 100644
--- a/public/translations/tr/default.json
+++ b/public/translations/tr/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "cüzdan #{{index}}",
   "view_more": "daha fazla görüntüle",
   "submit_community": "Topluluğunuzu gönderin",
-  "hide_avatars_from_replies": "Yanıtlardan avatarları gizle"
+  "hide_avatars_from_replies": "Yanıtlardan avatarları gizle",
+  "yes": "evet",
+  "no": "hayır",
+  "are_you_sure": "Emin misin?"
 }
\ No newline at end of file
diff --git a/public/translations/uk/default.json b/public/translations/uk/default.json
index 05b45b2d..7c6dad93 100644
--- a/public/translations/uk/default.json
+++ b/public/translations/uk/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "гаманець #{{index}}",
   "view_more": "переглянути більше",
   "submit_community": "Надішліть своє співтовариство",
-  "hide_avatars_from_replies": "Сховати аватари в відповідях"
+  "hide_avatars_from_replies": "Сховати аватари в відповідях",
+  "yes": "так",
+  "no": "ні",
+  "are_you_sure": "Ви впевнені?"
 }
\ No newline at end of file
diff --git a/public/translations/ur/default.json b/public/translations/ur/default.json
index 244f8f6b..ceb599bb 100644
--- a/public/translations/ur/default.json
+++ b/public/translations/ur/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "والٹ #{{index}}",
   "view_more": "مزید دیکھیں",
   "submit_community": "اپنی کمیونٹی جمع کروائیں",
-  "hide_avatars_from_replies": "جوابوں سے اوتار چھپائیں"
+  "hide_avatars_from_replies": "جوابوں سے اوتار چھپائیں",
+  "yes": "ہاں",
+  "no": "نہیں",
+  "are_you_sure": "کیا آپ کو یقین ہے؟"
 }
\ No newline at end of file
diff --git a/public/translations/vi/default.json b/public/translations/vi/default.json
index 87187821..8db7c75b 100644
--- a/public/translations/vi/default.json
+++ b/public/translations/vi/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "ví #{{index}}",
   "view_more": "xem thêm",
   "submit_community": "Gửi cộng đồng của bạn",
-  "hide_avatars_from_replies": "Ẩn avatar trong các câu trả lời"
+  "hide_avatars_from_replies": "Ẩn avatar trong các câu trả lời",
+  "yes": "vâng",
+  "no": "không",
+  "are_you_sure": "Bạn chắc chắn chứ?"
 }
\ No newline at end of file
diff --git a/public/translations/zh/default.json b/public/translations/zh/default.json
index acf308fd..f53392d8 100644
--- a/public/translations/zh/default.json
+++ b/public/translations/zh/default.json
@@ -323,5 +323,8 @@
   "wallet_number": "钱包 #{{index}}",
   "view_more": "查看更多",
   "submit_community": "提交您的社区",
-  "hide_avatars_from_replies": "隐藏回复中的头像"
+  "hide_avatars_from_replies": "隐藏回复中的头像",
+  "yes": "是的",
+  "no": "不是",
+  "are_you_sure": "你确定吗？"
 }
\ No newline at end of file
diff --git a/src/components/post/comment-tools/edit-menu/edit-menu.module.css b/src/components/post/comment-tools/edit-menu/edit-menu.module.css
index 7f112840..40c9a49f 100644
--- a/src/components/post/comment-tools/edit-menu/edit-menu.module.css
+++ b/src/components/post/comment-tools/edit-menu/edit-menu.module.css
@@ -2,7 +2,7 @@
   color: var(--text-info);
   font-weight: bold;
   text-decoration: none;
-  padding: 0 4px 0 4px;
+  padding: 0 4px;
   cursor: pointer;
   text-transform: lowercase;
 }
@@ -42,4 +42,20 @@
   .reportButton {
     display: block;
   }
-}
\ No newline at end of file
+}
+
+.deleteConfirm {
+  color: var(--red);
+  text-transform: lowercase;
+  padding: 0 4px;
+}
+
+.deleteConfirm:hover {
+  text-decoration: none !important;
+}
+
+.deleteConfirm span {
+  color: var(--text-info);
+  font-weight: 700;
+  cursor: pointer;
+}
diff --git a/src/components/post/comment-tools/edit-menu/edit-menu.tsx b/src/components/post/comment-tools/edit-menu/edit-menu.tsx
index ec4e4cff..b516555e 100644
--- a/src/components/post/comment-tools/edit-menu/edit-menu.tsx
+++ b/src/components/post/comment-tools/edit-menu/edit-menu.tsx
@@ -41,17 +41,24 @@ const EditMenu = ({ commentCid, showCommentEditForm }: EditMenuProps) => {
   const [publishOptions, setPublishOptions] = useState(defaultPublishOptions);
   const { publishCommentEdit } = usePublishCommentEdit(publishOptions);
 
+  const [showDeleteConfirm, setShowDeleteConfirm] = useState(false);
+
   const deleteComment = useCallback(() => {
+    setShowDeleteConfirm(true);
+  }, []);
+
+  const confirmDelete = () => {
     const newDeletedState = !deleted;
-    const confirmMessage = deleted ? t('sure_undelete') : t('sure_delete');
+    setPublishOptions((prevOptions) => ({
+      ...prevOptions,
+      deleted: newDeletedState,
+    }));
+    setShowDeleteConfirm(false);
+  };
 
-    if (window.confirm(confirmMessage)) {
-      setPublishOptions((prevOptions) => ({
-        ...prevOptions,
-        deleted: newDeletedState,
-      }));
-    }
-  }, [deleted, t]);
+  const cancelDelete = () => {
+    setShowDeleteConfirm(false);
+  };
 
   useEffect(() => {
     if (publishOptions.deleted !== defaultPublishOptions.deleted) {
@@ -70,9 +77,22 @@ const EditMenu = ({ commentCid, showCommentEditForm }: EditMenuProps) => {
           {t('edit')}
         </span>
       </li>
-      <li className={styles.button}>
-        <span onClick={deleteComment}>{deleted ? t('undelete') : t('delete')}</span>
-      </li>
+      {showDeleteConfirm ? (
+        <span className={styles.deleteConfirm}>
+          {t('are_you_sure')}{' '}
+          <span className={styles.confirmButton} onClick={confirmDelete}>
+            {t('yes')}
+          </span>
+          {' / '}
+          <span className={styles.cancelButton} onClick={cancelDelete}>
+            {t('no')}
+          </span>
+        </span>
+      ) : (
+        <li className={styles.button}>
+          <span onClick={deleteComment}>{deleted ? t('undelete') : t('delete')}</span>
+        </li>
+      )}
     </>
   );
 };
diff --git a/src/components/sidebar/sidebar.module.css b/src/components/sidebar/sidebar.module.css
index 2b8f85e1..78d7c86e 100644
--- a/src/components/sidebar/sidebar.module.css
+++ b/src/components/sidebar/sidebar.module.css
@@ -318,3 +318,19 @@ a {
   margin-top: 20px;
   margin-bottom: 20px;
 }
+
+.blockConfirm {
+  color: var(--red);
+}
+
+.blockConfirm span {
+  color: var(--text-info);
+  font-weight: 700;
+  cursor: pointer;
+}
+
+.blockSub {
+  font-weight: 700;
+  color: var(--text-info);
+  cursor: pointer;
+}
diff --git a/src/components/sidebar/sidebar.tsx b/src/components/sidebar/sidebar.tsx
index 1eedff8f..798c265e 100644
--- a/src/components/sidebar/sidebar.tsx
+++ b/src/components/sidebar/sidebar.tsx
@@ -1,3 +1,4 @@
+import { useState } from 'react';
 import { Link, useLocation, useNavigate, useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import Plebbit from '@plebbit/plebbit-js/dist/browser/index.js';
@@ -233,16 +234,23 @@ const Sidebar = ({ comment, isSubCreatedButNotYetPublished, settings, subplebbit
 
   const { blocked, unblock, block } = useBlock({ address });
 
+  const [showBlockConfirm, setShowBlockConfirm] = useState(false);
+
   const blockConfirm = () => {
+    setShowBlockConfirm(true);
+  };
+
+  const handleBlock = () => {
     if (blocked) {
-      if (window.confirm(t('unblock_community_alert'))) {
-        unblock();
-      }
-    } else if (!blocked) {
-      if (window.confirm(t('block_community_alert'))) {
-        block();
-      }
+      unblock();
+    } else {
+      block();
     }
+    setShowBlockConfirm(false);
+  };
+
+  const cancelBlock = () => {
+    setShowBlockConfirm(false);
   };
 
   const account = useAccount();
@@ -312,9 +320,22 @@ const Sidebar = ({ comment, isSubCreatedButNotYetPublished, settings, subplebbit
             <span>{`u/${creatorAddress}`}</span>
             {createdAt && <span className={styles.age}> {t('community_for', { date: getFormattedTimeDuration(createdAt) })}</span>}
             <div className={styles.bottomButtons}>
-              <span className={styles.blockSub} onClick={blockConfirm}>
-                {blocked ? t('unblock_community') : t('block_community')}
-              </span>
+              {showBlockConfirm ? (
+                <span className={styles.blockConfirm}>
+                  {t('are_you_sure')}{' '}
+                  <span className={styles.confirmButton} onClick={handleBlock}>
+                    {t('yes')}
+                  </span>
+                  {' / '}
+                  <span className={styles.cancelButton} onClick={cancelBlock}>
+                    {t('no')}
+                  </span>
+                </span>
+              ) : (
+                <span className={styles.blockSub} onClick={blockConfirm}>
+                  {blocked ? t('unblock_community') : t('block_community')}
+                </span>
+              )}
             </div>
           </div>
         </div>
diff --git a/src/themes.css b/src/themes.css
index 701c6e72..7acc7de6 100644
--- a/src/themes.css
+++ b/src/themes.css
@@ -53,7 +53,7 @@
   --pagination-button-border-hover: 1px solid #5a728a;
   --play-button: url("/public/assets/buttons/play-button-dark.png");
   --play-button-hover: url("/public/assets/buttons/play-button-hover.png");
-  --red: rgb(200, 0, 0);
+  --red: rgb(255, 21, 21);
   --removed-reply-backgrouhd-color: rgb(27, 30, 32);
   --text: #bfbfbf;
   --text-button: url("/public/assets/buttons/text-button-dark.png");

From d39a1faa3acb61c17f434b46d314991e04cf83ed Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Fri, 6 Dec 2024 15:12:26 +0100
Subject: [PATCH 10/11] remove "undelete" button, the protocol doesn't allow it
 anymore

---
 src/components/post/comment-tools/comment-tools.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/post/comment-tools/comment-tools.tsx b/src/components/post/comment-tools/comment-tools.tsx
index 84e2e35a..ad664f57 100644
--- a/src/components/post/comment-tools/comment-tools.tsx
+++ b/src/components/post/comment-tools/comment-tools.tsx
@@ -263,7 +263,7 @@ const CommentTools = ({
   const isInInboxView = isInboxView(useLocation().pathname);
 
   return (
-    (!(deleted || removed) || ((deleted || removed) && (isAuthor || isAccountMod))) && (
+    (!(deleted || removed) || ((deleted || removed) && isAccountMod)) && (
       <ul className={`${styles.buttons} ${isReply && !isInInboxView ? styles.buttonsReply : ''} ${hasLabel ? styles.buttonsLabel : ''}`}>
         {isReply ? (
           isSingleReply ? (

From da4f90124557115f4fef154447861f8f68d4f49d Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Fri, 6 Dec 2024 15:20:12 +0100
Subject: [PATCH 11/11] Update comment-tools.tsx

---
 src/components/post/comment-tools/comment-tools.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/post/comment-tools/comment-tools.tsx b/src/components/post/comment-tools/comment-tools.tsx
index ad664f57..a5692ac8 100644
--- a/src/components/post/comment-tools/comment-tools.tsx
+++ b/src/components/post/comment-tools/comment-tools.tsx
@@ -263,7 +263,7 @@ const CommentTools = ({
   const isInInboxView = isInboxView(useLocation().pathname);
 
   return (
-    (!(deleted || removed) || ((deleted || removed) && isAccountMod)) && (
+    (!(deleted || removed) || (!deleted && isAccountMod)) && (
       <ul className={`${styles.buttons} ${isReply && !isInInboxView ? styles.buttonsReply : ''} ${hasLabel ? styles.buttonsLabel : ''}`}>
         {isReply ? (
           isSingleReply ? (