Merge remote-tracking branch 'origin/MAGETWO-66520' into PR-bugfixes-040417

Author: iivashchenko

app/code/Magento/Braintree/view/frontend/templates/paypal/vault_token.phtml

@@ -9,23 +9,22 @@ use Magento\Vault\Api\Data\PaymentTokenInterface;
 
 /** @var VaultTokenRenderer $block */
 
-$payerEmail = $block->escapeHtml($block->getPayerEmail());
+$payerEmail = $block->getPayerEmail();
+$confirmDeleteMessage = sprintf('%s: %s?', __('Are you sure you want to delete this PayPal account'), $payerEmail);
 ?>
 <tr>
     <td data-th="<?php echo $block->escapeHtml(__('PayPal Account')); ?>" class="col paypal-account">
         <img src="<?php /* @noEscape */ echo $block->getIconUrl(); ?>"
              width="<?php /* @noEscape */ echo $block->getIconWidth(); ?>"
              height="<?php /* @noEscape */ echo $block->getIconHeight(); ?>"
-             alt="<?php echo $block->escapeHtml(__('PayPal Logo')); ?>"
-        >
-        <span><?php /* @noEscape */ echo $payerEmail; ?></span>
+             alt="<?php echo $block->escapeHtml(__('PayPal Logo')); ?>">
+        <span><?php echo $block->escapeHtml($payerEmail); ?></span>
     </td>
     <td data-th="<?php echo $block->escapeHtml(__('Actions')); ?>" class="col actions">
         <form
             class="form"
             action="<?php echo $block->escapeUrl($block->getUrl('vault/cards/deleteaction')); ?>"
-            method="post"
-        >
+            method="post">
             <?php echo $block->getBlockHtml('formkey'); ?>
             <input
                 name="<?php /* @noEscape */ echo PaymentTokenInterface::PUBLIC_HASH; ?>"
@@ -34,15 +33,14 @@ $payerEmail = $block->escapeHtml($block->getPayerEmail());
             <button type="submit"
                     class="action delete"
                     data-mage-init='{
-                                    "Magento_Vault/js/customer_account/deleteWidget":{
-                                        "type": "popup",
-                                        "modalClass": "my-credit-cards-popup",
-                                        "toggleEvent": "click",
-                                        "title": "<?php echo $block->escapeHtml(__('Delete')); ?>",
-                                        "content": "Are you sure you want to delete this PayPal account:
-                                            <?php /* @noEscape */ echo $payerEmail; ?>?"
-                                    }
-                                }'>
+                        "Magento_Vault/js/customer_account/deleteWidget":{
+                            "type": "popup",
+                            "modalClass": "my-credit-cards-popup",
+                            "toggleEvent": "click",
+                            "title": "<?php echo $block->escapeHtml(__('Delete')); ?>",
+                            "content":"<?php echo $block->escapeHtml($confirmDeleteMessage); ?>"
+                        }
+                    }'>
                 <span><?php echo $block->escapeHtml(__('Delete')); ?></span>
             </button>
         </form>