merge magento/2.4.0-develop into magento-qwerty/MC-34764

Author: magento-mts-svc

app/code/Magento/Config/Block/System/Config/Form/Fieldset.php

@@ -175,6 +175,7 @@ protected function _getHeaderTitleHtml($element)
             '-link">' . $element->getLegend() . '</a>' .
             /* @noEscape */ $this->secureRenderer->renderEventListenerAsTag(
                 'onclick',
+                'event.preventDefault();' .
                 "Fieldset.toggleCollapse('" . $element->getHtmlId() . "', '" .
                  $this->_urlBuilder->getUrl('*/*/state') . "'); return false;",
                 'a#' . $element->getHtmlId() . '-head'
@@ -225,7 +226,7 @@ protected function _getFooterHtml($element)
                 );
                 $html .= $this->secureRenderer->renderStyleAsTag(
                     'display:none;',
-                    'row_' . $field->getId() . '_comment'
+                    '#row_' . $field->getId() . '_comment'
                 );
             }
         }

app/code/Magento/Config/Test/Unit/Block/System/Config/Form/FieldsetTest.php

@@ -243,7 +243,7 @@ public function testRenderWithStoredElements($expanded, $nested, $extra)
         $this->assertStringContainsString('test_field_toHTML', $actual);
 
         $expected = '<div id="row_test_field_id_comment" class="system-tooltip-box">test_field_tootip</div>' .
-        '<style>row_test_field_id_comment { display:none; }</style>';
+        '<style>#row_test_field_id_comment { display:none; }</style>';
         $this->assertStringContainsString($expected, $actual);
         if ($nested) {
             $this->assertStringContainsString('nested', $actual);

app/code/Magento/Sales/view/adminhtml/templates/order/create/store/select.phtml

@@ -51,14 +51,14 @@
                                 <div class="admin__field admin__field-option">
                                     <input type="radio"
                                            id="store_<?= (int) $_store->getId() ?>" class="admin__control-radio"/>
+                                    <label class="admin__field-label" for="store_<?= (int) $_store->getId() ?>">
+                                        <?= $block->escapeHtml($_store->getName()) ?>
+                                    </label>
                                     <?= /* @noEscape*/ $secureRenderer->renderEventListenerAsTag(
                                         'onclick',
                                         "order.setStoreId('" .  (int)$_store->getId() . "')",
                                         'input#store_' . (int)$_store->getId()
                                     ) ?>
-                                    <label class="admin__field-label" for="store_<?= (int) $_store->getId() ?>">
-                                        <?= $block->escapeHtml($_store->getName()) ?>
-                                    </label>
                                 </div>
                             </div>
                         </div>