ACP2E-1338: Google reCaptcha in Incorrect position

Author: bubasuma

ReCaptchaCheckout/view/frontend/web/js/reCaptchaCheckout.js

@@ -3,9 +3,6 @@
  * See COPYING.txt for license details.
  */
 
-// jscs:disable jsDoc
-
-/* global grecaptcha */
 define(
     [
         'Magento_ReCaptchaWebapiUi/js/webapiReCaptcha',
@@ -22,23 +19,36 @@ define(
 
             /**
              * Render reCAPTCHA
+             *
+             * @param {Object} method
              */
-            renderReCaptchaForPayment: function (method) {
+            renderReCaptchaFor: function (method) {
                 var reCaptcha;
 
-                if (!this.skipPayments || !this.skipPayments.hasOwnProperty(method.getCode())) {
-                    reCaptcha = $.extend({}, this);
-
-                    reCaptcha.reCaptchaId = this.getPaymentReCaptchaId(method);
+                if (this.isCheckoutReCaptchaRequiredFor(method)) {
+                    reCaptcha = $.extend(true, {}, this, {reCaptchaId: this.getReCaptchaIdFor(method)});
                     reCaptcha.renderReCaptcha();
                 }
             },
 
             /**
-             * Render reCAPTCHA
+             * Get reCAPTCHA ID
+             *
+             * @param {Object} method
+             * @returns {String}
              */
-            getPaymentReCaptchaId: function (method) {
+            getReCaptchaIdFor: function (method) {
                 return this.getReCaptchaId() + '-' + method.getCode();
+            },
+
+            /**
+             * Check whether checkout reCAPTCHA is required for payment method
+             *
+             * @param {Object} method
+             * @returns {Boolean}
+             */
+            isCheckoutReCaptchaRequiredFor: function (method) {
+                return !this.skipPayments || !this.skipPayments.hasOwnProperty(method.getCode());
             }
         });
     }

ReCaptchaCheckout/view/frontend/web/template/reCaptcha.html

@@ -4,12 +4,12 @@
  * See COPYING.txt for license details.
  */
  -->
-
+<!-- ko if: (isCheckoutReCaptchaRequiredFor($parents[1]))-->
 <div data-bind="{
     attr: {
-        'id': getPaymentReCaptchaId($parents[1]) + '-wrapper'
+        'id': getReCaptchaIdFor($parents[1]) + '-wrapper'
     },
-    'afterRender': renderReCaptchaForPayment($parents[1])
+    'afterRender': renderReCaptchaFor($parents[1])
 }">
     <div class="g-recaptcha"></div>
     <!-- ko if: (!getIsInvisibleRecaptcha()) -->
@@ -25,3 +25,4 @@
     </div>
     <!-- /ko -->
 </div>
+<!-- /ko -->

ReCaptchaPaypal/Plugin/SkipPlaceOrderRecaptchaValidation.php

@@ -41,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * Skip captcha validation for "place order" button if captcha is enabled for payflow
+     * Skip captcha validation for "place order" button if captcha is enabled for payflowpro
      *
      * @param WebapiConfigProvider $subject
      * @param ValidationConfigInterface $result