diff --git a/app/soapbox/components/status-content.tsx b/app/soapbox/components/status-content.tsx index bedef1fa69..23a688ed5f 100644 --- a/app/soapbox/components/status-content.tsx +++ b/app/soapbox/components/status-content.tsx @@ -103,7 +103,7 @@ const StatusContent: React.FC = ({ status, onClick, collapsable const maybeSetCollapsed = (): void => { if (!node.current) return; - if (collapsable && onClick && !collapsed && status.spoiler_text.length === 0) { + if (collapsable && onClick && !collapsed) { if (node.current.clientHeight > MAX_HEIGHT) { setCollapsed(true); } diff --git a/app/soapbox/components/statuses/sensitive-content-overlay.tsx b/app/soapbox/components/statuses/sensitive-content-overlay.tsx index 21630929fc..ed8891535d 100644 --- a/app/soapbox/components/statuses/sensitive-content-overlay.tsx +++ b/app/soapbox/components/statuses/sensitive-content-overlay.tsx @@ -92,7 +92,7 @@ const SensitiveContentOverlay = React.forwardRef ) : ( -
-
- - {intl.formatMessage(isUnderReview ? messages.underReviewTitle : messages.sensitiveTitle)} - +
+
+
+ + {intl.formatMessage(isUnderReview ? messages.underReviewTitle : messages.sensitiveTitle)} + - - {intl.formatMessage(isUnderReview ? messages.underReviewSubtitle : messages.sensitiveSubtitle)} - + + {intl.formatMessage(isUnderReview ? messages.underReviewSubtitle : messages.sensitiveSubtitle)} + - {status.spoiler_text && ( -
- - “” - -
- )} -
+ {status.spoiler_text && ( +
+ + “” + +
+ )} +
- - {isUnderReview ? ( - <> - {links.get('support') && ( - event.stopPropagation()} - > - - - )} - - ) : null} + + + )} + + ) : null} - + - {(isUnderReview && isOwnStatus) ? ( - - ) : null} - + {(isUnderReview && isOwnStatus) ? ( + + ) : null} + +
)}