Merge branch 'release-4.0'

1 files changed, 6 insertions, 10 deletions

diff --git a/webapp/actions/status_actions.jsx b/webapp/actions/status_actions.jsx
index 066a89254..e8559bd65 100644
--- a/webapp/actions/status_actions.jsx
+++ b/webapp/actions/status_actions.jsx
@@ -54,16 +54,9 @@ export function loadStatusesForChannelAndSidebar() {
     const statusesToLoad = {};
 
     const channelId = ChannelStore.getCurrentId();
-    const postList = PostStore.getVisiblePosts(channelId);
-    if (postList && postList.posts) {
-        for (const pid in postList.posts) {
-            if (!postList.posts.hasOwnProperty(pid)) {
-                continue;
-            }
-
-            const post = postList.posts[pid];
-            statusesToLoad[post.user_id] = true;
-        }
+    const posts = PostStore.getVisiblePosts(channelId) || [];
+    for (const post of posts) {
+        statusesToLoad[post.user_id] = true;
     }
 
     const dmPrefs = PreferenceStore.getCategory(Preferences.CATEGORY_DIRECT_CHANNEL_SHOW);
@@ -74,6 +67,9 @@ export function loadStatusesForChannelAndSidebar() {
         }
     }
 
+    const {currentUserId} = getState().entities.users;
+    statusesToLoad[currentUserId] = true;
+
     loadStatusesByIds(Object.keys(statusesToLoad));
 }