From c7e20c29d955478640dcf5f0b69e2c353c9f5118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Albert=20Juh=C3=A9=20Lluveras?= <aljullu@gmail.com>
Date: Tue, 24 Mar 2020 11:28:19 +0100
Subject: [PATCH] Decode address entities in shipping calculator
 (https://github.com/woocommerce/woocommerce-blocks/pull/2009)

* Fix wrong optional label for city

* Decode all address entities in shipping calculator

* Move decodeEntities to useShippingRates

* Move decodeEntities to useShippingAddress
---
 .../components/address-form/default-address-fields.js |  5 +----
 .../js/base/hooks/shipping/use-shipping-address.js    | 11 ++++++++++-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/plugins/woocommerce-blocks/assets/js/base/components/address-form/default-address-fields.js b/plugins/woocommerce-blocks/assets/js/base/components/address-form/default-address-fields.js
index e5465f51aa0..4c13c371159 100644
--- a/plugins/woocommerce-blocks/assets/js/base/components/address-form/default-address-fields.js
+++ b/plugins/woocommerce-blocks/assets/js/base/components/address-form/default-address-fields.js
@@ -87,10 +87,7 @@ const AddressFields = {
 	},
 	city: {
 		label: __( 'City', 'woo-gutenberg-products-block' ),
-		optionalLabel: __(
-			'Apartment, suite, etc. (optional)',
-			'woo-gutenberg-products-block'
-		),
+		optionalLabel: __( 'City (optional)', 'woo-gutenberg-products-block' ),
 		autocomplete: 'address-level2',
 		required: true,
 		hidden: false,
diff --git a/plugins/woocommerce-blocks/assets/js/base/hooks/shipping/use-shipping-address.js b/plugins/woocommerce-blocks/assets/js/base/hooks/shipping/use-shipping-address.js
index 7764a87da26..10f74f32f94 100644
--- a/plugins/woocommerce-blocks/assets/js/base/hooks/shipping/use-shipping-address.js
+++ b/plugins/woocommerce-blocks/assets/js/base/hooks/shipping/use-shipping-address.js
@@ -6,6 +6,7 @@ import { useEffect, useState } from '@wordpress/element';
 import isShallowEqual from '@wordpress/is-shallow-equal';
 import { useDebounce } from 'use-debounce';
 import { CART_STORE_KEY as storeKey } from '@woocommerce/block-data';
+import { decodeEntities } from '@wordpress/html-entities';
 
 /**
  * Internal dependencies
@@ -39,8 +40,16 @@ export const useShippingAddress = () => {
 			);
 		}
 	}, [ debouncedShippingAddress ] );
+
+	const decodedShippingAddress = {};
+	Object.keys( shippingAddress ).forEach( ( key ) => {
+		decodedShippingAddress[ key ] = decodeEntities(
+			shippingAddress[ key ]
+		);
+	} );
+
 	return {
-		shippingAddress,
+		shippingAddress: decodedShippingAddress,
 		setShippingAddress,
 	};
 };