Merge branch 'release/9.6.2' into trunk

Author: tarhi-saad

docs/internal-developers/testing/releases/963.md

@@ -0,0 +1,22 @@
+# Testing notes and ZIP for release 9.6.3
+
+Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-blocks/files/10841107/woocommerce-gutenberg-products-block.zip)
+
+
+## WooCommerce Core
+
+### Fix the Checkout Blocks "Payment Options" settings crash in the editor. ([8535](https://github.com/woocommerce/woocommerce-blocks/pull/8535))
+
+1. Install and enable an incompatible payment gateway plugin with the `Cart` & `Checkout` Blocks. (e.g., [IDPay Payment Gateway for Woocommerce](https://wordpress.org/plugins/woo-idpay-gateway/))
+2. Create a new page and add the `Checkout` Block
+3. Select the Checkout Block or any of its Inner Blocks (except for the `Payment Options` Inner Block). Ensure our incompatible payment gateway (e.g., IDPay) is listed under the incompatible gateways notice:
+
+<img width="500" alt="image" src="https://user-images.githubusercontent.com/14235870/221174704-1d12e2bc-6c6c-4089-a2d2-a7bedc7f55c3.png">
+
+4. Select the `Payment Options` Inner Block. Ensure its settings are correctly displayed, the incompatible gateways notice is showing and our incompatible payment Gateway is highlighted under `Settings -> Block -> Methods`
+
+<img width="500" alt="image" src="https://user-images.githubusercontent.com/14235870/221178227-e4e12f08-dd88-4aac-824c-3990bde13a89.png">
+
+| Before | After |
+| ------ | ----- |
+|     <img width="1874" alt="image" src="https://user-images.githubusercontent.com/14235870/221171831-6245b687-a377-4730-92ab-8710360ee060.png">   |    <img width="1208" alt="image" src="https://user-images.githubusercontent.com/14235870/221178227-e4e12f08-dd88-4aac-824c-3990bde13a89.png">   |

docs/internal-developers/testing/releases/README.md

@@ -123,6 +123,8 @@ Every release includes specific testing instructions for new features and bug fi
 -   [9.6.0](./960.md)
     -   [9.6.1](./961.md)
     -   [9.6.2](./962.md)
+    -   [9.6.3](./963.md)
+
 
 <!-- FEEDBACK -->
 

readme.txt

@@ -80,6 +80,14 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/
 
 == Changelog ==
 
+= 9.6.3 - 2023-02-27 =
+
+#### Bug Fixes
+
+- Fix: Ensure that Express Payment buttons are visible next to each other. ([8548](https://github.com/woocommerce/woocommerce-blocks/pull/8548))
+- Check if session is set before returning updated customer address. ([8537](https://github.com/woocommerce/woocommerce-blocks/pull/8537))
+- Fix the Checkout Blocks "Payment Options" settings crash in the editor. ([8535](https://github.com/woocommerce/woocommerce-blocks/pull/8535))
+
 = 9.6.2 - 2023-02-22 =
 
 #### Bug Fixes

src/BlockTemplatesController.php

@@ -2,7 +2,6 @@
 namespace Automattic\WooCommerce\Blocks;
 
 use Automattic\WooCommerce\Blocks\Domain\Package;
-use Automattic\WooCommerce\Blocks\Templates\BlockTemplatesCompatibility;
 use Automattic\WooCommerce\Blocks\Templates\ProductAttributeTemplate;
 use Automattic\WooCommerce\Blocks\Utils\BlockTemplateUtils;
 
@@ -325,14 +324,6 @@ function( $template ) {
 					$template->description = BlockTemplateUtils::get_block_template_description( $template->slug );
 				}
 
-				if ( 'single-product' === $template->slug ) {
-					if ( ! is_admin() ) {
-						$new_content       = BlockTemplatesCompatibility::wrap_single_product_template( $template->content );
-						$template->content = $new_content;
-					}
-					return $template;
-				}
-
 				return $template;
 			},
 			$query_result

src/Domain/Bootstrap.php

@@ -22,7 +22,6 @@
 use Automattic\WooCommerce\Blocks\Payments\PaymentMethodRegistry;
 use Automattic\WooCommerce\Blocks\Registry\Container;
 use Automattic\WooCommerce\Blocks\Templates\ClassicTemplatesCompatibility;
-use Automattic\WooCommerce\Blocks\Templates\BlockTemplatesCompatibility;
 use Automattic\WooCommerce\Blocks\Templates\ProductAttributeTemplate;
 use Automattic\WooCommerce\Blocks\Templates\ProductSearchResultsTemplate;
 use Automattic\WooCommerce\StoreApi\RoutesController;
@@ -130,7 +129,6 @@ function() {
 		$this->container->get( ProductSearchResultsTemplate::class );
 		$this->container->get( ProductAttributeTemplate::class );
 		$this->container->get( ClassicTemplatesCompatibility::class );
-		$this->container->get( BlockTemplatesCompatibility::class );
 		$this->container->get( BlockPatterns::class );
 		$this->container->get( PaymentsApi::class );
 		$this->container->get( ShippingController::class )->init();
@@ -276,12 +274,6 @@ function ( Container $container ) {
 				return new ClassicTemplatesCompatibility( $asset_data_registry );
 			}
 		);
-		$this->container->register(
-			BlockTemplatesCompatibility::class,
-			function () {
-				return new BlockTemplatesCompatibility();
-			}
-		);
 		$this->container->register(
 			DraftOrders::class,
 			function( Container $container ) {