PLT-5910: Fix Channel header menu in Town Square. (#5831)

webapp/components/channel_header.jsx

@@ -499,6 +499,7 @@ export default class ChannelHeader extends React.Component {
                 </li>
             );
 
+            if (!ChannelStore.isDefault(channel)) {
                 dropdownContents.push(
                     <li
                         key='divider-1'
@@ -506,7 +507,6 @@ export default class ChannelHeader extends React.Component {
                     />
                 );
 
-            if (!ChannelStore.isDefault(channel)) {
                 dropdownContents.push(
                     <li
                         id='channelAddMembers'
@@ -547,13 +547,6 @@ export default class ChannelHeader extends React.Component {
                 );
             }
 
-            dropdownContents.push(
-                <li
-                    key='divider-2'
-                    className='divider'
-                />
-            );
-
             const deleteOption = (
                 <li
                     id='channelDelete'
@@ -577,6 +570,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'
@@ -652,6 +652,8 @@ export default class ChannelHeader extends React.Component {
                 dropdownContents.push(deleteOption);
             }
 
+            const canLeave = channel.type === Constants.PRIVATE_CHANNEL ? this.state.userCount > 1 : true;
+            if (!ChannelStore.isDefault(channel) && canLeave) {
                 dropdownContents.push(
                     <li
                         key='divider-3'
@@ -659,8 +661,6 @@ export default class ChannelHeader extends React.Component {
                     />
                 );
 
-            const canLeave = channel.type === Constants.PRIVATE_CHANNEL ? this.state.userCount > 1 : true;
-            if (!ChannelStore.isDefault(channel) && canLeave) {
                 dropdownContents.push(
                     <li
                         id='channelLeave'