From 55391307a8e554195f99dfb27b2e98e24a038796 Mon Sep 17 00:00:00 2001 From: Bram van der Holst Date: Thu, 20 Jun 2024 15:10:17 +0200 Subject: [PATCH 1/2] Remove commented console logs --- .../components/CustomerAddressForm/CustomerAddressForm.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/magento-cart-shipping-address/components/CustomerAddressForm/CustomerAddressForm.tsx b/packages/magento-cart-shipping-address/components/CustomerAddressForm/CustomerAddressForm.tsx index f205e013bf..5b0be23bbf 100644 --- a/packages/magento-cart-shipping-address/components/CustomerAddressForm/CustomerAddressForm.tsx +++ b/packages/magento-cart-shipping-address/components/CustomerAddressForm/CustomerAddressForm.tsx @@ -108,13 +108,11 @@ export function CustomerAddressForm(props: CustomerAddressListProps) { useEffect(() => { if (mode === 'both' || mode === 'shipping') { if (!cartAddressId && defaultShippingId) { - // console.log('shippingAddress.customer_address_id', defaultShippingId) setValue('customer_address_id', defaultShippingId, { shouldValidate: true }) } } if (mode === 'billing') { if (!cartAddressId && defaultBillingId) { - // console.log('billingAddress.customer_address_id', defaultBillingId) setValue('customer_address_id', defaultBillingId, { shouldValidate: true }) } } From 19adebe2ff896c65d21543fc9243a36393747e06 Mon Sep 17 00:00:00 2001 From: Bram van der Holst Date: Thu, 20 Jun 2024 15:10:32 +0200 Subject: [PATCH 2/2] Fixed CustomerAddressForm resetting to a saved address when trying to use a new address --- .changeset/khaki-pianos-cry.md | 5 +++++ .../CustomerAddressForm/CustomerAddressForm.tsx | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 .changeset/khaki-pianos-cry.md diff --git a/.changeset/khaki-pianos-cry.md b/.changeset/khaki-pianos-cry.md new file mode 100644 index 0000000000..6b8a1c336e --- /dev/null +++ b/.changeset/khaki-pianos-cry.md @@ -0,0 +1,5 @@ +--- +"@graphcommerce/magento-cart-shipping-address": patch +--- + +Fixed CustomerAddressForm resetting to a saved address when trying to use a new address diff --git a/packages/magento-cart-shipping-address/components/CustomerAddressForm/CustomerAddressForm.tsx b/packages/magento-cart-shipping-address/components/CustomerAddressForm/CustomerAddressForm.tsx index 5b0be23bbf..af71866ea4 100644 --- a/packages/magento-cart-shipping-address/components/CustomerAddressForm/CustomerAddressForm.tsx +++ b/packages/magento-cart-shipping-address/components/CustomerAddressForm/CustomerAddressForm.tsx @@ -107,16 +107,24 @@ export function CustomerAddressForm(props: CustomerAddressListProps) { useEffect(() => { if (mode === 'both' || mode === 'shipping') { - if (!cartAddressId && defaultShippingId) { + if (!cartAddressId && !cartShipping && defaultShippingId) { setValue('customer_address_id', defaultShippingId, { shouldValidate: true }) } } if (mode === 'billing') { - if (!cartAddressId && defaultBillingId) { + if (!cartAddressId && !cartBilling && defaultBillingId) { setValue('customer_address_id', defaultBillingId, { shouldValidate: true }) } } - }, [cartAddressId, defaultBillingId, defaultShippingId, mode, setValue]) + }, [ + cartAddressId, + cartBilling, + cartShipping, + defaultBillingId, + defaultShippingId, + mode, + setValue, + ]) const submit = handleSubmit(() => {})