Merge pull request #587 from nickago/MM-1899

MM-1899 Added help text to channel notifications

1 files changed, 8 insertions, 0 deletions

diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx
index 173646597..83067240d 100644
--- a/web/react/components/channel_notifications.jsx
+++ b/web/react/components/channel_notifications.jsx
@@ -162,6 +162,13 @@ export default class ChannelNotifications extends React.Component {
                 e.preventDefault();
             }.bind(this);
 
+            let curChannel = ChannelStore.get(this.state.channelId);
+            let extraInfo = (<span>These settings will override the global notification settings</span>);
+
+            if (curChannel && curChannel.display_name) {
+                extraInfo = (<span>These settings will override the global notification settings for the <b>{curChannel.display_name}</b> channel</span>);
+            }
+
             return (
                 <SettingItemMax
                     title='Send desktop notifications'
@@ -169,6 +176,7 @@ export default class ChannelNotifications extends React.Component {
                     submit={this.handleUpdate}
                     server_error={serverError}
                     updateSection={handleUpdateSection}
+                    extraInfo={extraInfo}
                 />
             );
         }