merge magento/2.3-develop into magento-honey-badgers/MAGETWO-90971

Author: Magento CICD

app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

@@ -7,6 +7,7 @@
 define([
     'jquery',
     'underscore',
+    'mage/utils/wrapper',
     'Magento_Checkout/js/view/payment/default',
     'Magento_Braintree/js/view/payment/adapter',
     'Magento_Checkout/js/model/quote',
@@ -18,6 +19,7 @@ define([
 ], function (
     $,
     _,
+    wrapper,
     Component,
     Braintree,
     quote,
@@ -218,8 +220,9 @@ define([
 
         /**
          * Re-init PayPal Auth Flow
+         * @param {Function} callback - Optional callback
          */
-        reInitPayPal: function () {
+        reInitPayPal: function (callback) {
             if (Braintree.checkout) {
                 Braintree.checkout.teardown(function () {
                     Braintree.checkout = null;
@@ -228,6 +231,18 @@ define([
 
             this.disableButton();
             this.clientConfig.paypal.amount = this.grandTotalAmount;
+            this.clientConfig.paypal.shippingAddressOverride = this.getShippingAddress();
+
+            if (callback) {
+                this.clientConfig.onReady = wrapper.wrap(
+                    this.clientConfig.onReady,
+                    function (original, checkout) {
+                        this.clientConfig.onReady = original;
+                        original(checkout);
+                        callback();
+                    }.bind(this)
+                );
+            }
 
             Braintree.setConfig(this.clientConfig);
             Braintree.setup();
@@ -403,15 +418,19 @@ define([
          * Triggers when customer click "Continue to PayPal" button
          */
         payWithPayPal: function () {
-            if (additionalValidators.validate()) {
+            this.reInitPayPal(function () {
+                if (!additionalValidators.validate()) {
+                    return;
+                }
+
                 try {
                     Braintree.checkout.paypal.initAuthFlow();
                 } catch (e) {
                     this.messageContainer.addErrorMessage({
                         message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
                     });
                 }
-            }
+            }.bind(this));
         },
 
         /**

app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html

@@ -12,7 +12,7 @@
                data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
         <label class="label" data-bind="attr: {'for': getCode()}">
             <!-- PayPal Logo -->
-            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')}, title: $t('Acceptance Mark')}"
+            <img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark'), title: $t('Acceptance Mark')}"
                  class="payment-icon"/>
             <!-- PayPal Logo -->
             <span text="getTitle()"></span>

dev/tests/js/jasmine/tests/app/code/Magento/Braintree/frontend/js/view/payment/method-renderer/paypal.test.js

@@ -27,7 +27,24 @@ define([
                     })
                 },
                 'Magento_Braintree/js/view/payment/adapter': {
+                    config: {},
+
+                    /** Stub */
+                    onReady: function () {},
+
+                    /** Stub */
+                    setConfig: function (config) {
+                        this.config = config;
+                    },
+
+                    /** Stub */
+                    setup: function () {
+                        this.config.onReady(this.checkout);
+                    },
+
                     checkout: {
+                        /** Stub */
+                        teardown: function () {},
                         paypal: {
                             /** Stub */
                             initAuthFlow: function () {}