Merge remote-tracking branch 'mpi/MAGETWO-53798' into MPI-PR-3005

Author: oshmyheliuk

app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml

@@ -27,7 +27,7 @@ $config = [
        data-locale="<?php /* @noEscape */ echo $block->getLocale(); ?>"
        data-amount="<?php /* @noEscape */ echo $block->getAmount(); ?>"
        id="<?php /* @noEscape */ echo $id; ?>"
-       class="action-braintree-paypal-logo">
+       class="action-braintree-paypal-logo" disabled>
         <img class="braintree-paypal-button-hidden"
              src="https://checkout.paypal.com/pwpp/2.17.6/images/pay-with-paypal.png"
              alt="Pay with PayPal"/>

app/code/Magento/Braintree/view/frontend/web/js/paypal/button.js

@@ -4,6 +4,7 @@
  */
 define(
     [
+        'rjsResolver',
         'uiRegistry',
         'uiComponent',
         'underscore',
@@ -13,6 +14,7 @@ define(
         'domReady!'
     ],
     function (
+        resolver,
         registry,
         Component,
         _,
@@ -47,8 +49,10 @@ define(
                      * @param {Object} integration
                      */
                     onReady: function (integration) {
-                        registry.set(this.integrationName, integration);
-                        $('#' + this.id).removeAttr('disabled');
+                        resolver(function () {
+                            registry.set(this.integrationName, integration);
+                            $('#' + this.id).removeAttr('disabled');
+                        }, this);
                     },
 
                     /**