fix: Duplicate customer addresses

commercelayer · Dec 9, 2021 · 10d03a7 · 10d03a7
1 parent 89049cd
commit 10d03a7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/src/components/BillingAddressForm.tsx b/src/components/BillingAddressForm.tsx
@@ -15,6 +15,7 @@ import { AddressCountrySelectName, AddressInputName } from '#typings'
 import components from '#config/components'
 import OrderContext from '#context/OrderContext'
 import { Address } from '@commercelayer/sdk'
+import { getSaveBillingAddressToAddressBook } from '#utils/localStorage'
 
 const propTypes = components.BillingAddressForm.propTypes
 
@@ -97,7 +98,12 @@ const BillingAddressForm: FunctionComponent<BillingAddressFormProps> = (
       }
       setAddress({ values: values as Address, resource: 'billing_address' })
     }
-    if (reset && (!isEmpty(values) || !isEmpty(errors))) {
+    const checkboxChecked =
+      ref.current?.querySelector(
+        '[name="billing_address_save_to_customer_book"]'
+        // @ts-ignore
+      )?.checked || getSaveBillingAddressToAddressBook()
+    if (reset && (!isEmpty(values) || !isEmpty(errors) || checkboxChecked)) {
       saveAddressToCustomerAddressBook &&
         saveAddressToCustomerAddressBook({
           type: 'billing_address',

diff --git a/src/components/PricesContainer.tsx b/src/components/PricesContainer.tsx
@@ -18,7 +18,6 @@ import getCurrentItemKey from '#utils/getCurrentItemKey'
 import ItemContext from '#context/ItemContext'
 import components from '#config/components'
 import { LoaderType } from '#typings'
-import { Price } from '@commercelayer/sdk'
 
 const propTypes = components.PricesContainer.propTypes
 const defaultProps = components.PricesContainer.defaultProps

diff --git a/src/components/ShippingAddressForm.tsx b/src/components/ShippingAddressForm.tsx
@@ -15,6 +15,7 @@ import { AddressCountrySelectName, AddressInputName } from '#typings'
 import components from '#config/components'
 import OrderContext from '#context/OrderContext'
 import { Address } from '@commercelayer/sdk'
+import { getSaveShippingAddressToAddressBook } from '#utils/localStorage'
 
 const propTypes = components.ShippingAddressForm.propTypes
 
@@ -97,7 +98,12 @@ const ShippingAddressForm: FunctionComponent<ShippingAddressFormProps> = (
       }
       setAddress({ values: values as Address, resource: 'shipping_address' })
     }
-    if (reset && (!isEmpty(values) || !isEmpty(errors))) {
+    const checkboxChecked =
+      ref.current?.querySelector(
+        '[name="shipping_address_save_to_customer_book"]'
+        // @ts-ignore
+      )?.checked || getSaveShippingAddressToAddressBook()
+    if (reset && (!isEmpty(values) || !isEmpty(errors) || checkboxChecked)) {
       saveAddressToCustomerAddressBook &&
         saveAddressToCustomerAddressBook({
           type: 'shipping_address',

diff --git a/src/config/components.ts b/src/config/components.ts
@@ -217,6 +217,7 @@ const components = {
       'SaveCustomerButton',
       'AddressesContainer',
       'PaymentMethodsContainer',
+      'ShipmentsContainer',
       'ReactNode',
     ],
     propTypes: {