fix: Filter addresses by shipping_country_lock if it has a value

commercelayer · Jan 28, 2022 · 2f835b6 · 2f835b6
1 parent d98bb70
commit 2f835b6
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 31 deletions.
diff --git a/src/components/Address.tsx b/src/components/Address.tsx
@@ -115,37 +115,48 @@ const Address: FunctionComponent<Props> = (props) => {
   const components =
     typeof children === 'function'
       ? []
-      : items.map((address, k) => {
-          const addressProps = {
-            address,
-          }
-          const disabled =
-            (setShippingAddress &&
+      : items
+          .filter((address) => {
+            if (
+              setShippingAddress &&
               countryLock &&
-              countryLock !== address.country_code) ||
-            false
-          const selectedClass = deselect ? '' : selectedClassName
-          const addressSelectedClass =
-            selected === k ? `${className} ${selectedClass}` : className
-          const customerAddressId: string = address?.reference || ''
-          const finalClassName = disabled
-            ? `${className} ${disabledClassName}`
-            : addressSelectedClass
-          return (
-            <AddressChildrenContext.Provider key={k} value={addressProps}>
-              <div
-                className={finalClassName}
-                onClick={() =>
-                  handleSelect(k, address.id, customerAddressId, disabled)
-                }
-                data-disabled={disabled}
-                {...p}
-              >
-                {children}
-              </div>
-            </AddressChildrenContext.Provider>
-          )
-        })
+              countryLock !== address.country_code
+            ) {
+              return false
+            }
+            return true
+          })
+          .map((address, k) => {
+            const addressProps = {
+              address,
+            }
+            const disabled =
+              (setShippingAddress &&
+                countryLock &&
+                countryLock !== address.country_code) ||
+              false
+            const selectedClass = deselect ? '' : selectedClassName
+            const addressSelectedClass =
+              selected === k ? `${className} ${selectedClass}` : className
+            const customerAddressId: string = address?.reference || ''
+            const finalClassName = disabled
+              ? `${className} ${disabledClassName}`
+              : addressSelectedClass
+            return (
+              <AddressChildrenContext.Provider key={k} value={addressProps}>
+                <div
+                  className={finalClassName}
+                  onClick={() =>
+                    handleSelect(k, address.id, customerAddressId, disabled)
+                  }
+                  data-disabled={disabled}
+                  {...p}
+                >
+                  {children}
+                </div>
+              </AddressChildrenContext.Provider>
+            )
+          })
   const parentProps = {
     customerAddresses: items as CustomerAddress[],
     selected,

diff --git a/src/components/ShippingAddressContainer.tsx b/src/components/ShippingAddressContainer.tsx
@@ -28,7 +28,7 @@ const ShippingAddressContainer: FunctionComponent<Props> = (props) => {
     shippingAddressInitialState
   )
   const config = useContext(CommerceLayerContext)
-  const { order, updateOrder } = useContext(OrderContext)
+  const { order } = useContext(OrderContext)
   const { setCloneAddress } = useContext(AddressContext)
   useEffect(() => {
     if (order && config) {