Merge remote-tracking branch 'commerce/develop' into platform-health

Author: xmav

ReCaptchaCheckout/view/frontend/web/template/payment-recaptcha-container.html

@@ -5,6 +5,6 @@
  */
  -->
 <div>
-    <each args="data: getRegion('place-order-recaptcha'), as: 'recaptcha'" render=""/>
+    <each args="data: getRegion('place-order-recaptcha'), as: 'recaptcha'" render=""></each>
 </div>
 <hr />

TwoFactorAuth/composer.json

@@ -16,8 +16,7 @@
         "spomky-labs/otphp": "^10.0",
         "endroid/qr-code": "^3.7",
         "donatj/phpuseragentparser": "~0.7",
-        "2tvenom/cborencode": "^1.0",
-        "phpseclib/phpseclib": "2.0.*"
+        "2tvenom/cborencode": "^1.0"
     },
     "type": "magento2-module",
     "license": "OSL-3.0",

TwoFactorAuth/view/adminhtml/web/template/authy/auth.html

@@ -47,7 +47,7 @@ <h3 data-bind='i18n: "Emergency methods:"'></h3>
         <div class="tfa-waitbox" visible='(selectedMethod() === "onetouch") && !success()'>
             <div data-role="spinner">
                 <div class="spinner">
-                    <span/><span/><span/><span/><span/><span/><span/><span/>
+                    <span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span>
                 </div>
             </div>
             <div data-bind='i18n: waitingText'></div>
@@ -56,7 +56,7 @@ <h3 data-bind='i18n: "Emergency methods:"'></h3>
         <div visible='success()' class="tfa-waitbox">
             <div data-role="spinner">
                 <div class="spinner">
-                    <span/><span/><span/><span/><span/><span/><span/><span/>
+                    <span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span>
                 </div>
             </div>
             <div data-bind='i18n: "Redirecting to Magento Admin Panel..."'></div>

TwoFactorAuth/view/adminhtml/web/template/authy/configure.html

@@ -18,7 +18,7 @@
     <div visible='currentStep() === "login"' class="tfa-waitbox">
         <div data-role="spinner">
             <div class="spinner">
-                <span/><span/><span/><span/><span/><span/><span/><span/>
+                <span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span>
             </div>
         </div>
         <div data-bind='i18n: "Redirecting to Magento Admin Panel..."'></div>

TwoFactorAuth/view/adminhtml/web/template/google/auth.html

@@ -44,7 +44,7 @@
     <div visible='currentStep() === "login"' class="tfa-waitbox">
         <div data-role="spinner">
             <div class="spinner">
-                <span/><span/><span/><span/><span/><span/><span/><span/>
+                <span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span>
             </div>
         </div>
         <div data-bind='i18n: "Redirecting to Magento Admin Panel..."'></div>

TwoFactorAuth/view/adminhtml/web/template/google/configure.html

@@ -50,7 +50,7 @@
     <div visible='currentStep() === "login"' class="tfa-waitbox">
         <div data-role="spinner">
             <div class="spinner">
-                <span/><span/><span/><span/><span/><span/><span/><span/>
+                <span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span>
             </div>
         </div>
         <div data-bind='i18n: "Redirecting to Magento Admin Panel..."'></div>

TwoFactorAuth/view/adminhtml/web/template/u2fkey/auth.html

@@ -22,15 +22,15 @@ <h3 translate="'Plug in your U2F key and follow instructions'"></h3>
     <div visible='currentStep() === "login"' class="tfa-waitbox">
         <div data-role="spinner">
             <div class="spinner">
-                <span/><span/><span/><span/><span/><span/><span/><span/>
+                <span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span>
             </div>
         </div>
         <div translate="'Redirecting to Magento Admin Panel...'"></div>
     </div>
     <div visible='$data.loading' class="tfa-waitbox">
         <div data-role="spinner">
             <div class="spinner">
-                <span/><span/><span/><span/><span/><span/><span/><span/>
+                <span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span>
             </div>
         </div>
         <div translate="'Loading...'"></div>

TwoFactorAuth/view/adminhtml/web/template/u2fkey/configure.html

@@ -22,15 +22,15 @@ <h3 translate="'Plug in your U2F key and follow instructions'"></h3>
     <div visible='currentStep() === "login"' class="tfa-waitbox">
         <div data-role="spinner">
             <div class="spinner">
-                <span/><span/><span/><span/><span/><span/><span/><span/>
+                <span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span>
             </div>
         </div>
         <div translate="'Redirecting to Magento Admin Panel...'"></div>
     </div>
     <div visible='$data.loading' class="tfa-waitbox">
         <div data-role="spinner">
             <div class="spinner">
-                <span/><span/><span/><span/><span/><span/><span/><span/>
+                <span></span><span></span><span></span><span></span><span></span><span></span><span></span><span></span>
             </div>
         </div>
         <div translate="'Loading...'"></div>