From 232f43e27e7e4c976e21e5aaf8cdd2b00fc6a040 Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 24 Jun 2026 09:42:11 +0800
Subject: [PATCH] Use DST-aware format in abpUtcToLocal pipe for UTC clock

---
 .../core/src/lib/pipes/utc-to-local.pipe.ts   |  2 +-
 .../src/lib/tests/utc-to-local.pipe.spec.ts   | 47 +++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 npm/ng-packs/packages/core/src/lib/tests/utc-to-local.pipe.spec.ts

diff --git a/npm/ng-packs/packages/core/src/lib/pipes/utc-to-local.pipe.ts b/npm/ng-packs/packages/core/src/lib/pipes/utc-to-local.pipe.ts
index 1f06aba74f..0e291ddb55 100644
--- a/npm/ng-packs/packages/core/src/lib/pipes/utc-to-local.pipe.ts
+++ b/npm/ng-packs/packages/core/src/lib/pipes/utc-to-local.pipe.ts
@@ -27,7 +27,7 @@ export class UtcToLocalPipe implements PipeTransform {
     try {
       if (this.timezoneService.isUtcClockEnabled) {
         const timeZone = this.timezoneService.timezone;
-        return this.timeService.formatDateWithStandardOffset(date, format, timeZone);
+        return this.timeService.format(date, format, timeZone);
       } else {
         return this.timeService.formatWithoutTimeZone(date, format);
       }
diff --git a/npm/ng-packs/packages/core/src/lib/tests/utc-to-local.pipe.spec.ts b/npm/ng-packs/packages/core/src/lib/tests/utc-to-local.pipe.spec.ts
new file mode 100644
index 0000000000..6757e1c973
--- /dev/null
+++ b/npm/ng-packs/packages/core/src/lib/tests/utc-to-local.pipe.spec.ts
@@ -0,0 +1,47 @@
+import { createServiceFactory, SpectatorService } from '@ngneat/spectator/vitest';
+import { UtcToLocalPipe } from '../pipes/utc-to-local.pipe';
+import { ConfigStateService, LocalizationService, TimeService, TimezoneService } from '../services';
+
+describe('UtcToLocalPipe', () => {
+  let spectator: SpectatorService<UtcToLocalPipe>;
+  let pipe: UtcToLocalPipe;
+
+  const createService = createServiceFactory({
+    service: UtcToLocalPipe,
+    providers: [
+      TimeService,
+      {
+        provide: TimezoneService,
+        useValue: { isUtcClockEnabled: true, timezone: 'Europe/Lisbon' },
+      },
+      {
+        provide: ConfigStateService,
+        useValue: {
+          getDeep: () => ({ shortDatePattern: 'yyyy-MM-dd', shortTimePattern: 'HH:mm' }),
+        },
+      },
+      { provide: LocalizationService, useValue: {} },
+    ],
+  });
+
+  beforeEach(() => {
+    spectator = createService();
+    pipe = spectator.service;
+  });
+
+  it('should apply daylight saving time when UTC clock is enabled', () => {
+    // Europe/Lisbon is UTC+1 in July (DST)
+    expect(pipe.transform('2025-07-25T12:00:00Z', 'time')).toBe('13:00');
+  });
+
+  it('should use standard offset outside daylight saving time', () => {
+    // Europe/Lisbon is UTC+0 in January (no DST)
+    expect(pipe.transform('2025-01-15T12:00:00Z', 'time')).toBe('12:00');
+  });
+
+  it('should roll the date over when the DST offset crosses midnight', () => {
+    // 23:30 UTC in July becomes 00:30 the next day in Europe/Lisbon (UTC+1)
+    expect(pipe.transform('2025-07-25T23:30:00Z', 'date')).toBe('2025-07-26');
+    expect(pipe.transform('2025-07-25T23:30:00Z', 'datetime')).toBe('2025-07-26 00:30');
+  });
+});