diff options
-rw-r--r-- | webapp/components/channel_header.jsx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx index c05033b51..6ce56ab4e 100644 --- a/webapp/components/channel_header.jsx +++ b/webapp/components/channel_header.jsx @@ -499,16 +499,16 @@ export default class ChannelHeader extends React.Component { </li> ); - dropdownContents.push( - <li - key='divider-1' - className='divider' - /> - ); - if (!ChannelStore.isDefault(channel)) { dropdownContents.push( <li + key='divider-1' + className='divider' + /> + ); + + dropdownContents.push( + <li id='channelAddMembers' key='add_members' role='presentation' @@ -547,13 +547,6 @@ export default class ChannelHeader extends React.Component { ); } - dropdownContents.push( - <li - key='divider-2' - className='divider' - /> - ); - const deleteOption = ( <li id='channelDelete' @@ -579,6 +572,13 @@ export default class ChannelHeader extends React.Component { if (ChannelUtils.showManagementOptions(channel, isAdmin, isSystemAdmin, isChannelAdmin)) { dropdownContents.push( <li + key='divider-2' + className='divider' + /> + ); + + dropdownContents.push( + <li id='channelEditHeader' key='set_channel_header' role='presentation' @@ -652,17 +652,17 @@ export default class ChannelHeader extends React.Component { dropdownContents.push(deleteOption); } - dropdownContents.push( - <li - key='divider-3' - className='divider' - /> - ); - const canLeave = channel.type === Constants.PRIVATE_CHANNEL ? this.state.userCount > 1 : true; if (!ChannelStore.isDefault(channel) && canLeave) { dropdownContents.push( <li + key='divider-3' + className='divider' + /> + ); + + dropdownContents.push( + <li id='channelLeave' key='leave_channel' role='presentation' |