- Undo bad merge changing name of validateEmail function

- Move loading of capcha js to final step
- add in onload and onerror callbacks for catpcha js loading

src/components/join-flow/email-step.jsx

@@ -19,10 +19,12 @@ class EmailStep extends React.Component {
         bindAll(this, [
             'handleSetEmailRef',
             'handleValidSubmit',
-            'validateEmailIfPresent',
+            'validateEmail',
             'validateForm',
             'setCaptchaRef',
-            'captchaSolved'
+            'captchaSolved',
+            'onCaptchaLoad',
+            'onCaptchaError'
         ]);
     }
 
@@ -31,12 +33,11 @@ class EmailStep extends React.Component {
         if (this.emailInput) this.emailInput.focus();
         this.grecaptcha = window.grecaptcha;
         if (!this.grecaptcha) {
-            // Captcha doesn't exist on the window. There must have been a
-            // problem downloading the script. There isn't much we can do about it though.
-            // TODO: put up the error screen when we have it.
-            return;
+            // According to the reCaptcha documentation, this callback shouldn't get
+            // called unless window.grecaptcha exists. This is just here to be extra defensive.
+            // TODO: Put up the error screen when we have one.
         }
-        // TODO: Add in error callback for this once we have an error screen.
+        // TODO: Add in error callback for render once we have an error screen.
         this.widgetId = this.grecaptcha.render(this.captchaRef,
             {
                 callback: this.captchaSolved,

src/components/join-flow/join-flow.jsx

@@ -30,15 +30,6 @@ class JoinFlow extends React.Component {
         };
     }
 
-    componentDidMount () {
-        // Load Google Captcha script so that it is ready to go when we get to
-        // the last step.
-        const script = document.createElement('script');
-        script.src = `https://www.recaptcha.net/recaptcha/api.js?render=explicit&hl=${window._locale}`;
-        script.async = true;
-        document.body.appendChild(script);
-    }
-
     handleAdvanceStep (formData) {
         formData = formData || {};
         this.setState({