Merge remote-tracking branch 'origin/MAGETWO-92308' into 2.3-develop-pr24

Author: OlgaVasyltsun

app/code/Magento/Checkout/view/frontend/web/js/model/totals.js

@@ -14,20 +14,17 @@ define([
     'use strict';
 
     var quoteItems = ko.observable(quote.totals().items),
-        cartData = customerData.get('cart');
+        cartData = customerData.get('cart'),
+        quoteSubtotal = parseFloat(quote.totals().subtotal),
+        subtotalAmount = parseFloat(cartData().subtotalAmount);
 
     quote.totals.subscribe(function (newValue) {
         quoteItems(newValue.items);
     });
 
-    cartData.subscribe(function () {
-        var quoteSubtotal = parseFloat(quote.totals().subtotal),
-            subtotalAmount = parseFloat(cartData().subtotalAmount);
-
-        if (quoteSubtotal !== subtotalAmount) {
-            customerData.reload(['cart'], false);
-        }
-    }, this);
+    if (quoteSubtotal !== subtotalAmount) {
+        customerData.reload(['cart'], false);
+    }
 
     return {
         totals: quote.totals,

app/code/Magento/Checkout/view/frontend/web/js/view/minicart.js

@@ -94,17 +94,17 @@ define([
                 this.isLoading(addToCartCalls > 0);
                 sidebarInitialized = false;
                 this.update(updatedCart);
-
-                if (cartData()['website_id'] !== window.checkout.websiteId) {
-                    customerData.reload(['cart'], false);
-                }
                 initSidebar();
             }, this);
             $('[data-block="minicart"]').on('contentLoading', function () {
                 addToCartCalls++;
                 self.isLoading(true);
             });
 
+            if (cartData()['website_id'] !== window.checkout.websiteId) {
+                customerData.reload(['cart'], false);
+            }
+
             return this._super();
         },
         isLoading: ko.observable(false),

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -232,11 +232,9 @@ define([
             if (!_.isEmpty(privateContent)) {
                 countryData = this.get('directory-data');
 
-                countryData.subscribe(function () {
-                    if (_.isEmpty(countryData())) {
-                        customerData.reload(['directory-data'], false);
-                    }
-                }, this);
+                if (_.isEmpty(countryData())) {
+                    customerData.reload(['directory-data'], false);
+                }
             }
         },