Merge remote-tracking branch 'speedupmate/24618' into ENGCOM-5849-magento-magento2-24622

p-bystritsky · p-bystritsky · commit 9e307462ea4b · 2019-09-18T16:47:08.000+03:00
# Conflicts:
#	app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
diff --git a/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js b/app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js
@@ -334,7 +334,7 @@ define([
             }
 
             return {
-                line1: (_.isUndefined(address.street) || _.isUndefined(address.street[0]) ? '' : address.street[0],
+                line1: _.isUndefined(address.street) || _.isUndefined(address.street[0]) ? '' : address.street[0],
                 city: address.city,
                 state: address.regionCode,
                 postalCode: address.postcode,

Original file line number	Diff line number	Diff line change
`@@ -334,7 +334,7 @@ define([`
`334`	`334`	`}`
`335`	`335`
`336`	`336`	`return {`
`337`		`- line1: (_.isUndefined(address.street) \|\| _.isUndefined(address.street[0]) ? '' : address.street[0],`
	`337`	`+ line1: _.isUndefined(address.street) \|\| _.isUndefined(address.street[0]) ? '' : address.street[0],`
`338`	`338`	`city: address.city,`
`339`	`339`	`state: address.regionCode,`
`340`	`340`	`postalCode: address.postcode,`