feat(board): show error in feed near loading string

This commit is contained in:
Tom (plebeius.eth)
2024-06-03 11:04:53 +02:00
parent 994ec54190
commit 4b2a6025d3
2 changed files with 10 additions and 6 deletions
+3 -5
View File
@@ -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 />
</>
)}
+7 -1
View File
@@ -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>
);