1 files changed, 7 insertions, 29 deletions

diff --git a/web/react/components/team_members_modal.jsx b/web/react/components/team_members_modal.jsx
index dfd48b614..9bdb16438 100644
--- a/web/react/components/team_members_modal.jsx
+++ b/web/react/components/team_members_modal.jsx
@@ -3,43 +3,21 @@
 
 import MemberListTeam from './member_list_team.jsx';
 import TeamStore from '../stores/team_store.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 import {FormattedMessage} from 'mm-intl';
 
 const Modal = ReactBootstrap.Modal;
 
 export default class TeamMembersModal extends React.Component {
-    constructor(props) {
-        super(props);
-
-        this.onShow = this.onShow.bind(this);
-    }
-
-    componentDidMount() {
-        if (this.props.show) {
-            this.onShow();
-        }
-    }
-
-    componentDidUpdate(prevProps) {
-        if (this.props.show && !prevProps.show) {
-            this.onShow();
-        }
-    }
-
-    onShow() {
-        // TODO ugh
-        /*if ($(window).width() > 768) {
-            $(ReactDOM.findDOMNode(this.refs.modalBody)).perfectScrollbar();
-            $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 200);
-        } else {
-            $(ReactDOM.findDOMNode(this.refs.modalBody)).css('max-height', $(window).height() - 150);
-        }*/
-    }
-
     render() {
         const team = TeamStore.getCurrent();
 
+        let maxHeight = 1000;
+        if (Utils.windowHeight() <= 1200) {
+            maxHeight = Utils.windowHeight() - 300;
+        }
+
         return (
             <Modal
                 dialogClassName='more-modal'
@@ -56,7 +34,7 @@ export default class TeamMembersModal extends React.Component {
                     />
                 </Modal.Header>
                 <Modal.Body>
-                    <MemberListTeam/>
+                    <MemberListTeam style={{maxHeight}}/>
                 </Modal.Body>
                 <Modal.Footer>
                     <button