From f364da4881b2c172947e394fcd8e23ddc3689a51 Mon Sep 17 00:00:00 2001
From: Maciej Danilowicz <m.danilowicz@shopware.com>
Date: Tue, 24 Jan 2023 10:32:16 +0000
Subject: [PATCH] fix(composables): create address flow (SWF-245)

---
 .changeset/swift-apricots-dress.md                | 5 +++++
 packages/composables/src/useAddress.ts            | 6 ------
 templates/vue-demo-store/pages/checkout/index.vue | 4 ++++
 3 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 .changeset/swift-apricots-dress.md

diff --git a/.changeset/swift-apricots-dress.md b/.changeset/swift-apricots-dress.md
new file mode 100644
index 000000000..7da06674e
--- /dev/null
+++ b/.changeset/swift-apricots-dress.md
@@ -0,0 +1,5 @@
+---
+"@shopware-pwa/composables-next": patch
+---
+
+Remove setting default address in createCustomerAddress function
diff --git a/packages/composables/src/useAddress.ts b/packages/composables/src/useAddress.ts
index d205e8632..8b3b9d89b 100644
--- a/packages/composables/src/useAddress.ts
+++ b/packages/composables/src/useAddress.ts
@@ -81,12 +81,6 @@ export function useAddress(): UseAddressReturn {
   ): Promise<CustomerAddress> {
     const result = await apiCreateCustomerAddress(customerAddress, apiInstance);
     await loadCustomerAddresses();
-    if (isGuestSession.value) {
-      return result;
-    }
-
-    await setDefaultCustomerBillingAddress(result.id);
-    await setDefaultCustomerShippingAddress(result.id);
     return result;
   }
 
diff --git a/templates/vue-demo-store/pages/checkout/index.vue b/templates/vue-demo-store/pages/checkout/index.vue
index c87f3c711..46d63c4e4 100644
--- a/templates/vue-demo-store/pages/checkout/index.vue
+++ b/templates/vue-demo-store/pages/checkout/index.vue
@@ -68,6 +68,8 @@ const selectedShippingAddress = computed({
   async set(shippingAddressId: string) {
     isLoading[`shipping-${shippingAddressId}`] = true;
     await setActiveShippingAddress({ id: shippingAddressId });
+    if (shippingAddressId === selectedBillingAddress.value)
+      state.customShipping = false;
     isLoading[`shipping-${shippingAddressId}`] = false;
   },
 });
@@ -79,6 +81,8 @@ const selectedBillingAddress = computed({
   async set(billingAddressId: string) {
     isLoading[`billing-${billingAddressId}`] = true;
     await setActiveBillingAddress({ id: billingAddressId });
+    if (billingAddressId === selectedShippingAddress.value)
+      state.customShipping = false;
     isLoading[`billing-${billingAddressId}`] = false;
   },
 });