MC-38048: Incorrect default country displayed on shipping page when store view is changed in cart. Part 2

yelahin-serhiy · yelahin-serhiy · commit b4ee601db514 · 2020-10-05T17:39:47.000+03:00
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js b/app/code/Magento/Checkout/view/frontend/web/js/view/shipping.js
@@ -121,7 +121,7 @@ define([
                     );
                 }
                 checkoutProvider.on('shippingAddress', function (shippingAddrsData) {
-                    if (!_.isEmpty(shippingAddrsData.street[0])) {
+                    if (shippingAddrsData.street && !_.isEmpty(shippingAddrsData.street[0])) {
                         checkoutData.setShippingAddressFromData(shippingAddrsData);
                     }
                 });

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ define([`
`121`	`121`	`);`
`122`	`122`	`}`
`123`	`123`	`checkoutProvider.on('shippingAddress', function (shippingAddrsData) {`
`124`		`- if (!_.isEmpty(shippingAddrsData.street[0])) {`
	`124`	`+ if (shippingAddrsData.street && !_.isEmpty(shippingAddrsData.street[0])) {`
`125`	`125`	`checkoutData.setShippingAddressFromData(shippingAddrsData);`
`126`	`126`	`}`
`127`	`127`	`});`