diff --git a/src/components/post-desktop/post-desktop.tsx b/src/components/post-desktop/post-desktop.tsx
index c8e16445..1b73dfad 100644
--- a/src/components/post-desktop/post-desktop.tsx
+++ b/src/components/post-desktop/post-desktop.tsx
@@ -341,7 +341,7 @@ const Reply = ({ openReplyModal, postReplyCount, reply, roles }: PostProps) => {
post = editedComment;
}
- const { author, cid, content, link, postCid, subplebbitAddress } = post || {};
+ const { author, cid, link, postCid, subplebbitAddress } = post || {};
const isRouteLinkToReply = useLocation().pathname.startsWith(`/p/${subplebbitAddress}/c/${cid}`);
const { hidden } = useHide({ cid });
@@ -356,7 +356,7 @@ const Reply = ({ openReplyModal, postReplyCount, reply, roles }: PostProps) => {
>
- {isReply && !(removed || deleted) && state !== 'failed' && isReplyingToReply &&); }; @@ -261,7 +259,7 @@ const Reply = ({ openReplyModal, postReplyCount, reply, roles }: PostProps) => { if (editedComment) { post = editedComment; } - const { author, cid, content, postCid, subplebbitAddress } = post || {}; + const { author, cid, postCid, subplebbitAddress } = post || {}; const isRouteLinkToReply = useLocation().pathname.startsWith(`/p/${subplebbitAddress}/c/${cid}`); const { hidden } = useHide({ cid }); @@ -275,7 +273,7 @@ const Reply = ({ openReplyModal, postReplyCount, reply, roles }: PostProps) => { data-post-cid={postCid} >} - {removed ? ( + + {isReply && !(removed || deleted) && state !== 'failed' && isReplyingToReply &&- ) + + )} */} + {!isReply && content.length > 1000 && !isInPostView && ( + +} + {removed ? ( + ({t('this_post_was_removed')})} + content={`${_.capitalize(t('reason'))}: "${reason}"`} + showTooltip={!!reason} + /> + ) : deleted ? ( + {t('user_deleted_this_post')}} content={reason && `${t('reason')}: ${reason}`} /> + ) : ( + <> + {!showOriginal && } + {edit && original?.content !== post?.content && ( + + {showOriginal && } +
+ {t('comment_edited_at_timestamp', { timestamp: getFormattedDate(edit?.timestamp), interpolation: { escapeValue: false } })}{' '} + {reason && <>{t('reason_reason', { reason: reason, interpolation: { escapeValue: false } })} >} + {showOriginal ? ( +setShowOriginal(!showOriginal)} /> }} + /> + ) : ( + + )} + > + )} + {/* TODO: commentAuthor is not available outside of editedComment, update when available */} + {/* {banned && ( + +setShowOriginal(!showOriginal)} /> }} + /> + )} +
+
({t('this_post_was_removed')}) } - content={`${_.capitalize(t('reason'))}: "${reason}"`} - showTooltip={!!reason} + children={`(${t('user_banned')})`} + content={`${t('ban_expires_at', { + address: subplebbitAddress && Plebbit.getShortAddress(subplebbitAddress), + timestamp: getFormattedDate(commentAuthor?.banExpiresAt), + interpolation: { escapeValue: false }, + })}${reason ? `. ${_.capitalize(t('reason'))}: "${reason}"` : ''}`} /> - ) : deleted ? ( -{t('user_deleted_this_post')}} content={reason && `${t('reason')}: ${reason}`} /> - ) : ( - <> - {!showOriginal && } - {edit && original?.content !== post?.content && ( - - {showOriginal && } -
- {t('comment_edited_at_timestamp', { timestamp: getFormattedDate(edit?.timestamp), interpolation: { escapeValue: false } })}{' '} - {reason && <>{t('reason_reason', { reason: reason, interpolation: { escapeValue: false } })} >} - {showOriginal ? ( -setShowOriginal(!showOriginal)} /> }} - /> - ) : ( - - )} - > - )} - {/* TODO: commentAuthor is not available outside of editedComment, update when available */} - {/* {banned && ( - -setShowOriginal(!showOriginal)} /> }} - /> - )} -
-
-- - )} */} - {!isReply && content.length > 1000 && !isInPostView && ( - -
-}} /> - - )} - {!cid && state === 'pending' && stateString !== 'Failed' && ( - <> -
- {loadingString} - > - )} -
+}} /> + + )} + {!cid && state === 'pending' && stateString !== 'Failed' && ( + <> +
+ {loadingString} + > + )} +