From 0919134f88b29100a65af86e64b227f2a5a75a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matilda=20Landstr=C3=B6m?= Date: Fri, 30 Jan 2026 08:03:28 +0000 Subject: [PATCH] Merged in fix/LOY-597-upcoming-today (pull request #3517) fix(LOY-597): Display "Today" for upcoming stay today * fix(LOY-597): Display "Today" for upcoming stay today Approved-by: Anton Gunnarsson --- .../EmptyUpcomingStays/emptyUpcomingStays.module.css | 1 - apps/scandic-web/utils/getTimeAgoText.test.ts | 6 ++++++ apps/scandic-web/utils/getTimeAgoText.ts | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Stays/Upcoming/EmptyUpcomingStays/emptyUpcomingStays.module.css b/apps/scandic-web/components/Blocks/DynamicContent/Stays/Upcoming/EmptyUpcomingStays/emptyUpcomingStays.module.css index 152202df8..a3735ff47 100644 --- a/apps/scandic-web/components/Blocks/DynamicContent/Stays/Upcoming/EmptyUpcomingStays/emptyUpcomingStays.module.css +++ b/apps/scandic-web/components/Blocks/DynamicContent/Stays/Upcoming/EmptyUpcomingStays/emptyUpcomingStays.module.css @@ -33,7 +33,6 @@ align-items: center; } -/* Styles for new empty upcoming stays design */ .emptyUpcomingStaysContainer { display: flex; padding: var(--Space-x6); diff --git a/apps/scandic-web/utils/getTimeAgoText.test.ts b/apps/scandic-web/utils/getTimeAgoText.test.ts index 34f897939..5f6b9189d 100644 --- a/apps/scandic-web/utils/getTimeAgoText.test.ts +++ b/apps/scandic-web/utils/getTimeAgoText.test.ts @@ -212,6 +212,12 @@ describe("getTimeAgoText", () => { expect(result).toBe("") }) + it("should return Today for todays date", () => { + const todaysDate = dt().format("YYYY-MM-DD") + const result = getTimeAgoText(todaysDate, mockIntl) + + expect(result).toBe("Today") + }) }) describe("boundary transitions", () => { diff --git a/apps/scandic-web/utils/getTimeAgoText.ts b/apps/scandic-web/utils/getTimeAgoText.ts index 8985d4322..c39e1a85d 100644 --- a/apps/scandic-web/utils/getTimeAgoText.ts +++ b/apps/scandic-web/utils/getTimeAgoText.ts @@ -22,6 +22,13 @@ export function getTimeAgoText(checkoutDate: string, intl: IntlShape): string { return "" } + if (daysDiff === 0) { + return intl.formatMessage({ + id: "nextStay.today", + defaultMessage: "Today", + }) + } + if (daysDiff <= 30) { // 1-30 days return intl.formatMessage(