diff --git a/app/components/channel_drawer/channel_drawer.js b/app/components/channel_drawer/channel_drawer.js index 9c254c69d..7d5a890cb 100644 --- a/app/components/channel_drawer/channel_drawer.js +++ b/app/components/channel_drawer/channel_drawer.js @@ -18,7 +18,7 @@ import ChannelsList from './channels_list'; import DrawerSwiper from './drawer_swipper'; import TeamsList from './teams_list'; -import {General} from 'mattermost-redux/constants'; +import {General, WebsocketEvents} from 'mattermost-redux/constants'; import EventEmitter from 'mattermost-redux/utils/event_emitter'; const DRAWER_INITIAL_OFFSET = 40; @@ -70,6 +70,7 @@ export default class ChannelDrawer extends PureComponent { componentDidMount() { EventEmitter.on('open_channel_drawer', this.openChannelDrawer); EventEmitter.on('close_channel_drawer', this.closeChannelDrawer); + EventEmitter.on(WebsocketEvents.CHANNEL_UPDATED, this.handleUpdateTitle); BackHandler.addEventListener('hardwareBackPress', this.handleAndroidBack); } @@ -87,6 +88,7 @@ export default class ChannelDrawer extends PureComponent { componentWillUnmount() { EventEmitter.off('open_channel_drawer', this.openChannelDrawer); EventEmitter.off('close_channel_drawer', this.closeChannelDrawer); + EventEmitter.off(WebsocketEvents.CHANNEL_UPDATED, this.handleUpdateTitle); BackHandler.removeEventListener('hardwareBackPress', this.handleAndroidBack); } @@ -151,6 +153,14 @@ export default class ChannelDrawer extends PureComponent { }; }; + handleUpdateTitle = (channel) => { + let channelName = ''; + if (channel.display_name) { + channelName = channel.display_name; + } + this.props.actions.setChannelDisplayName(channelName); + }; + openChannelDrawer = () => { this.props.blurPostTextBox(); diff --git a/yarn.lock b/yarn.lock index 2b0686dda..55ca80ee0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3878,7 +3878,7 @@ makeerror@1.0.x: mattermost-redux@mattermost/mattermost-redux#master: version "0.0.1" - resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/c6115b3cfa934ed97a60a10727fa487df39a4043" + resolved "https://codeload.github.com/mattermost/mattermost-redux/tar.gz/850e7df06cd7dcae7e592f78ca7bbdd6ab2ec56a" dependencies: deep-equal "1.0.1" harmony-reflect "1.5.1"