AC-10528:Fix for Order Invoice Comment

Author: Devika-GL

app/code/Magento/Sales/view/adminhtml/templates/order/view/tab/history.phtml

@@ -5,30 +5,23 @@
  */
 
 /** @var \Magento\Sales\Block\Adminhtml\Order\View\Tab\History $block */
-/** @var \Magento\Framework\Escaper $escaper */
 ?>
 <section class="admin__page-section edit-order-comments">
     <ul class="note-list">
-    <?php foreach ($block->getFullHistory() as $_item): ?>
+    <?php foreach ($block->getFullHistory() as $_item) : ?>
         <li class="note-list-item">
             <span class="note-list-date"><?= /* @noEscape */ $block->getItemCreatedAt($_item) ?></span>
             <span class="note-list-time"><?= /* @noEscape */ $block->getItemCreatedAt($_item, 'time') ?></span>
             <span class="note-list-status"><?= /* @noEscape */ $block->getItemTitle($_item) ?></span>
-            <?php if ($block->isItemNotified($_item, false)): ?>
+            <?php if ($block->isItemNotified($_item, false)) : ?>
                 <span class="note-list-customer">
-                    <?= $escaper->escapeHtml(__('Customer')) ?>
-                    <?php if ($block->isCustomerNotificationNotApplicable($_item)): ?>
-                        <span class="note-list-customer-notapplicable">
-                            <?= $escaper->escapeHtml(__('Notification Not Applicable')) ?>
-                        </span>
-                    <?php elseif ($block->isItemNotified($_item)): ?>
-                        <span class="note-list-customer-notified">
-                            <?= $escaper->escapeHtml(__('Notified')) ?>
-                        </span>
-                    <?php else: ?>
-                        <span class="note-list-customer-not-notified">
-                            <?= $escaper->escapeHtml(__('Not Notified')) ?>
-                        </span>
+                    <?= $block->escapeHtml(__('Customer')) ?>
+                    <?php if ($block->isCustomerNotificationNotApplicable($_item)) : ?>
+                        <span class="note-list-customer-notapplicable"><?= $block->escapeHtml(__('Notification Not Applicable')) ?></span>
+                    <?php elseif ($block->isItemNotified($_item)) : ?>
+                        <span class="note-list-customer-notified"><?= $block->escapeHtml(__('Notified')) ?></span>
+                    <?php else : ?>
+                        <span class="note-list-customer-not-notified"><?= $block->escapeHtml(__('Not Notified')) ?></span>
                     <?php endif; ?>
                 </span>
             <?php endif; ?>
@@ -37,16 +30,16 @@
     </ul>
     <div class="edit-order-comments-block">
         <div class="edit-order-comments-block-title">
-            <?= $escaper->escapeHtml(__('Notes for this Order')) ?>
+            <?= $block->escapeHtml(__('Notes for this Order')) ?>
         </div>
-        <?php foreach ($block->getFullHistory() as $_item): ?>
-            <?php if ($_comment = $block->getItemComment($_item)): ?>
+        <?php foreach ($block->getFullHistory() as $_item) : ?>
+            <?php if ($_comment = $block->getItemComment($_item)) : ?>
                 <div class="comments-block-item">
                     <div class="comments-block-item-comment">
-                        <?= /* @noEscape */ $escaper->escapeHtml($_comment) ?>
+                        <?= /* @noEscape */ $_comment ?>
                     </div>
                     <span class="comments-block-item-date-time">
-                        <?= $escaper->escapeHtml(__('Comment added')) ?>
+                        <?= $block->escapeHtml(__('Comment added')) ?>
                         <?= /* @noEscape */ $block->getItemCreatedAt($_item) ?>
                         <?= /* @noEscape */ $block->getItemCreatedAt($_item, 'time') ?>
                     </span>