From c201ef17754e66ce16bc12d243baf57fb1b6d8d4 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Tue, 6 Sep 2016 09:56:46 -0400
Subject: Add statuses to profiles pictures and remove from header in DMs
 (#3940)

---
 webapp/components/post_view/post_view_controller.jsx | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'webapp/components/post_view/post_view_controller.jsx')

diff --git a/webapp/components/post_view/post_view_controller.jsx b/webapp/components/post_view/post_view_controller.jsx
index 9ff986b43..840f71f23 100644
--- a/webapp/components/post_view/post_view_controller.jsx
+++ b/webapp/components/post_view/post_view_controller.jsx
@@ -45,10 +45,7 @@ export default class PostViewController extends React.Component {
 
         const joinLeaveEnabled = PreferenceStore.getBool(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'join_leave', true);
 
-        let statuses;
-        if (channel && channel.type !== Constants.DM_CHANNEL) {
-            statuses = Object.assign({}, UserStore.getStatuses());
-        }
+        const statuses = Object.assign({}, UserStore.getStatuses());
 
         // If we haven't received a page time then we aren't done loading the posts yet
         const loading = PostStore.getLatestPostFromPageTime(channel.id) === 0;
@@ -133,13 +130,7 @@ export default class PostViewController extends React.Component {
     }
 
     onStatusChange() {
-        const channel = this.state.channel;
-        let statuses;
-        if (channel && channel.type !== Constants.DM_CHANNEL) {
-            statuses = Object.assign({}, UserStore.getStatuses());
-        }
-
-        this.setState({statuses});
+        this.setState({statuses: Object.assign({}, UserStore.getStatuses())});
     }
 
     onActivate() {
-- 
cgit v1.2.3-1-g7c22

