diff --git a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js index d2c888e9e..41988e216 100644 --- a/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js +++ b/client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js @@ -77,7 +77,11 @@ class ModerationContainer extends React.Component { const {comments} = this.props; const premodIds = comments.ids.filter(id => comments.byId[id].status === 'premod'); const rejectedIds = comments.ids.filter(id => comments.byId[id].status === 'rejected'); - const flaggedIds = comments.ids.filter(id => comments.byId[id].flagged === true); + const flaggedIds = comments.ids.filter(id => + comments.byId[id].flagged === true && + comments.byId[id].status !== 'rejected' && + comments.byId[id].status !== 'accepted' + ); return ( (/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(email)), - password: pass => (/^(?=.{8,}).*$/.test(pass)), + password: pass => !(/^(?=.{8,}).*$/.test(pass)), confirmPassword: () => true, displayName: displayName => (/^[a-z0-9_]+$/.test(displayName)) }; diff --git a/client/coral-sign-in/components/SignDialog.js b/client/coral-sign-in/components/SignDialog.js index 966870293..876d1ea82 100644 --- a/client/coral-sign-in/components/SignDialog.js +++ b/client/coral-sign-in/components/SignDialog.js @@ -3,7 +3,7 @@ import {Dialog} from 'coral-ui'; import styles from './styles.css'; import SignInContent from './SignInContent'; -import SingUpContent from './SignUpContent'; +import SignUpContent from './SignUpContent'; import ForgotContent from './ForgotContent'; const SignDialog = ({open, view, handleClose, offset, ...props}) => ( @@ -17,7 +17,7 @@ const SignDialog = ({open, view, handleClose, offset, ...props}) => ( }}> × {view === 'SIGNIN' && } - {view === 'SIGNUP' && } + {view === 'SIGNUP' && } {view === 'FORGOT' && } );