From 40f18c915bd0eddf8a0a21b18a8fb6b468774370 Mon Sep 17 00:00:00 2001
From: Linus Flood <linus.flood@scandichotels.com>
Date: Mon, 14 Apr 2025 05:37:46 +0000
Subject: [PATCH] Merged in fix/hide-bookingwidget-flag (pull request #1764)

fix: bookingwidget - hide BW if either pageSettings or siteConfig wants to hide it

* fix: bookingwidget - hide BW if either pageSettings or siteConfig wants to hide it

* Refactor


Approved-by: Michael Zetterberg
---
 apps/scandic-web/lib/trpc/memoizedRequests/index.ts | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/apps/scandic-web/lib/trpc/memoizedRequests/index.ts b/apps/scandic-web/lib/trpc/memoizedRequests/index.ts
index ed26a0f6d..2bc5715e9 100644
--- a/apps/scandic-web/lib/trpc/memoizedRequests/index.ts
+++ b/apps/scandic-web/lib/trpc/memoizedRequests/index.ts
@@ -243,15 +243,11 @@ export const isBookingWidgetHidden = cache(
     const siteConfig =
       siteConfigResults.status === "fulfilled" ? siteConfigResults.value : null
 
-    if (pageSettings) {
-      return pageSettings.page.settings.hide_booking_widget
-    }
+    const hideFromPageSettings =
+      pageSettings?.page?.settings?.hide_booking_widget ?? false
+    const hideFromSiteConfig = siteConfig?.bookingWidgetDisabled ?? false
 
-    if (siteConfig) {
-      return siteConfig.bookingWidgetDisabled
-    }
-
-    return false
+    return hideFromPageSettings || hideFromSiteConfig
   }
 )