From d75cb0294896e0e45f280cbccde8581376d501ce Mon Sep 17 00:00:00 2001 From: Joram Wilander Date: Fri, 6 May 2016 08:06:34 -0400 Subject: Multiple cross-team functionality fixes (#2902) --- webapp/stores/notification_store.jsx | 2 +- webapp/stores/user_store.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'webapp/stores') diff --git a/webapp/stores/notification_store.jsx b/webapp/stores/notification_store.jsx index 6722af281..7d7039780 100644 --- a/webapp/stores/notification_store.jsx +++ b/webapp/stores/notification_store.jsx @@ -43,7 +43,7 @@ class NotificationStoreClass extends EventEmitter { if (notifyLevel === 'none') { return; - } else if (notifyLevel === 'mention' && mentions.indexOf(user.id) === -1 && channel.type !== Constants.DM_CHANNEL) { + } else if (notifyLevel === 'mention' && mentions.indexOf(user.id) === -1 && msgProps.channel_type !== Constants.DM_CHANNEL) { return; } diff --git a/webapp/stores/user_store.jsx b/webapp/stores/user_store.jsx index 5a27d15ea..2d792fa17 100644 --- a/webapp/stores/user_store.jsx +++ b/webapp/stores/user_store.jsx @@ -111,7 +111,7 @@ class UserStoreClass extends EventEmitter { } hasProfile(userId) { - return this.getProfiles()[userId] != null; + return this.getProfile(userId) != null; } getProfile(userId) { -- cgit v1.2.3-1-g7c22