with hasBlockers

plugins/talk-plugin-auth/client/login/components/SignUp.js

@@ -43,13 +43,15 @@ class SignUp extends React.Component {
       errorMessage,
       requireEmailConfirmation,
       success,
-      enableSubmitSignUpForm,
-      disableSubmitSignUpForm,
+      indicateBlockerOn,
+      indicateBlockerOff,
+      hasBlockers,
     } = this.props;
 
     const slotPassthrough = {
-      enableSubmitSignUpForm,
-      disableSubmitSignUpForm,
+      indicateBlockerOn,
+      indicateBlockerOff,
+      hasBlockers,
     };
 
     return (
@@ -122,7 +124,7 @@ class SignUp extends React.Component {
                   id="coralSignUpButton"
                   className={styles.button}
                   full
-                  disabled={!this.props.submitSignUpForm}
+                  disabled={hasBlockers.length}
                 >
                   {t('talk-plugin-auth.login.sign_up')}
                 </Button>
@@ -174,9 +176,9 @@ SignUp.propTypes = {
   errorMessage: PropTypes.string,
   requireEmailConfirmation: PropTypes.bool.isRequired,
   success: PropTypes.bool.isRequired,
-  enableSubmitSignUpForm: PropTypes.func.isRequired,
-  disableSubmitSignUpForm: PropTypes.func.isRequired,
-  submitSignUpForm: PropTypes.bool.isRequired,
+  hasBlockers: PropTypes.array.isRequired,
+  indicateBlockerOn: PropTypes.func.isRequired,
+  indicateBlockerOff: PropTypes.func.isRequired,
 };
 
 export default SignUp;

plugins/talk-plugin-auth/client/login/containers/SignUp.js

@@ -5,13 +5,7 @@ import { compose } from 'recompose';
 import SignUp from '../components/SignUp';
 import { bindActionCreators } from 'redux';
 import * as views from '../enums/views';
-import {
-  setView,
-  setEmail,
-  setPassword,
-  enableSubmitSignUpForm,
-  disableSubmitSignUpForm,
-} from '../actions';
+import { setView, setEmail, setPassword } from '../actions';
 import { t } from 'plugin-api/beta/client/services';
 
 class SignUpContainer extends Component {
@@ -32,7 +26,7 @@ class SignUpContainer extends Component {
 
   indicateBlockerOff = plugin =>
     this.setState(state => ({
-      hasNotifications: state.hasNotifications.filter(i => i !== plugin),
+      hasBlockers: state.hasBlockers.filter(i => i !== plugin),
     }));
 
   validate = data => {
@@ -93,9 +87,9 @@ class SignUpContainer extends Component {
   render() {
     return (
       <SignUp
-        enableSubmitSignUpForm={this.props.enableSubmitSignUpForm}
-        disableSubmitSignUpForm={this.props.disableSubmitSignUpForm}
-        submitSignUpForm={this.props.submitSignUpForm}
+        indicateBlockerOn={this.indicateBlockerOn}
+        indicateBlockerOff={this.indicateBlockerOff}
+        hasBlockers={this.state.hasBlockers}
         onSubmit={this.handleSubmit}
         onUsernameChange={this.setUsername}
         onEmailChange={this.props.setEmail}
@@ -133,15 +127,11 @@ SignUpContainer.propTypes = {
   requireEmailConfirmation: PropTypes.bool.isRequired,
   success: PropTypes.bool.isRequired,
   validate: PropTypes.func.isRequired,
-  submitSignUpForm: PropTypes.bool.isRequired,
-  enableSubmitSignUpForm: PropTypes.func.isRequired,
-  disableSubmitSignUpForm: PropTypes.func.isRequired,
 };
 
 const mapStateToProps = ({ talkPluginAuth: state }) => ({
   email: state.email,
   password: state.password,
-  submitSignUpForm: state.submitSignUpForm,
 });
 
 const mapDispatchToProps = dispatch =>
@@ -150,8 +140,6 @@ const mapDispatchToProps = dispatch =>
       setView,
       setEmail,
       setPassword,
-      enableSubmitSignUpForm,
-      disableSubmitSignUpForm,
     },
     dispatch
   );