fix(composables-next): access for the right active addresses (#409)

shopware · Oct 2, 2023 · 12ed75f · 12ed75f · vercel · Oct 2, 2023
1 parent eb9648d
commit 12ed75f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.changeset/stupid-buses-try.md b/.changeset/stupid-buses-try.md
@@ -0,0 +1,5 @@
+---
+"@shopware-pwa/composables-next": patch
+---
+
+Correct active addresses location for current context
diff --git a/packages/composables/src/useSessionContext.ts b/packages/composables/src/useSessionContext.ts
@@ -186,7 +186,10 @@ export function useSessionContext(
   };
 
   const activeShippingAddress = computed(
-    () => sessionContext.value?.shippingLocation?.address || null,
+    () =>
+      sessionContext.value?.customer?.activeShippingAddress ||
+      sessionContext.value?.shippingLocation?.address ||
+      null,
   );
   const setActiveShippingAddress = async (
     address: Partial<ShippingAddress>,
@@ -202,7 +205,7 @@ export function useSessionContext(
 
   // TODO: replace the source from defaultBillingAddress by new value once NEXT-28627 is solved
   const activeBillingAddress = computed(
-    () => sessionContext.value?.customer?.defaultBillingAddress || null,
+    () => sessionContext.value?.customer?.activeBillingAddress || null,
   );
   const setActiveBillingAddress = async (address: Partial<BillingAddress>) => {
     if (!address?.id) {