diff --git a/app/soapbox/features/status/index.js b/app/soapbox/features/status/index.js index c6262057e..5e936166a 100644 --- a/app/soapbox/features/status/index.js +++ b/app/soapbox/features/status/index.js @@ -36,7 +36,7 @@ import { import { initMuteModal } from '../../actions/mutes'; import { initReport } from '../../actions/reports'; import { makeGetStatus } from '../../selectors'; -import ColumnHeader from '../../components/column_header'; +// import ColumnHeader from '../../components/column_header'; import StatusContainer from '../../containers/status_container'; import { openModal } from '../../actions/modal'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; @@ -45,7 +45,7 @@ import { createSelector } from 'reselect'; import { HotKeys } from 'react-hotkeys'; import { attachFullscreenListener, detachFullscreenListener, isFullscreen } from '../ui/util/fullscreen'; import { textForScreenReader, defaultMediaVisibility } from '../../components/status'; -import Icon from 'soapbox/components/icon'; +// import Icon from 'soapbox/components/icon'; import { getSettings } from 'soapbox/actions/settings'; import { getSoapboxConfig } from 'soapbox/actions/soapbox'; import { deactivateUserModal, deleteUserModal, deleteStatusModal, toggleStatusSensitivityModal } from 'soapbox/actions/moderation'; @@ -535,7 +535,7 @@ class Status extends ImmutablePureComponent { render() { let ancestors, descendants; - const { status, ancestorsIds, descendantsIds, intl, domain, me } = this.props; + const { status, ancestorsIds, descendantsIds, intl, domain } = this.props; if (status === null) { return ( @@ -568,8 +568,12 @@ class Status extends ImmutablePureComponent { }; return ( - - { me && + + {/* + Eye icon to show/hide all CWs in a thread. + I'm not convinced of the value of this. It needs a better design at the very least. + */} + {/* me && )} /> - } + */}
{ancestors} diff --git a/app/soapbox/features/ui/components/column.js b/app/soapbox/features/ui/components/column.js index e915e5e70..77c18283e 100644 --- a/app/soapbox/features/ui/components/column.js +++ b/app/soapbox/features/ui/components/column.js @@ -12,18 +12,23 @@ export default class Column extends React.PureComponent { children: PropTypes.node, active: PropTypes.bool, backBtnSlim: PropTypes.bool, + showBackBtn: PropTypes.bool, back: PropTypes.string, }; + static defaultProps = { + showBackBtn: true, + } + render() { - const { heading, icon, children, active, backBtnSlim, back } = this.props; + const { heading, icon, children, active, backBtnSlim, showBackBtn, back } = this.props; const columnHeaderId = heading && heading.replace(/ /g, '-'); const backBtn = backBtnSlim ? () : (); return (
{heading && } - {backBtn} + {showBackBtn ? backBtn : null} {children}
);