diff --git a/app/soapbox/features/ui/components/column.js b/app/soapbox/features/ui/components/column.js index 888b2c04e..5e4b643b7 100644 --- a/app/soapbox/features/ui/components/column.js +++ b/app/soapbox/features/ui/components/column.js @@ -1,7 +1,6 @@ import React from 'react'; import ColumnHeader from './column_header'; import PropTypes from 'prop-types'; -import { isMobile } from '../../../is_mobile'; import ColumnBackButton from '../../../components/column_back_button'; import ColumnBackButtonSlim from '../../../components/column_back_button_slim'; @@ -12,25 +11,17 @@ export default class Column extends React.PureComponent { icon: PropTypes.string, children: PropTypes.node, active: PropTypes.bool, - hideHeadingOnMobile: PropTypes.bool, backBtnSlim: PropTypes.bool, }; render() { - const { heading, icon, children, active, hideHeadingOnMobile, backBtnSlim } = this.props; - - const showHeading = heading && (!hideHeadingOnMobile || (hideHeadingOnMobile && !isMobile(window.innerWidth))); - - const columnHeaderId = showHeading && heading.replace(/ /g, '-'); - const header = showHeading && ( - - ); - + const { heading, icon, children, active, backBtnSlim } = this.props; + const columnHeaderId = heading.replace(/ /g, '-'); const backBtn = backBtnSlim ? () : (); return (
- {header} + {backBtn} {children}
diff --git a/app/soapbox/features/ui/components/column_header.js b/app/soapbox/features/ui/components/column_header.js index 6ff52e44f..bb027eb38 100644 --- a/app/soapbox/features/ui/components/column_header.js +++ b/app/soapbox/features/ui/components/column_header.js @@ -19,16 +19,11 @@ export default class ColumnHeader extends React.PureComponent { render() { const { icon, type, active, columnHeaderId } = this.props; - let iconElement = ''; - - if (icon) { - iconElement = ; - } return (