1 files changed, 38 insertions, 39 deletions

diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index a8d4ec100..ffe7cbb5d 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -5,8 +5,12 @@ const NavbarSearchBox = require('./search_bar.jsx');
 const MessageWrapper = require('./message_wrapper.jsx');
 const PopoverListMembers = require('./popover_list_members.jsx');
 const EditChannelPurposeModal = require('./edit_channel_purpose_modal.jsx');
+const ChannelInfoModal = require('./channel_info_modal.jsx');
 const ChannelInviteModal = require('./channel_invite_modal.jsx');
 const ChannelMembersModal = require('./channel_members_modal.jsx');
+const ChannelNotificationsModal = require('./channel_notifications_modal.jsx');
+const DeleteChannelModal = require('./delete_channel_modal.jsx');
+const ToggleModalButton = require('./toggle_modal_button.jsx');
 
 const ChannelStore = require('../stores/channel_store.jsx');
 const UserStore = require('../stores/user_store.jsx');
@@ -180,15 +184,13 @@ export default class ChannelHeader extends React.Component {
                     key='view_info'
                     role='presentation'
                 >
-                    <a
+                    <ToggleModalButton
                         role='menuitem'
-                        data-toggle='modal'
-                        data-target='#channel_info'
-                        data-channelid={channel.id}
-                        href='#'
+                        dialogType={ChannelInfoModal}
+                        dialogProps={{channel}}
                     >
                         {'View Info'}
-                    </a>
+                    </ToggleModalButton>
                 </li>
             );
 
@@ -263,58 +265,55 @@ export default class ChannelHeader extends React.Component {
                     key='notification_preferences'
                     role='presentation'
                 >
-                    <a
+                    <ToggleModalButton
                         role='menuitem'
-                        href='#'
-                        data-toggle='modal'
-                        data-target='#channel_notifications'
-                        data-title={channel.display_name}
-                        data-channelid={channel.id}
+                        dialogType={ChannelNotificationsModal}
+                        dialogProps={{channel}}
                     >
                         {'Notification Preferences'}
-                    </a>
+                    </ToggleModalButton>
                 </li>
             );
 
-            if (!ChannelStore.isDefault(channel)) {
-                if (isAdmin) {
-                    dropdownContents.push(
-                        <li
-                            key='rename_channel'
-                            role='presentation'
+            if (isAdmin) {
+                dropdownContents.push(
+                    <li
+                        key='rename_channel'
+                        role='presentation'
+                    >
+                        <a
+                            role='menuitem'
+                            href='#'
+                            data-toggle='modal'
+                            data-target='#rename_channel'
+                            data-display={channel.display_name}
+                            data-name={channel.name}
+                            data-channelid={channel.id}
                         >
-                            <a
-                                role='menuitem'
-                                href='#'
-                                data-toggle='modal'
-                                data-target='#rename_channel'
-                                data-display={channel.display_name}
-                                data-name={channel.name}
-                                data-channelid={channel.id}
-                            >
-                                {'Rename '}{channelTerm}{'...'}
-                            </a>
-                        </li>
-                    );
+                            {'Rename '}{channelTerm}{'...'}
+                        </a>
+                    </li>
+                );
+
+                if (!ChannelStore.isDefault(channel)) {
                     dropdownContents.push(
                         <li
                             key='delete_channel'
                             role='presentation'
                         >
-                            <a
+                            <ToggleModalButton
                                 role='menuitem'
-                                href='#'
-                                data-toggle='modal'
-                                data-target='#delete_channel'
-                                data-title={channel.display_name}
-                                data-channelid={channel.id}
+                                dialogType={DeleteChannelModal}
+                                dialogProps={{channel}}
                             >
                                 {'Delete '}{channelTerm}{'...'}
-                            </a>
+                            </ToggleModalButton>
                         </li>
                     );
                 }
+            }
 
+            if (!ChannelStore.isDefault(channel)) {
                 dropdownContents.push(
                     <li
                         key='leave_channel'