Fixed merge conflict causing thread drafts to not work (#252)

This commit is contained in:
Harrison Healey 2017-02-14 15:09:20 -05:00 committed by GitHub
parent 51e8ee6ea2
commit f5502d8b67
2 changed files with 6 additions and 2 deletions

View file

@ -71,7 +71,7 @@ export default class PostTextbox extends React.PureComponent {
};
handleTextChange = (text) => {
this.props.onChangeText(this.props.channelId, text);
this.props.onChangeText(text);
}
handleSelectionChange = (event) => {

View file

@ -98,6 +98,10 @@ export default class Channel extends React.PureComponent {
this.postTextbox = ref;
};
handleDraftChanged = (value) => {
this.props.actions.handlePostDraftChanged(this.props.currentChannel.id, value);
};
handleLeaveTeam = () => {
this.props.actions.selectFirstAvailableTeam();
};
@ -148,7 +152,7 @@ export default class Channel extends React.PureComponent {
value={this.props.drafts[this.props.currentChannel.id]}
teamId={teamId}
channelId={currentChannel.id}
onChangeText={this.props.actions.handlePostDraftChanged}
onChangeText={this.handleDraftChanged}
/>
);