From 8633edb6508c87cd6166e8a032e31ee8e98480c7 Mon Sep 17 00:00:00 2001
From: erdemcaygor <erdem.caygor@gmail.com>
Date: Wed, 9 Apr 2025 11:50:22 +0300
Subject: [PATCH] refactoring

---
 .../core/src/lib/interceptors/timezone.interceptor.ts     | 3 +++
 .../packages/core/src/lib/services/timezone.service.ts    | 8 +++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/npm/ng-packs/packages/core/src/lib/interceptors/timezone.interceptor.ts b/npm/ng-packs/packages/core/src/lib/interceptors/timezone.interceptor.ts
index aa6320f206..10d32a3672 100644
--- a/npm/ng-packs/packages/core/src/lib/interceptors/timezone.interceptor.ts
+++ b/npm/ng-packs/packages/core/src/lib/interceptors/timezone.interceptor.ts
@@ -10,6 +10,9 @@ export class TimezoneInterceptor implements HttpInterceptor {
   protected readonly timezoneService = inject(TimezoneService);
 
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+    if (!this.timezoneService.isUtcClockEnabled) {
+      return next.handle(req);
+    }
     const timezone = this.timezoneService.getTimezone();
     if (timezone) {
       req = req.clone({
diff --git a/npm/ng-packs/packages/core/src/lib/services/timezone.service.ts b/npm/ng-packs/packages/core/src/lib/services/timezone.service.ts
index de112023d0..a7ae4121b2 100644
--- a/npm/ng-packs/packages/core/src/lib/services/timezone.service.ts
+++ b/npm/ng-packs/packages/core/src/lib/services/timezone.service.ts
@@ -10,11 +10,15 @@ export class TimezoneService {
   protected readonly document = inject(DOCUMENT);
   private readonly cookieKey = '__timezone';
   private timeZoneNameFromSettings: string | null | undefined;
+  public isUtcClockEnabled: boolean | undefined;
 
   constructor() {
     this.configState.getOne$('timing').subscribe(timezoneSettings => {
       this.timeZoneNameFromSettings = timezoneSettings?.timeZone?.iana?.timeZoneName;
     });
+    this.configState.getOne$('clock').subscribe(clock => {
+      this.isUtcClockEnabled = clock?.kind === 'Utc';
+    });
   }
 
   getBrowserTimezone(): string {
@@ -27,7 +31,9 @@ export class TimezoneService {
   }
 
   setTimezone(timezone: string): void {
-    this.document.cookie = `${this.cookieKey}=${timezone}; path=/`;
+    if (this.isUtcClockEnabled) {
+      this.document.cookie = `${this.cookieKey}=${timezone}; path=/`;
+    }
   }
 
   convertUtcToLocal(date: string | Date): Date {