Merge remote-tracking branch 'l3/MC-39442' into 2.4-develop-pr46

serhii-balko · serhii-balko · commit f168684f6f7d · 2020-11-27T14:17:30.000+02:00
diff --git a/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js b/app/code/Magento/Checkout/view/frontend/web/js/action/set-payment-information-extended.js
@@ -30,7 +30,7 @@ define([
                 list[key] = filterTemplateData(value);
             }
 
-            if (key === '__disableTmpl') {
+            if (key === '__disableTmpl' || key === 'title') {
                 delete list[key];
             }
         });
diff --git a/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js b/app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/in-context/checkout-express.js
@@ -85,7 +85,6 @@ define([
          */
         onClick: function () {
             additionalValidators.validate();
-            this.selectPaymentMethod();
         },
 
         /**
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/set-payment-information-extended.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Checkout/frontend/js/action/set-payment-information-extended.test.js
@@ -58,6 +58,7 @@ define([
                 deferral = new $.Deferred(),
                 paymentData = {
                     method: 'checkmo',
+                    title: 'Method title',
                     additionalData: null,
                     __disableTmpl: {
                         title: true

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ define([`
`30`	`30`	`list[key] = filterTemplateData(value);`
`31`	`31`	`}`
`32`	`32`
`33`		`- if (key === '__disableTmpl') {`
	`33`	`+ if (key === '__disableTmpl' \|\| key === 'title') {`
`34`	`34`	`delete list[key];`
`35`	`35`	`}`
`36`	`36`	`});`