From 0811fd7149e4ae9e7f1bee41a98d66e8d98527d4 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Tue, 17 Sep 2019 09:00:58 -0300
Subject: [PATCH] Fix crash accessing property of undefined teammate

---
 .../sidebars/main/channels_list/channel_item/index.js       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/components/sidebars/main/channels_list/channel_item/index.js b/app/components/sidebars/main/channels_list/channel_item/index.js
index d4d655305..f79b7dedf 100644
--- a/app/components/sidebars/main/channels_list/channel_item/index.js
+++ b/app/components/sidebars/main/channels_list/channel_item/index.js
@@ -40,11 +40,11 @@ function makeMapStateToProps() {
             } else {
                 const teammateId = getUserIdFromChannelName(currentUserId, channel.name);
                 const teammate = getUser(state, teammateId);
-                isArchived = teammate.delete_at > 0;
                 const teammateNameDisplay = getTeammateNameDisplaySetting(state);
                 displayName = displayUsername(teammate, teammateNameDisplay, false);
-                if (teammate && teammate.is_bot) {
-                    isBot = true;
+                if (teammate) {
+                    isArchived = teammate.delete_at > 0;
+                    isBot = teammate.is_bot || false;
                 }
                 isGuest = isGuestUser(teammate);
             }