Merge pull request #5810 from magento-tsg/2.4.0-develop-pr58

[TSG] Fixes for 2.4 (pr58) (2.4.0-develop)

Author: zakdma

app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml

@@ -31,7 +31,7 @@
             <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' :
                 $block->getTabUrl($_tab) ?>
 
-            <li class="admin__page-nav-item" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
+            <li class="admin__page-nav-item no-display" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
                 <?= /* @noEscape */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
                 <a href="<?=  $block->escapeUrl($_tabHref) ?>"
                    id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
@@ -72,17 +72,27 @@
                     <?= /* @noEscape */ $block->getUiId('tab', 'content', $_tab->getId()) ?>>
                     <?= /* @noEscape */ $block->getTabContent($_tab) ?>
                 </div>
-                <?php if ($block->getTabIsHidden($_tab)): ?>
-                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                        'display:none',
-                        'li.admin__page-nav-item#' . $block->escapeJs($block->getTabId($_tab))
-                    ); ?>
-                <?php endif; ?>
                 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                     'display:none',
                     'div#' . $block->escapeJs($block->getTabId($_tab)) . '_content'
                 ); ?>
             </li>
+            <?php $scriptString = <<<script
+    require(['jquery'], function($){
+        'use strict';
+script;
+            if ($block->getTabIsHidden($_tab)):
+                $scriptString .= <<<script
+        $('li.admin__page-nav-item#{$block->escapeJs($block->getTabId($_tab))}').css('display', 'none');
+script;
+            endif;
+
+            $scriptString .= <<<script
+        $('li.admin__page-nav-item#{$block->escapeJs($block->getTabId($_tab))}').removeClass('no-display');
+    })
+script;
+            ?>
+            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
         <?php endforeach; ?>
     </ul>
 </div>

app/code/Magento/Checkout/view/frontend/templates/total/default.phtml

@@ -39,5 +39,7 @@ $checkoutHelper = $block->getData('checkoutHelper');
         <?php endif; ?>
     </td>
 </tr>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals th.mark') ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals td.amount') ?>
+<?php if ($block->getTotal()->getStyle()): ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals th.mark') ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals td.amount') ?>
+<?php endif; ?>

app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml

@@ -9,7 +9,7 @@
 ?>
 <div id="authenticationPopup" data-bind="scope:'authenticationPopup', style: {display: 'none'}">
     <?php $scriptString = 'window.authenticationPopup = ' . /* @noEscape */ $block->getSerializedConfig(); ?>
-    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>;
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
     <!-- ko template: getTemplate() --><!-- /ko -->
     <script type="text/x-magento-init">
         {