From a26145ef91197ba374d525c947984ae672cbd94d Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Tue, 3 Nov 2015 15:11:16 -0500
Subject: Minor changes to statuses client code

---
 web/react/components/channel_loader.jsx | 9 ++-------
 web/react/components/sidebar.jsx        | 3 +++
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'web/react/components')

diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx
index edc13f7ab..4fc115a92 100644
--- a/web/react/components/channel_loader.jsx
+++ b/web/react/components/channel_loader.jsx
@@ -30,19 +30,14 @@ export default class ChannelLoader extends React.Component {
         AsyncClient.getChannels(true, true);
         AsyncClient.getChannelExtraInfo(true);
         AsyncClient.findTeams();
-        AsyncClient.getStatuses();
         AsyncClient.getMyTeam();
+        setTimeout(() => AsyncClient.getStatuses(), 3000); // temporary until statuses are reworked a bit
 
         /* Perform pending post clean-up */
         PostStore.clearPendingPosts();
 
         /* Set up interval functions */
-        this.intervalId = setInterval(
-            () => {
-                AsyncClient.getStatuses();
-            },
-            30000
-        );
+        this.intervalId = setInterval(() => AsyncClient.getStatuses(), 30000);
 
         /* Device tracking setup */
         var iOS = (/(iPad|iPhone|iPod)/g).test(navigator.userAgent);
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index e47ba6edf..aab9919a4 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -113,6 +113,9 @@ export default class Sidebar extends React.Component {
         for (var i = 0; i < directChannels.length; i++) {
             const dm = directChannels[i];
             const teammate = Utils.getDirectTeammate(dm.id);
+            if (!teammate) {
+                continue;
+            }
 
             const member = members[dm.id];
             const msgCount = dm.total_msg_count - member.msg_count;
-- 
cgit v1.2.3-1-g7c22