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

yelahin-serhiy · yelahin-serhiy · commit d45646954ac7 · 2020-10-02T17:57:03.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
@@ -122,9 +122,7 @@ define([
                 }
                 checkoutProvider.on('shippingAddress', function (shippingAddrsData) {
                     //jscs:disable requireCamelCaseOrUpperCaseIdentifiers
-                    if (quote.shippingAddress().countryId !== shippingAddrsData.country_id &&
-                        (shippingAddrsData.postcode || shippingAddrsData.region_id)
-                    ) {
+                    if (shippingAddrsData.street && shippingAddrsData.street[0].length > 0) {
                         checkoutData.setShippingAddressFromData(shippingAddrsData);
                     }
                     //jscs:enable requireCamelCaseOrUpperCaseIdentifiers

Original file line number	Diff line number	Diff line change
`@@ -122,9 +122,7 @@ define([`
`122`	`122`	`}`
`123`	`123`	`checkoutProvider.on('shippingAddress', function (shippingAddrsData) {`
`124`	`124`	`//jscs:disable requireCamelCaseOrUpperCaseIdentifiers`
`125`		`- if (quote.shippingAddress().countryId !== shippingAddrsData.country_id &&`
`126`		`- (shippingAddrsData.postcode \|\| shippingAddrsData.region_id)`
`127`		`- ) {`
	`125`	`+ if (shippingAddrsData.street && shippingAddrsData.street[0].length > 0) {`
`128`	`126`	`checkoutData.setShippingAddressFromData(shippingAddrsData);`
`129`	`127`	`}`
`130`	`128`	`//jscs:enable requireCamelCaseOrUpperCaseIdentifiers`