From 808e05a03f0a353b767300b35b9cad868938114b Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Tue, 26 May 2020 15:24:03 -0500 Subject: [PATCH] Pass maxTootChars from ComposeFormContainer instead of ComposeForm --- .../features/compose/components/compose_form.js | 10 +--------- .../compose/containers/compose_form_container.js | 1 + 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/gabsocial/features/compose/components/compose_form.js b/app/gabsocial/features/compose/components/compose_form.js index acb21f5fd..067b98296 100644 --- a/app/gabsocial/features/compose/components/compose_form.js +++ b/app/gabsocial/features/compose/components/compose_form.js @@ -1,5 +1,4 @@ import React from 'react'; -import { connect } from 'react-redux'; import CharacterCounter from './character_counter'; import Button from '../../../components/button'; import ImmutablePropTypes from 'react-immutable-proptypes'; @@ -32,14 +31,7 @@ const messages = defineMessages({ publishLoud: { id: 'compose_form.publish_loud', defaultMessage: '{publish}!' }, }); -const mapStateToProps = state => { - return { - maxTootChars: state.getIn(['instance', 'max_toot_chars']), - }; -}; - -export default @connect(mapStateToProps) -@injectIntl +export default @injectIntl class ComposeForm extends ImmutablePureComponent { state = { diff --git a/app/gabsocial/features/compose/containers/compose_form_container.js b/app/gabsocial/features/compose/containers/compose_form_container.js index ce33d8174..f1ac1926d 100644 --- a/app/gabsocial/features/compose/containers/compose_form_container.js +++ b/app/gabsocial/features/compose/containers/compose_form_container.js @@ -26,6 +26,7 @@ const mapStateToProps = state => ({ showSearch: state.getIn(['search', 'submitted']) && !state.getIn(['search', 'hidden']), anyMedia: state.getIn(['compose', 'media_attachments']).size > 0, isModalOpen: state.get('modal').modalType === 'COMPOSE', + maxTootChars: state.getIn(['instance', 'max_toot_chars']), }); const mapDispatchToProps = (dispatch) => ({