From 664dfa26887b9faa60dc9f3927795c9e5b666712 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Fri, 4 Mar 2022 13:01:22 -0600 Subject: [PATCH] MarkdownButton: don't do the availability check in the component itself --- app/soapbox/features/compose/components/markdown_button.js | 7 +------ .../compose/containers/markdown_button_container.js | 6 ------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/app/soapbox/features/compose/components/markdown_button.js b/app/soapbox/features/compose/components/markdown_button.js index d03217ee0..202bc0cf7 100644 --- a/app/soapbox/features/compose/components/markdown_button.js +++ b/app/soapbox/features/compose/components/markdown_button.js @@ -17,7 +17,6 @@ class MarkdownButton extends React.PureComponent { active: PropTypes.bool, onClick: PropTypes.func.isRequired, intl: PropTypes.object.isRequired, - unavailable: PropTypes.bool, }; handleClick = () => { @@ -25,11 +24,7 @@ class MarkdownButton extends React.PureComponent { } render() { - const { intl, active, unavailable } = this.props; - - if (unavailable) { - return null; - } + const { intl, active } = this.props; return (
diff --git a/app/soapbox/features/compose/containers/markdown_button_container.js b/app/soapbox/features/compose/containers/markdown_button_container.js index 86868c452..4001f3c92 100644 --- a/app/soapbox/features/compose/containers/markdown_button_container.js +++ b/app/soapbox/features/compose/containers/markdown_button_container.js @@ -1,17 +1,11 @@ import { connect } from 'react-redux'; -import { getFeatures } from 'soapbox/utils/features'; - import { changeComposeContentType } from '../../../actions/compose'; import MarkdownButton from '../components/markdown_button'; const mapStateToProps = (state, { intl }) => { - const instance = state.get('instance'); - const features = getFeatures(instance); - return { active: state.getIn(['compose', 'content_type']) === 'text/markdown', - unavailable: !features.richText, }; };