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

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);

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", () => {

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(