MC-15776: Merge release branch into 2.3-develop

- fix merge conflict

Author: krissyhiserote

app/code/Magento/AuthorizenetAcceptjs/view/adminhtml/templates/payment/script.phtml

@@ -9,12 +9,16 @@
 <script>
     //<![CDATA[
     require(
-        ['Magento_AuthorizenetAcceptjs/js/payment-form'],
-        function(Authorizenet) {
+        [
+            'Magento_AuthorizenetAcceptjs/js/authorizenet',
+            'jquery',
+            'domReady!'
+        ], function(AuthorizenetAcceptjs, $) {
             var config = <?= /* @noEscape */ $block->getPaymentConfig() ?>,
-                form = "#payment_form_<?= $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>";
+                form = $('#payment_form_<?= /* @noEscape */ $block->escapeJs($block->escapeHtml($block->getMethodCode())) ?>');
 
-            new Authorizenet(config, form);
+            config.active = form.length > 0 && !form.is(':hidden');
+            new AuthorizenetAcceptjs(config);
         });
     //]]>
 </script>