From cc62a108b78e2890a48771905834a95cd23ae87d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Krzysztof=20Pawe=C5=82czak?= <krzysztof.pawelczak@sap.com>
Date: Thu, 22 Jun 2023 14:49:03 +0200
Subject: [PATCH] fix ci

---
 .../checkout-delivery-address.component.ts    | 19 +++++++++++++------
 .../services/checkout-config.service.ts       |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
index 881819fe6a2..3c09d17373e 100644
--- a/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
+++ b/feature-libs/checkout/base/components/checkout-delivery-address/checkout-delivery-address.component.ts
@@ -82,7 +82,9 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
     activeCartFacade: ActiveCartFacade,
     checkoutStepService: CheckoutStepService,
     checkoutDeliveryModesFacade: CheckoutDeliveryModesFacade,
-    globalMessageService: GlobalMessageService
+    globalMessageService: GlobalMessageService,
+    // eslint-disable-next-line @typescript-eslint/unified-signatures
+    checkoutConfigService: CheckoutConfigService
   );
   /**
    * @deprecated since 6.2
@@ -170,7 +172,11 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
   }
 
   addAddress(address: Address | undefined): void {
-    if (!address && this.selectedAddress) {
+    if (
+      !address &&
+      this.shouldUseAddressSavedInCart() &&
+      this.selectedAddress
+    ) {
       this.next();
     }
 
@@ -279,10 +285,7 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
         this.setAddress(selected);
       }
       this.doneAutoSelect = true;
-    } else if (
-      selected &&
-      this.checkoutConfigService?.shouldUseAddressSavedInCart()
-    ) {
+    } else if (selected && this.shouldUseAddressSavedInCart()) {
       this.selectedAddress = selected;
     }
   }
@@ -338,4 +341,8 @@ export class CheckoutDeliveryAddressComponent implements OnInit {
   protected onError(): void {
     this.busy$.next(false);
   }
+
+  protected shouldUseAddressSavedInCart(): boolean {
+    return !!this.checkoutConfigService?.shouldUseAddressSavedInCart();
+  }
 }
diff --git a/feature-libs/checkout/base/components/services/checkout-config.service.ts b/feature-libs/checkout/base/components/services/checkout-config.service.ts
index b260cb4485e..81fdc9f9cf2 100644
--- a/feature-libs/checkout/base/components/services/checkout-config.service.ts
+++ b/feature-libs/checkout/base/components/services/checkout-config.service.ts
@@ -77,7 +77,7 @@ export class CheckoutConfigService {
   }
 
   shouldUseAddressSavedInCart(): boolean {
-    return this.checkoutConfig?.checkout?.guestUseSavedAddress;
+    return !!this.checkoutConfig?.checkout?.guestUseSavedAddress;
   }
 
   getPreferredDeliveryMode(deliveryModes: DeliveryMode[]): string | undefined {