3 files changed, 8 insertions, 12 deletions

diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx
index eaa1c8255..55c0b5438 100644
--- a/web/react/components/channel_notifications.jsx
+++ b/web/react/components/channel_notifications.jsx
@@ -42,7 +42,7 @@ export default class ChannelNotifications extends React.Component {
 
             const member = ChannelStore.getMember(channelId);
             var notifyLevel = member.notify_level;
-            var markUnreadLevel = member.mark_unread_level;
+            var markUnreadLevel = member.notify_props.mark_unread;
 
             this.setState({
                 notifyLevel,
@@ -63,7 +63,7 @@ export default class ChannelNotifications extends React.Component {
 
         const member = ChannelStore.getMember(this.state.channelId);
         var notifyLevel = member.notify_level;
-        var markUnreadLevel = member.mark_unread_level;
+        var markUnreadLevel = member.notify_props.mark_unread;
 
         var newState = this.state;
         newState.notifyLevel = notifyLevel;
@@ -249,7 +249,7 @@ export default class ChannelNotifications extends React.Component {
         const channelId = this.state.channelId;
         const markUnreadLevel = this.state.markUnreadLevel;
 
-        if (ChannelStore.getMember(channelId).mark_unread_level === markUnreadLevel) {
+        if (ChannelStore.getMember(channelId).notify_props.mark_unread === markUnreadLevel) {
             this.updateSection('');
             return;
         }
@@ -257,17 +257,13 @@ export default class ChannelNotifications extends React.Component {
         const data = {
             channel_id: channelId,
             user_id: UserStore.getCurrentId(),
-            mark_unread_level: markUnreadLevel
+            mark_unread: markUnreadLevel
         };
 
-        if (!data.mark_unread_level || data.mark_unread_level.length === 0) {
-            return;
-        }
-
-        Client.updateMarkUnreadLevel(data,
+        Client.updateNotifyProps(data,
             () => {
                 var member = ChannelStore.getMember(channelId);
-                member.mark_unread_level = markUnreadLevel;
+                member.notify_props.mark_unread = markUnreadLevel;
                 ChannelStore.setChannelMember(member);
                 this.updateSection('');
             },
diff --git a/web/react/components/notify_counts.jsx b/web/react/components/notify_counts.jsx
index 3df661d70..f34b4669f 100644
--- a/web/react/components/notify_counts.jsx
+++ b/web/react/components/notify_counts.jsx
@@ -15,7 +15,7 @@ function getCountsStateFromStores() {
             count += channel.total_msg_count - channelMember.msg_count;
         } else if (channelMember.mention_count > 0) {
             count += channelMember.mention_count;
-        } else if (channelMember.mark_unread_level !== 'mention' && channel.total_msg_count - channelMember.msg_count > 0) {
+        } else if (channelMember.notify_props.mark_unread !== 'mention' && channel.total_msg_count - channelMember.msg_count > 0) {
             count += 1;
         }
     });
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 5a4fb1169..821d7fd4a 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -334,7 +334,7 @@ export default class Sidebar extends React.Component {
         var unread = false;
         if (channelMember) {
             msgCount = channel.total_msg_count - channelMember.msg_count;
-            unread = (msgCount > 0 && channelMember.mark_unread_level !== 'mention') || channelMember.mention_count > 0;
+            unread = (msgCount > 0 && channelMember.notify_props.mark_unread !== 'mention') || channelMember.mention_count > 0;
         }
 
         var titleClass = '';