Merge branch 'release-3.5'

1 files changed, 4 insertions, 2 deletions

diff --git a/webapp/stores/channel_store.jsx b/webapp/stores/channel_store.jsx
index 136423d45..d578a5d29 100644
--- a/webapp/stores/channel_store.jsx
+++ b/webapp/stores/channel_store.jsx
@@ -59,8 +59,8 @@ class ChannelStoreClass extends EventEmitter {
         this.removeListener(STATS_EVENT, callback);
     }
 
-    emitLastViewed(lastViewed, ownNewMessage) {
-        this.emit(LAST_VIEVED_EVENT, lastViewed, ownNewMessage);
+    emitLastViewed() {
+        this.emit(LAST_VIEVED_EVENT);
     }
 
     addLastViewedListener(callback) {
@@ -373,6 +373,7 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
         }
         ChannelStore.setUnreadCountsByMembers(action.members);
         ChannelStore.emitChange();
+        ChannelStore.emitLastViewed();
         break;
     case ActionTypes.RECEIVED_CHANNEL_MEMBER:
         ChannelStore.storeMyChannelMember(action.member);
@@ -382,6 +383,7 @@ ChannelStore.dispatchToken = AppDispatcher.register((payload) => {
         }
         ChannelStore.setUnreadCountsByCurrentMembers();
         ChannelStore.emitChange();
+        ChannelStore.emitLastViewed();
         break;
     case ActionTypes.RECEIVED_MORE_CHANNELS:
         ChannelStore.storeMoreChannels(action.channels);