1 files changed, 12 insertions, 7 deletions
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 87b9cab04..b81936b57 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -8,6 +8,7 @@ const SocketStore = require('../stores/socket_store.jsx');
 const NavbarSearchBox = require('./search_bar.jsx');
 const AsyncClient = require('../utils/async_client.jsx');
 const Client = require('../utils/client.jsx');
+const TextFormatting = require('../utils/text_formatting.jsx');
 const Utils = require('../utils/utils.jsx');
 const MessageWrapper = require('./message_wrapper.jsx');
 const PopoverListMembers = require('./popover_list_members.jsx');
@@ -54,7 +55,7 @@ export default class ChannelHeader extends React.Component {
         if (!Utils.areStatesEqual(newState, this.state)) {
             this.setState(newState);
         }
-        $('.channel-header__info .description').popover({placement: 'bottom', trigger: 'hover click', html: true, delay: {show: 500, hide: 500}});
+        $('.channel-header__info .description').popover({placement: 'bottom', trigger: 'hover', html: true, delay: {show: 500, hide: 500}});
     }
     onSocketChange(msg) {
         if (msg.action === 'new_user') {
@@ -64,9 +65,14 @@ export default class ChannelHeader extends React.Component {
     handleLeave() {
         Client.leaveChannel(this.state.channel.id,
             function handleLeaveSuccess() {
+                AppDispatcher.handleViewAction({
+                    type: ActionTypes.LEAVE_CHANNEL,
+                    id: this.state.channel.id
+                });
+
                 const townsquare = ChannelStore.getByName('town-square');
                 Utils.switchChannel(townsquare);
-            },
+            }.bind(this),
             function handleLeaveError(err) {
                 AsyncClient.dispatchError(err, 'handleLeave');
             }
@@ -102,11 +108,10 @@ export default class ChannelHeader extends React.Component {
         }
 
         const channel = this.state.channel;
-        const description = Utils.textToJsx(channel.description, {singleline: true, noMentionHighlight: true});
         const popoverContent = React.renderToString(<MessageWrapper message={channel.description}/>);
         let channelTitle = channel.display_name;
         const currentId = UserStore.getCurrentId();
-        const isAdmin = this.state.memberChannel.roles.indexOf('admin') > -1 || this.state.memberTeam.roles.indexOf('admin') > -1;
+        const isAdmin = Utils.isAdmin(this.state.memberChannel.roles) || Utils.isAdmin(this.state.memberTeam.roles);
         const isDirect = (this.state.channel.type === 'D');
 
         if (isDirect) {
@@ -321,9 +326,9 @@ export default class ChannelHeader extends React.Component {
                                 data-toggle='popover'
                                 data-content={popoverContent}
                                 className='description'
-                            >
-                                {description}
-                            </div>
+                                onClick={TextFormatting.handleClick}
+                                dangerouslySetInnerHTML={{__html: TextFormatting.formatText(channel.description, {singleline: true, mentionHighlight: false})}}
+                            />
                         </div>
                     </th>
                     <th>