Merge branch 'trunk' into fix/8765-rest-api-products-block-bug

assets/js/base/components/cart-checkout/cart-line-items-table/style.scss

@@ -5,7 +5,7 @@ table.wc-block-cart-items td {
 	background: none !important;
 	// Remove borders on default themes.
 	border: 0;
-	margin: 0 0 2em;
+	margin: 0;
 }
 
 .editor-styles-wrapper table.wc-block-cart-items,

assets/js/blocks/cart/style.scss

@@ -12,13 +12,17 @@
 			}
 		}
 	}
-}
 
-.wc-block-cart {
 	.wc-block-components-totals-taxes,
 	.wc-block-components-totals-footer-item {
 		margin: 0;
 	}
+
+	table.wc-block-cart-items,
+	table.wc-block-cart-items th,
+	table.wc-block-cart-items td {
+		margin: 0 0 2em;
+	}
 }
 
 // Loading placeholder state.

assets/js/data/cart/push-changes.ts

@@ -41,13 +41,20 @@ const isBillingAddress = (
 export const normalizeAddress = ( address: BillingOrShippingAddress ) => {
 	const trimmedAddress = Object.entries( address ).reduce(
 		( acc, [ key, value ] ) => {
+			//Skip normalizing for any non string field
+			if ( typeof value !== 'string' ) {
+				acc[ key as keyof BillingOrShippingAddress ] = value;
+				return acc;
+			}
+
 			if ( key === 'postcode' ) {
 				acc[ key as keyof BillingOrShippingAddress ] = value
 					.replace( ' ', '' )
 					.toUpperCase();
-			} else {
-				acc[ key as keyof BillingOrShippingAddress ] = value.trim();
+				return acc;
 			}
+
+			acc[ key as keyof BillingOrShippingAddress ] = value.trim();
 			return acc;
 		},
 		{} as BillingOrShippingAddress

src/BlockTemplatesController.php

@@ -325,7 +325,7 @@ function( $template ) {
 					$template->description = BlockTemplateUtils::get_block_template_description( $template->slug );
 				}
 
-				if ( 'single-product' === $template->slug ) {
+				if ( str_contains( $template->slug, 'single-product' ) ) {
 					if ( ! is_admin() && ! BlockTemplateUtils::template_has_legacy_template_block( $template ) ) {
 
 						$new_content       = SingleProductTemplateCompatibility::add_compatibility_layer( $template->content );