diff --git a/src/components/post-desktop/post-desktop.tsx b/src/components/post-desktop/post-desktop.tsx index 8f0d4e2b..7103673c 100644 --- a/src/components/post-desktop/post-desktop.tsx +++ b/src/components/post-desktop/post-desktop.tsx @@ -218,7 +218,7 @@ const PostMedia = ({ post }: PostProps) => { const PostMessage = ({ post }: PostProps) => { const { cid, content, commentAuthor, deleted, edit, original, parentCid, postCid, reason, removed, spoiler, state, subplebbitAddress } = post || {}; - const banned = commentAuthor?.banExpiresAt; + const banned = !!commentAuthor?.banExpiresAt; const { t } = useTranslation(); const params = useParams(); const location = useLocation(); @@ -242,9 +242,13 @@ const PostMessage = ({ post }: PostProps) => {
{isReply && !(removed || deleted) && isReplyingToReply &&} {removed ? ( - ({t('this_post_was_removed')}) + ({t('this_post_was_removed')})} + content={`${_.capitalize(t('reason'))}: "${reason}"`} + showTooltip={!!reason} + /> ) : deleted ? ( - {t('user_deleted_this_post')} + {t('user_deleted_this_post')}} content={reason && `${t('reason')}: ${reason}`} /> ) : ( <> {!showOriginal && } @@ -269,26 +273,20 @@ const PostMessage = ({ post }: PostProps) => { )} )} - {banned && ( - -
-- - )} > )} - {(removed || deleted) && reason && ( - + {banned && ( +
- {t('reason')}: {reason} +)} {!isReply && content.length > 1000 && !isInPostView && ( diff --git a/src/components/post-mobile/post-mobile.tsx b/src/components/post-mobile/post-mobile.tsx index aa856776..cb0e227d 100644 --- a/src/components/post-mobile/post-mobile.tsx +++ b/src/components/post-mobile/post-mobile.tsx @@ -153,7 +153,7 @@ const ReplyBacklinks = ({ post }: PostProps) => { const PostMessageMobile = ({ post }: PostProps) => { const { t } = useTranslation(); const { cid, commentAuthor, content, deleted, edit, original, parentCid, postCid, reason, removed, spoiler, state, subplebbitAddress } = post || {}; - const banned = commentAuthor?.banExpiresAt; + const banned = !!commentAuthor?.banExpiresAt; const [showOriginal, setShowOriginal] = useState(false); const params = useParams(); @@ -178,9 +178,13 @@ const PostMessageMobile = ({ post }: PostProps) => { {isReply && !(removed || deleted) && isReplyingToReply &&} + content={`${_.capitalize(t('reason'))}: "${reason}"`} + showTooltip={!!reason} + /> ) : deleted ? ( - {t('user_deleted_this_post')} +} {removed ? ( - ({t('this_post_was_removed')}) + ({t('this_post_was_removed')}) {t('user_deleted_this_post')}} content={reason && `${t('reason')}: ${reason}`} /> ) : ( <> {!showOriginal && } @@ -205,26 +209,20 @@ const PostMessageMobile = ({ post }: PostProps) => { )} )} - {banned && ( - -
-- - )} > )} - {(removed || deleted) && reason && ( - + {banned && ( +
- reason: {reason} +)} {!isReply && content.length > 1000 && !isInPostView && (