Merge branch 'master' of https://github.com/mattermost/platform

2 files changed, 9 insertions, 1 deletions

diff --git a/api/user.go b/api/user.go
index 292d2b61b..ada781bc7 100644
--- a/api/user.go
+++ b/api/user.go
@@ -593,7 +593,7 @@ func createProfileImage(username string, userId string) ([]byte, *model.AppError
 	h.Write([]byte(userId))
 	seed := h.Sum32()
 
-	color := colors[int(seed)%len(colors)]
+	color := colors[int64(seed)%int64(len(colors))]
 	img := image.NewRGBA(image.Rect(0, 0, int(utils.Cfg.ImageSettings.ProfileWidth), int(utils.Cfg.ImageSettings.ProfileHeight)))
 	draw.Draw(img, img.Bounds(), &image.Uniform{color}, image.ZP, draw.Src)
 
diff --git a/web/react/components/msg_typing.jsx b/web/react/components/msg_typing.jsx
index 9d3904757..a6953028f 100644
--- a/web/react/components/msg_typing.jsx
+++ b/web/react/components/msg_typing.jsx
@@ -11,6 +11,11 @@ module.exports = React.createClass({
     componentDidMount: function() {
         SocketStore.addChangeListener(this._onChange);
     },
+    componentWillReceiveProps: function(newProps) {
+        if(this.props.channelId !== newProps.channelId) {
+            this.setState({text:""});
+        }
+    },
     componentWillUnmount: function() {
         SocketStore.removeChangeListener(this._onChange);
     },
@@ -37,6 +42,9 @@ module.exports = React.createClass({
                 }, 3000);
             }
         }
+        else if (msg.action == "posted" && msg.channel_id === this.props.channelId) {
+            this.setState({text:""})
+        }
     },
     getInitialState: function() {
         return { text: "" };