From be31fef6009b215f67308bf7cc8c8ea802a3c008 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Silke=20Gr=C3=BCber?= <s.grueber@intershop.de>
Date: Wed, 5 Jul 2023 08:35:32 +0200
Subject: [PATCH] fix: display updated customer address on the myAccount
 address page (#1454)

* save updated customer address in the ngrx store
* clear region on customer address update if necessary
---
 src/app/core/store/customer/addresses/addresses.effects.spec.ts | 2 +-
 src/app/core/store/customer/addresses/addresses.effects.ts      | 2 +-
 .../formly-customer-address-form.component.ts                   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/core/store/customer/addresses/addresses.effects.spec.ts b/src/app/core/store/customer/addresses/addresses.effects.spec.ts
index 46597c97c0..a927d038c1 100644
--- a/src/app/core/store/customer/addresses/addresses.effects.spec.ts
+++ b/src/app/core/store/customer/addresses/addresses.effects.spec.ts
@@ -173,7 +173,7 @@ describe('Addresses Effects', () => {
     });
 
     it('should map to action of type updateCustomerSuccess', () => {
-      const address = { urn: '123' } as Address;
+      const address = { urn: 'test' } as Address;
       const action = updateCustomerAddress({ address });
       const completion = updateCustomerAddressSuccess({ address });
       const completion2 = displaySuccessMessage({
diff --git a/src/app/core/store/customer/addresses/addresses.effects.ts b/src/app/core/store/customer/addresses/addresses.effects.ts
index e47fc4c30e..6f35924e8a 100644
--- a/src/app/core/store/customer/addresses/addresses.effects.ts
+++ b/src/app/core/store/customer/addresses/addresses.effects.ts
@@ -73,7 +73,7 @@ export class AddressesEffects {
       filter(([address, customer]) => !!address || !!customer),
       mergeMap(([address]) =>
         this.addressService.updateCustomerAddress('-', address).pipe(
-          mergeMap(() => [
+          mergeMap(address => [
             updateCustomerAddressSuccess({ address }),
             displaySuccessMessage({ message: 'account.addresses.address_updated.message' }),
           ]),
diff --git a/src/app/shared/formly-address-forms/components/formly-customer-address-form/formly-customer-address-form.component.ts b/src/app/shared/formly-address-forms/components/formly-customer-address-form/formly-customer-address-form.component.ts
index 7650d1220e..c7d227ff70 100644
--- a/src/app/shared/formly-address-forms/components/formly-customer-address-form/formly-customer-address-form.component.ts
+++ b/src/app/shared/formly-address-forms/components/formly-customer-address-form/formly-customer-address-form.component.ts
@@ -112,7 +112,7 @@ export class FormlyCustomerAddressFormComponent implements OnInit, OnChanges {
     let formAddress: Address = this.form.value.address;
     if (this.address) {
       // update form values in the original address
-      formAddress = { ...this.address, ...formAddress };
+      formAddress = { ...this.address, mainDivisionCode: '', ...formAddress };
     }
     if (this.extension) {
       formAddress = { ...formAddress, email: this.extensionForm.get('email')?.value };