1 files changed, 13 insertions, 15 deletions

diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx
index f6c0c8adb..1f268a2f7 100644
--- a/web/react/components/sidebar_right_menu.jsx
+++ b/web/react/components/sidebar_right_menu.jsx
@@ -1,11 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-import InviteMemberModal from './invite_member_modal.jsx';
+import TeamMembersModal from './team_members_modal.jsx';
+import ToggleModalButton from './toggle_modal_button.jsx';
 import UserSettingsModal from './user_settings/user_settings_modal.jsx';
 import UserStore from '../stores/user_store.jsx';
-import TeamStore from '../stores/team_store.jsx';
 import * as client from '../utils/client.jsx';
+import * as EventHelpers from '../dispatcher/event_helpers.jsx';
 import * as utils from '../utils/utils.jsx';
 
 export default class SidebarRightMenu extends React.Component {
@@ -46,7 +47,7 @@ export default class SidebarRightMenu extends React.Component {
                 <li>
                     <a
                         href='#'
-                        onClick={InviteMemberModal.show}
+                        onClick={EventHelpers.showInviteMemberModal}
                     >
                         <i className='fa fa-user'></i>Invite New Member
                     </a>
@@ -56,12 +57,12 @@ export default class SidebarRightMenu extends React.Component {
             if (this.props.teamType === 'O') {
                 teamLink = (
                     <li>
-                        <a href='#'
-                            data-toggle='modal'
-                            data-target='#get_link'
-                            data-title='Team Invite'
-                            data-value={utils.getWindowLocationOrigin() + '/signup_user_complete/?id=' + TeamStore.getCurrent().invite_id}
-                        ><i className='fa fa-link'></i>Get Team Invite Link</a>
+                        <a
+                            href='#'
+                            onClick={EventHelpers.showGetTeamInviteLinkModal}
+                        >
+                            <i className='glyphicon glyphicon-link'></i>{'Get Team Invite Link'}
+                        </a>
                     </li>
                 );
             }
@@ -79,12 +80,9 @@ export default class SidebarRightMenu extends React.Component {
             );
             manageLink = (
                 <li>
-                    <a
-                        href='#'
-                        data-toggle='modal'
-                        data-target='#team_members'
-                    >
-                    <i className='fa fa-users'></i>Manage Members</a>
+                    <ToggleModalButton dialogType={TeamMembersModal}>
+                        <i className='fa fa-users'></i>{'Manage Members'}
+                    </ToggleModalButton>
                 </li>
             );
         }