Merge branch 'release/9.6.0' into trunk

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

@@ -0,0 +1,42 @@
+# Testing notes and ZIP for release 9.6.1
+
+Zip file for testing: [woocommerce-gutenberg-products-block.zip](https://github.com/woocommerce/woocommerce-blocks/files/10767768/woocommerce-gutenberg-products-block.zip)
+
+## WooCommerce Core
+
+### Make Mini Cart Contents block visible in the Style Book. ([8458](https://github.com/woocommerce/woocommerce-blocks/pull/8458))
+
+1. With Gutenberg installed and a block theme like [Twenty Twenty-Three](https://wordpress.org/themes/twentytwentythree/) enabled.
+2. Go to Appearance > Editor and edit a template.
+3. In the toolbar, select Styles (black and white circle) and then, Open Style Book (eye icon).
+4. Go to the WooCommerce tab.
+5. Ensure the Mini Cart Contents block is visible.
+
+| Before | After |
+| ------ | ----- |
+| ![imatge](https://user-images.githubusercontent.com/3616980/219356399-cd2c16c1-4256-42e4-a59b-0a77d273ebc7.png) | ![imatge](https://user-images.githubusercontent.com/3616980/219356269-9cc6ece5-5f5f-4df9-8e57-dc158bcace8d.png) |
+
+### Fix Customer account sidebar link incorrect margin in WP 6.2. ([8437](https://github.com/woocommerce/woocommerce-blocks/pull/8437))
+
+1. In WP 6.1 without Gutenberg installed, verify there are no regressions:
+   1. Add the Customer account block to a post or page.
+   2. In the editor, open the sidebar and verify the Manage account settings link is displayed below the product description.
+2. In WP 6.2 or WP 6.1 with Gutenberg installed, verify the link has correct margins:
+   1. Add the Customer account block to a post or page.
+   2. In the editor, open the sidebar and verify the Manage account settings link has correct margins.
+
+· | WP 6.1 without GB enabled | WP 6.1 with GB enabled |
+--- | --- | --- |
+Before | ![imatge](https://user-images.githubusercontent.com/3616980/219014857-6071a40e-8770-4f1f-b37c-91e5bf7451b5.png) | ![imatge](https://user-images.githubusercontent.com/3616980/219015103-982b2663-a15a-4101-9f24-83478b0e6eea.png) |
+After | ![imatge](https://user-images.githubusercontent.com/3616980/219014857-6071a40e-8770-4f1f-b37c-91e5bf7451b5.png) | ![imatge](https://user-images.githubusercontent.com/3616980/219014964-505597f7-2f52-42c8-91ad-04c130bfff78.png) |
+
+### Fix cases in which Checkout would validate customer country against the wrong state. ([8460](https://github.com/woocommerce/woocommerce-blocks/pull/8460))
+
+1. Set US/California as the default shipping destination.
+2. Add a product to the cart.
+3. Go to the checkout page.
+4. Select a different Shipping Country that has states, e.g. Greece.
+5. Fill in the city field.
+6. You should not get a error.
+7. Checkout without setting the state.
+8. In the admin, you should not see California as the state.

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

@@ -119,6 +119,7 @@ Every release includes specific testing instructions for new features and bug fi
     -   [9.4.2](./942.md)
 -   [9.5.0](./950.md)
 -   [9.6.0](./960.md)
+    -   [9.6.1](./961.md)
 
 <!-- FEEDBACK -->
 

readme.txt

@@ -80,6 +80,15 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/
 
 == Changelog ==
 
+= 9.6.1 - 2023-02-17 =
+
+#### Bug Fixes
+
+- Make Mini Cart Contents block visible in the Style Book. ([8458](https://github.com/woocommerce/woocommerce-blocks/pull/8458))
+- Fixed an issue where cart item data could cause fatal errors if it was an array. ([8440](https://github.com/woocommerce/woocommerce-blocks/pull/8440))
+- Fix Customer account sidebar link incorrect margin in WP 6.2. ([8437](https://github.com/woocommerce/woocommerce-blocks/pull/8437))
+- Fix cases in which Checkout would validate customer country against the wrong state. ([8460](https://github.com/woocommerce/woocommerce-blocks/pull/8460))
+
 = 9.6.0 - 2023-02-14 =
 
 #### Enhancements