Merge remote-tracking branch 'trigger/MC-42198' into MC-42177

Author: xmav

app/code/Magento/Paypal/view/frontend/web/js/view/amountProviders/product.js

@@ -25,6 +25,7 @@ define([
         },
         qty: 1,
         price: 0,
+        priceType: '',
 
         /**
          * Initialize
@@ -41,9 +42,10 @@ define([
 
             if (priceBox.priceBox('option') &&
                 priceBox.priceBox('option').prices &&
-                priceBox.priceBox('option').prices.finalPrice
+                (priceBox.priceBox('option').prices.finalPrice || priceBox.priceBox('option').prices.basePrice)
             ) {
-                this.price = priceBox.priceBox('option').prices.finalPrice.amount;
+                this.priceType = priceBox.priceBox('option').prices.finalPrice ? 'finalPrice' : 'basePrice';
+                this.price = priceBox.priceBox('option').prices[this.priceType]['amount'];
             }
 
             $(this.qtyFieldSelector).on('change', this._onQtyChange.bind(this));
@@ -74,7 +76,7 @@ define([
          * @private
          */
         _onPriceChange: function (event, data) {
-            this.price = data.finalPrice.amount;
+            this.price = data[this.priceType]['amount'];
             this._updateAmount();
         },