diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index c51dce0131..5ebe1b745f 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -462,6 +462,27 @@ export default class ChannelHeader extends React.Component { ); + if (ChannelStore.isDefault(channel)) { + dropdownContents.push( + + ); + } + dropdownContents.push(
  • this.setState({showMembersModal: false})} diff --git a/webapp/components/channel_members_dropdown.jsx b/webapp/components/channel_members_dropdown.jsx index decf97044d..e44108f3c0 100644 --- a/webapp/components/channel_members_dropdown.jsx +++ b/webapp/components/channel_members_dropdown.jsx @@ -10,6 +10,7 @@ import {removeUserFromChannel, makeUserChannelAdmin, makeUserChannelMember} from import * as AsyncClient from 'utils/async_client.jsx'; import * as Utils from 'utils/utils.jsx'; import {canManageMembers} from 'utils/channel_utils.jsx'; +import {Constants} from 'utils/constants.jsx'; import React from 'react'; import {FormattedMessage} from 'react-intl'; @@ -127,7 +128,7 @@ export default class ChannelMembersDropdown extends React.Component { } let removeFromChannel = null; - if (this.canRemoveMember()) { + if (this.canRemoveMember() && this.props.channel.name !== Constants.DEFAULT_CHANNEL) { removeFromChannel = (
  • ); - } else if (this.canRemoveMember()) { + } else if (this.canRemoveMember() && this.props.channel.name !== Constants.DEFAULT_CHANNEL) { return (