From 4b2a6025d39d70987dea62346ee40b8e7003f706 Mon Sep 17 00:00:00 2001
From: "Tom (plebeius.eth)" <tom@plebbit.com>
Date: Mon, 3 Jun 2024 11:04:53 +0200
Subject: [PATCH] feat(board): show error in feed near loading string

---
 src/app.tsx               | 8 +++-----
 src/views/board/board.tsx | 8 +++++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/app.tsx b/src/app.tsx
index 56b03e4d..8aff1db9 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -18,15 +18,13 @@ import SubplebbitStats from './components/subplebbit-stats';
 import TopBar from './components/topbar';
 
 const BoardLayout = () => {
-  const { accountCommentIndex, commentCid, subplebbitAddress } = useParams();
+  const { accountCommentIndex, subplebbitAddress } = useParams();
   const location = useLocation();
   const isMobile = useIsMobile();
 
   const isValidAccountCommentIndex = !accountCommentIndex || (!isNaN(parseInt(accountCommentIndex)) && parseInt(accountCommentIndex) >= 0);
-  const isValidCommentCid = !commentCid || /^Qm[a-zA-Z0-9]{44}$/.test(commentCid);
-  const isValidSubplebbitAddress = !subplebbitAddress || subplebbitAddress.includes('.') || /^12D3KooW[a-zA-Z0-9]{44}$/.test(subplebbitAddress);
 
-  if (!isValidAccountCommentIndex || !isValidCommentCid || !isValidSubplebbitAddress) {
+  if (!isValidAccountCommentIndex) {
     return <NotFound />;
   }
 
@@ -45,7 +43,7 @@ const BoardLayout = () => {
       ) : (
         <>
           <PostForm key={key} />
-          {subplebbitAddress && isValidSubplebbitAddress && <SubplebbitStats />}
+          {subplebbitAddress && <SubplebbitStats />}
           <DesktopBoardButtons />
         </>
       )}
diff --git a/src/views/board/board.tsx b/src/views/board/board.tsx
index b2eda2f6..809203fd 100644
--- a/src/views/board/board.tsx
+++ b/src/views/board/board.tsx
@@ -49,7 +49,7 @@ const Board = () => {
     setResetFunction(reset);
   }, [reset, setResetFunction]);
 
-  const subplebbit = useSubplebbit({ subplebbitAddress });
+  const { subplebbit, error } = useSubplebbit({ subplebbitAddress });
   const { createdAt, description, rules, shortAddress, state, suggested } = subplebbit || {};
   const title = isInAllView ? t('all') : isInSubscriptionsView ? t('subscriptions') : subplebbit?.title;
 
@@ -65,6 +65,12 @@ const Board = () => {
       ) : (
         <LoadingEllipsis string={loadingStateString} />
       )}
+      {error && (
+        <div style={{ color: 'red' }}>
+          <br />
+          {error.message}
+        </div>
+      )}
     </div>
   );