ACP2E-2509: JS errors on login form when re-captcha enabled

Author: bubasuma

ReCaptchaFrontendUi/view/frontend/web/js/reCaptcha.js

@@ -73,8 +73,14 @@ define(
              * @param {String} token
              */
             reCaptchaCallback: function (token) {
+                var submitButton;
+
                 if (this.getIsInvisibleRecaptcha()) {
                     this.tokenField.value = token;
+                    submitButton = this.$parentForm.find('button:not([type]), [type=submit]');
+                    if (submitButton.length) { //eslint-disable-line max-depth
+                        submitButton.attr('disabled', false);
+                    }
                     this.$parentForm.submit();
                 }
             },
@@ -155,18 +161,17 @@ define(
 
                 if (this.getIsInvisibleRecaptcha() && parentForm.length > 0) {
                     parentForm.submit(function (event) {
+                        var submitButton;
+
                         if (!this.tokenField.value) {
+                            submitButton = this.$parentForm.find('button:not([type]), [type=submit]');
+                            if (submitButton.length) { //eslint-disable-line max-depth
+                                submitButton.attr('disabled', true);
+                            }
                             // eslint-disable-next-line no-undef
                             grecaptcha.execute(widgetId);
                             event.preventDefault(event);
                             event.stopImmediatePropagation();
-                            if (this.$parentForm.valid()) {
-                                let formSubmitButton = this.$parentForm.find('button:not([type]), [type=submit]');
-
-                                if (formSubmitButton.length) { //eslint-disable-line max-depth
-                                    formSubmitButton.attr('disabled', true);
-                                }
-                            }
                         }
                     }.bind(this));