diff --git a/src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js b/src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js index b3ede40b4..495d16f8d 100644 --- a/src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js +++ b/src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js @@ -436,7 +436,7 @@ class AssignmentsTable extends Component { defaultMessage="(supervisors and students of this group)" /> } - inModal + displayAs="modal" /> )} diff --git a/src/components/widgets/Comments/CommentBox/CommentBox.js b/src/components/widgets/Comments/CommentBox/CommentBox.js index df48bf112..59ec18527 100644 --- a/src/components/widgets/Comments/CommentBox/CommentBox.js +++ b/src/components/widgets/Comments/CommentBox/CommentBox.js @@ -5,10 +5,11 @@ import { Modal } from 'react-bootstrap'; import classnames from 'classnames'; import Box from '../../Box'; +import Icon, { ChatIcon } from '../../../icons'; import styles from '../comments.less'; class CommentBox extends Component { - state = { prevCount: 0 }; + state = { prevCount: 0, panelOpen: false }; componentDidMount() { setTimeout(() => this.scrollToBottom(), 10); @@ -29,10 +30,17 @@ class CommentBox extends Component { } }; + openPanel = () => this.setState({ panelOpen: true }); + closePanel = () => this.setState({ panelOpen: false }); + renderMessages() { return (