Merge branch '2.4-develop' of https://github.com/magento-gl/magento2ce into L3_Arrows_PR_20220406

Author: nishant04412

app/code/Magento/AwsS3/composer.json

@@ -7,9 +7,7 @@
     "require": {
         "php": "~7.4.0||~8.1.0",
         "magento/framework": "*",
-        "magento/module-remote-storage": "*",
-        "league/flysystem": "^2.0",
-        "league/flysystem-aws-s3-v3": "^2.0"
+        "magento/module-remote-storage": "*"
     },
     "type": "magento2-module",
     "license": [

app/code/Magento/Backend/etc/config.xml

@@ -44,6 +44,10 @@
             <seo>
                 <use_rewrites>0</use_rewrites>
             </seo>
+            <secure>
+                <use_in_frontend>1</use_in_frontend>
+                <use_in_adminhtml>1</use_in_adminhtml>
+            </secure>
         </web>
     </default>
     <stores>

app/code/Magento/Bundle/Block/Sales/Order/Items/Renderer.php

@@ -151,7 +151,7 @@ public function getValueHtml($item)
     {
         if ($attributes = $this->getSelectionAttributes($item)) {
             return sprintf('%d', $attributes['qty']) . ' x ' . $this->escapeHtml($item->getName()) . " "
-                . $this->getOrder()->formatBasePrice($attributes['price']);
+                . $this->getOrder()->formatPrice($attributes['price']);
         }
         return $this->escapeHtml($item->getName());
     }

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundlePlaceOrderWithMultipleOptionsSuccessTest.xml

@@ -15,6 +15,7 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-37515"/>
             <group value="Bundle"/>
+            <group value="cloud_smoke"/>
         </annotations>
         <before>
             <createData entity="_defaultCategory" stepKey="createPreReqCategory"/>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundlePlaceOrderWithVirtualAndSimpleChildrenTest.xml

@@ -16,6 +16,7 @@
             <testCaseId value="MC-38683"/>
             <useCaseId value="MC-37663"/>
             <group value="Bundle"/>
+            <group value="cloud_smoke"/>
         </annotations>
         <before>
             <createData entity="CustomerEntityOne" stepKey="createCustomer"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminCheckNewCategoryLevelAddedViaApiTest.xml

@@ -18,6 +18,7 @@
             <group value="catalog"/>
             <severity value="MAJOR"/>
             <group value="pr_exclude"/>
+            <group value="cloud_smoke"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>

app/code/Magento/Catalog/Test/Mftf/Test/AdminFilterByNameByStoreViewOnProductGridTest.xml

@@ -18,6 +18,7 @@
             <testCaseId value="MC-28534"/>
             <useCaseId value="MC-37347"/>
             <group value="catalog"/>
+            <group value="cloud_smoke"/>
         </annotations>
 
         <before>

app/code/Magento/Catalog/Test/Mftf/Test/AdminUpdateSimpleProductWithRegularPriceInStockVisibleInCatalogAndSearchTest.xml

@@ -17,6 +17,7 @@
             <severity value="BLOCKER"/>
             <group value="catalog"/>
             <group value="mtf_migrated"/>
+            <group value="cloud_smoke"/>
         </annotations>
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>

app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js

@@ -230,7 +230,9 @@ define([
                             if (response.error) {
                                 this.blockMsg.show();
                                 this.blockMsgError.innerHTML = response.message;
-                                this.blockCancelBtn.hide();
+                                if(this.blockCancelBtn) {
+                                    this.blockCancelBtn.hide();
+                                }
                                 this.setConfirmCallback(listType, null);
                                 this._showWindow();
                             }
@@ -584,7 +586,9 @@ define([
                     this.blockFormFields.update();
                     this.blockMsg.hide();
                     this.blockMsgError.update();
-                    this.blockCancelBtn.show();
+                    if(this.blockCancelBtn) {
+                        this.blockCancelBtn.show();
+                    }
                     break;
                 default:
                     // search in list types for its cleaning
@@ -603,7 +607,9 @@ define([
                         this.blockFormFields.update();
                         this.blockMsg.hide();
                         this.blockMsgError.update();
-                        this.blockCancelBtn.show();
+                        if(this.blockCancelBtn) {
+                            this.blockCancelBtn.show();
+                        }
                     }
                     break;
             }

app/code/Magento/CatalogSearch/Test/Mftf/Test/AdminCategorySearchTest.xml

@@ -17,6 +17,7 @@
             <severity value="MINOR"/>
             <group value="Search"/>
             <testCaseId value="MC-37809"/>
+            <group value="cloud_smoke"/>
         </annotations>
         <before>
             <!-- Login as admin -->