From f5502d8b6795e6e83320e427239ad301f0e62c6d Mon Sep 17 00:00:00 2001
From: Harrison Healey <harrisonmhealey@gmail.com>
Date: Tue, 14 Feb 2017 15:09:20 -0500
Subject: [PATCH] Fixed merge conflict causing thread drafts to not work (#252)

---
 app/components/post_textbox/post_textbox.js | 2 +-
 app/scenes/channel/channel.js               | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/components/post_textbox/post_textbox.js b/app/components/post_textbox/post_textbox.js
index 2b9745d9e..bb9901332 100644
--- a/app/components/post_textbox/post_textbox.js
+++ b/app/components/post_textbox/post_textbox.js
@@ -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) => {
diff --git a/app/scenes/channel/channel.js b/app/scenes/channel/channel.js
index d724dc848..98eab9652 100644
--- a/app/scenes/channel/channel.js
+++ b/app/scenes/channel/channel.js
@@ -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}
             />
         );