@@ -14,11 +27,11 @@ class IgnoredCommentTombstone extends React.Component {
padding: '1em',
color: '#3E4F71',
}}>
- {t('framework.comment_is_ignored')}
+ {this.getCopy()}
);
}
}
-export default IgnoredCommentTombstone;
+export default CommentTombstone;
diff --git a/client/coral-embed-stream/src/components/TopRightMenu.js b/client/coral-embed-stream/src/components/TopRightMenu.js
deleted file mode 100644
index fd4587356..000000000
--- a/client/coral-embed-stream/src/components/TopRightMenu.js
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import {IgnoreUserWizard} from './IgnoreUserWizard';
-import Toggleable from './Toggleable';
-
-// TopRightMenu appears as a dropdown in the top right of the comment.
-// when you click the down cehvron, it expands and shows IgnoreUserWizard
-// when you click 'cancel' in the wizard, it closes the menu
-export class TopRightMenu extends React.Component {
- static propTypes = {
-
- // comment on which this menu appears
- comment: PropTypes.shape({
- user: PropTypes.shape({
- id: PropTypes.string.isRequired,
- username: PropTypes.string.isRequired
- }).isRequired
- }).isRequired,
- ignoreUser: PropTypes.func,
-
- // show notification to the user (e.g. for errors)
- notify: PropTypes.func.isRequired,
- }
- constructor(props) {
- super(props);
- this.state = {
- timesReset: 0
- };
- }
- render() {
- const {comment, ignoreUser, notify} = this.props;
-
- // timesReset is used as Toggleable key so it re-renders on reset (closing the toggleable)
- const reset = () => this.setState({timesReset: this.state.timesReset + 1});
- const ignoreUserAndCloseMenuAndNotifyOnError = async ({id}) => {
-
- // close menu
- reset();
-
- // ignore user
- try {
- await ignoreUser({id});
- } catch (error) {
- notify('error', 'Failed to ignore user');
- throw error;
- }
- };
- return (
-