From fefbac2ee513be66db465971ac7ae11d0f845b75 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 3 Mar 2023 17:23:35 +0700
Subject: [PATCH] Release: 9.6.4 (#8618)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Empty commit for release pull request

* Add changelog to readme.txt

* Unset default customer state if it doesn't match country (#8460)

* Unset default state

* add controller for customers

* rename validation file

* explain fix inline

* address feedback

* revert back state logic

* Update src/StoreApi/Utilities/ValidationUtils.php

Co-authored-by: Mike Jolley <mike.jolley@me.com>

---------

Co-authored-by: Mike Jolley <mike.jolley@me.com>

* Update readme.txt

* Add testing notes

* Update testing notes

* Fix Customer account sidebar link incorrect margin in WP 6.2 (#8437)

* Fix Customer account sidebar link incorrect margin in WP 6.2

* Update class name to match the guidelines

* Prevent cart from breaking when item_data contains an array (#8440)

* Ensure array item data is removed

* Remove unused key

* Clean up code and add comments

* Check for null instead of empty

* Use plain foreach to filter and map arrays

* Add minimum height to Mini Cart Contents block in the Style Book (#8458)

* Update testing notes zip file

* Update testing notes

* Update testing notes file

* Bumping version strings to new version.

* Empty commit for release pull request

* Empty commit for release pull request

* disable compatibilty layer (#8507)

* update changelog and testing instructions

* add zip link

* Bumping version strings to new version.

* Empty commit for release pull request

* Empty commit for release pull request

* Add changelog in readme.txt

* Add testing notes

* Remove change from testing notes

This requires AvaTax credentials for testing. So, we'll test for
regressions instead

* Check for null session before going forward (#8537)

* Fix Payment Options settings crash in the editor (#8535)

* Ensure express payment buttons are visible next to each other (#8548)

* Update ZIP file

* Bumping version strings to new version.

* Empty commit for release pull request

* Empty commit for release pull request

---------

Co-authored-by: github-actions <github-actions@github.com>
Co-authored-by: Saad Tarhi <saad.trh@gmail.com>
Co-authored-by: Seghir Nadir <nadir.seghir@gmail.com>
Co-authored-by: Mike Jolley <mike.jolley@me.com>
Co-authored-by: Albert Juhé Lluveras <contact@albertjuhe.com>
Co-authored-by: Thomas Roberts <5656702+opr@users.noreply.github.com>
Co-authored-by: Luigi Teschio <gigitux@gmail.com>
Co-authored-by: Niels Lange <info@nielslange.de>
---
 .../express-payment/style.scss                | 36 ++++++-------------
 .../testing/releases/964.md                   |  3 ++
 .../testing/releases/README.md                |  2 +-
 package.json                                  |  2 +-
 readme.txt                                    |  8 ++++-
 src/Package.php                               |  2 +-
 woocommerce-gutenberg-products-block.php      |  2 +-
 7 files changed, 25 insertions(+), 30 deletions(-)
 create mode 100644 docs/internal-developers/testing/releases/964.md

diff --git a/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/style.scss b/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/style.scss
index 5a4c67f7e64..990809e7fac 100644
--- a/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/style.scss
+++ b/assets/js/blocks/cart-checkout-shared/payment-methods/express-payment/style.scss
@@ -7,9 +7,10 @@ $border-radius: 5px;
 
 	.wc-block-components-express-payment__event-buttons {
 		list-style: none;
-		display: flex;
-		flex-direction: row;
-		flex-wrap: wrap;
+		display: grid;
+		grid-template-columns: repeat(auto-fit, minmax(calc(33% - 10px), 1fr));
+		grid-gap: 10px;
+		box-sizing: border-box;
 		width: 100%;
 		padding: 0;
 		margin: 0;
@@ -18,6 +19,7 @@ $border-radius: 5px;
 
 		> li {
 			margin: 0;
+			width: 100%;
 
 			> img {
 				width: 100%;
@@ -25,6 +27,12 @@ $border-radius: 5px;
 			}
 		}
 	}
+
+	@include breakpoint("<782px") {
+		.wc-block-components-express-payment__event-buttons {
+			grid-template-columns: 1fr;
+		}
+	}
 }
 
 .wc-block-components-express-payment--checkout {
@@ -85,28 +93,6 @@ $border-radius: 5px;
 			margin-bottom: em($gap);
 		}
 	}
-
-	.wc-block-components-express-payment__event-buttons {
-		> li {
-			box-sizing: border-box;
-			display: inline-block;
-			width: 50%;
-		}
-
-		> li:nth-child(even) {
-			padding-left: $gap-smaller;
-		}
-
-		> li:nth-child(odd) {
-			padding-right: $gap-smaller;
-		}
-
-		> li:only-child {
-			display: block;
-			width: 100%;
-			padding: 0;
-		}
-	}
 }
 
 .wc-block-components-express-payment--cart {
diff --git a/docs/internal-developers/testing/releases/964.md b/docs/internal-developers/testing/releases/964.md
new file mode 100644
index 00000000000..f1e5b9f78df
--- /dev/null
+++ b/docs/internal-developers/testing/releases/964.md
@@ -0,0 +1,3 @@
+# Testing notes and ZIP for release 9.6.4
+
+No User Facing Testing required with this patch release.
diff --git a/docs/internal-developers/testing/releases/README.md b/docs/internal-developers/testing/releases/README.md
index 0b38a5033c7..cff022b1a3c 100644
--- a/docs/internal-developers/testing/releases/README.md
+++ b/docs/internal-developers/testing/releases/README.md
@@ -122,7 +122,7 @@ Every release includes specific testing instructions for new features and bug fi
     -   [9.6.1](./961.md)
     -   [9.6.2](./962.md)
     -   [9.6.3](./963.md)
-
+    -   [9.6.4](./964.md)
 
 <!-- FEEDBACK -->
 
diff --git a/package.json b/package.json
index 23af53a13ce..3ce52273f03 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
 	"name": "@woocommerce/block-library",
 	"title": "WooCommerce Blocks",
 	"author": "Automattic",
-	"version": "9.6.3",
+	"version": "9.6.4",
 	"description": "WooCommerce blocks for the Gutenberg editor.",
 	"homepage": "https://github.com/woocommerce/woocommerce-gutenberg-products-block/",
 	"keywords": [
diff --git a/readme.txt b/readme.txt
index 45bfd18c2b3..92484612466 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: gutenberg, woocommerce, woo commerce, products, blocks, woocommerce blocks
 Requires at least: 6.1.1
 Tested up to: 6.1.1
 Requires PHP: 7.2
-Stable tag: 9.6.3
+Stable tag: 9.6.4
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html
 
@@ -80,6 +80,12 @@ Release and roadmap notes available on the [WooCommerce Developers Blog](https:/
 
 == Changelog ==
 
+= 9.6.4 - 2023-03-03 =
+
+#### Bug Fixes
+
+- Fix: Show up to three Express Payments buttons next to each other. ([8601](https://github.com/woocommerce/woocommerce-blocks/pull/8601))
+
 = 9.6.3 - 2023-02-27 =
 
 #### Bug Fixes
diff --git a/src/Package.php b/src/Package.php
index 31c1a1848f7..f2bcd1ef80a 100644
--- a/src/Package.php
+++ b/src/Package.php
@@ -109,7 +109,7 @@ public static function container( $reset = false ) {
 				NewPackage::class,
 				function ( $container ) {
 					// leave for automated version bumping.
-					$version = '9.6.3';
+					$version = '9.6.4';
 					return new NewPackage(
 						$version,
 						dirname( __DIR__ ),
diff --git a/woocommerce-gutenberg-products-block.php b/woocommerce-gutenberg-products-block.php
index beb66ba0762..714b3642218 100644
--- a/woocommerce-gutenberg-products-block.php
+++ b/woocommerce-gutenberg-products-block.php
@@ -3,7 +3,7 @@
  * Plugin Name: WooCommerce Blocks
  * Plugin URI: https://github.com/woocommerce/woocommerce-gutenberg-products-block
  * Description: WooCommerce blocks for the Gutenberg editor.
- * Version: 9.6.3
+ * Version: 9.6.4
  * Author: Automattic
  * Author URI: https://woocommerce.com
  * Text Domain:  woo-gutenberg-products-block