fix(cart): selectIsBillingSameAsShipping does not respect IDs (#2543)

graycoreio · Aug 11, 2023 · bc63ae8 · bc63ae8
1 parent 167bb4a
commit bc63ae8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/libs/cart/state/src/selectors/cart/cart.selector.spec.ts b/libs/cart/state/src/selectors/cart/cart.selector.spec.ts
@@ -1548,6 +1548,25 @@ describe('Cart | Selector | Cart', () => {
         });
       });
 
+      describe('and the shipping and billing address are the same except for ID', () => {
+        beforeEach(() => {
+          store.dispatch(new DaffCartLoadSuccess({
+            ...cart,
+            shipping_address: {
+              ...cart.billing_address,
+              id: `not ${cart.billing_address.id}`,
+            },
+          }));
+        });
+
+        it('should return false', () => {
+          const selector = store.pipe(select(selectIsBillingSameAsShipping));
+          const expected = cold('a', { a: false });
+
+          expect(selector).toBeObservable(expected);
+        });
+      });
+
       describe('and the shipping and billing address are not the same', () => {
         beforeEach(() => {
           store.dispatch(new DaffCartLoadSuccess({

diff --git a/libs/cart/state/src/selectors/cart/cart.selector.ts b/libs/cart/state/src/selectors/cart/cart.selector.ts
@@ -562,7 +562,10 @@ const createCartSelectors = <
   const selectIsBillingSameAsShipping = createSelector(
     selectCartShippingAddress,
     selectCartBillingAddress,
-    (shippingAddress, billingAddress) => daffComparePersonalAddresses(shippingAddress, billingAddress),
+    (shippingAddress, billingAddress) =>
+      shippingAddress?.id || billingAddress?.id
+        ? shippingAddress?.id === billingAddress?.id
+        : daffComparePersonalAddresses(shippingAddress, billingAddress),
   );
 
   const selectHasBillingAddress = createSelector(