Show Spotnana's hotel cancellation deadline instead of check-in minus duration

src/CONST/index.ts

@@ -6427,6 +6427,7 @@ const CONST = {
         ROOM_NAME_WITHOUT_LIMIT: /^#[\p{Ll}0-9-]+$/u,
         DOMAIN_BASE: '^(?:https?:\\/\\/)?(?:www\\.)?([^\\/]+)',
         ALPHANUMERIC_WITH_SPACE_AND_HYPHEN: /^[A-Za-z0-9 -]+$/,
+        ISO_8601_UTC_OFFSET_SUFFIX: /([+-]\d{2}:\d{2})$/,
 
         // eslint-disable-next-line no-misleading-character-class
         EMOJI: /[\p{Extended_Pictographic}\u200d\u{1f1e6}-\u{1f1ff}\u{1f3fb}-\u{1f3ff}\u{e0020}-\u{e007f}\u20E3\uFE0F]|[#*0-9]\uFE0F?\u20E3/gu,

src/languages/de.ts

@@ -5011,6 +5011,7 @@ ${amount} für ${merchant} – ${date}`,
             roomType: 'Zimmertyp',
             cancellation: 'Stornierungsrichtlinie',
             cancellationUntil: 'Kostenlose Stornierung bis',
+            hotelLocalTime: 'Ortszeit des Hotels',
             confirmation: 'Bestätigungsnummer',
             cancellationPolicies: {
                 unknown: 'Unbekannt',

src/languages/el.ts

@@ -5065,6 +5065,7 @@ ${amount} για ${merchant} - ${date}`,
             roomType: 'Τύπος δωματίου',
             cancellation: 'Πολιτική ακύρωσης',
             cancellationUntil: 'Δωρεάν ακύρωση έως',
+            hotelLocalTime: 'τοπική ώρα του ξενοδοχείου',
             confirmation: 'Αριθμός επιβεβαίωσης',
             cancellationPolicies: {
                 unknown: 'Άγνωστο',

src/languages/en.ts

@@ -5195,6 +5195,7 @@ const translations = {
             roomType: 'Room type',
             cancellation: 'Cancellation policy',
             cancellationUntil: 'Free cancellation until',
+            hotelLocalTime: "hotel's local time",
             confirmation: 'Confirmation number',
             cancellationPolicies: {
                 unknown: 'Unknown',

src/languages/es.ts

@@ -4916,6 +4916,7 @@ ${amount} para ${merchant} - ${date}`,
             roomType: 'Tipo de habitación',
             cancellation: 'Política de cancelación',
             cancellationUntil: 'Cancelación gratuita hasta el',
+            hotelLocalTime: 'hora local del hotel',
             confirmation: 'Número de confirmación',
             cancellationPolicies: {
                 unknown: 'Desconocido',

src/languages/fr.ts

@@ -5019,6 +5019,7 @@ ${amount} pour ${merchant} - ${date}`,
             roomType: 'Type de chambre',
             cancellation: 'Politique d’annulation',
             cancellationUntil: 'Annulation gratuite jusqu’au',
+            hotelLocalTime: 'heure locale de l’hôtel',
             confirmation: 'Numéro de confirmation',
             cancellationPolicies: {
                 unknown: 'Inconnu',

src/languages/it.ts

@@ -4987,6 +4987,7 @@ ${amount} per ${merchant} - ${date}`,
             roomType: 'Tipo di camera',
             cancellation: 'Politica di cancellazione',
             cancellationUntil: 'Cancellazione gratuita fino al',
+            hotelLocalTime: 'ora locale dell’hotel',
             confirmation: 'Numero di conferma',
             cancellationPolicies: {
                 unknown: 'Sconosciuto',

src/languages/ja.ts

@@ -4944,6 +4944,7 @@ ${integrationName === CONST.ONBOARDING_ACCOUNTING_MAPPING.other ? 'あなたの'
             roomType: '部屋タイプ',
             cancellation: 'キャンセルポリシー',
             cancellationUntil: '無料キャンセル期限：',
+            hotelLocalTime: 'ホテルの現地時間',
             confirmation: '確認番号',
             cancellationPolicies: {
                 unknown: '不明',

src/languages/nl.ts

@@ -4987,6 +4987,7 @@ ${amount} voor ${merchant} - ${date}`,
             roomType: 'Kamertype',
             cancellation: 'Annuleringsbeleid',
             cancellationUntil: 'Gratis annuleren tot',
+            hotelLocalTime: 'lokale tijd van het hotel',
             confirmation: 'Bevestigingsnummer',
             cancellationPolicies: {
                 unknown: 'Onbekend',

src/languages/pl.ts

@@ -5021,6 +5021,7 @@ ${amount} dla ${merchant} - ${date}`,
             roomType: 'Rodzaj pokoju',
             cancellation: 'Zasady anulowania',
             cancellationUntil: 'Bezpłatne anulowanie do',
+            hotelLocalTime: 'czas lokalny hotelu',
             confirmation: 'Numer potwierdzenia',
             cancellationPolicies: {
                 unknown: 'Nieznane',

src/languages/pt-BR.ts

@@ -4982,6 +4982,7 @@ ${amount} para ${merchant} - ${date}`,
             roomType: 'Tipo de quarto',
             cancellation: 'Política de cancelamento',
             cancellationUntil: 'Cancelamento grátis até',
+            hotelLocalTime: 'horário local do hotel',
             confirmation: 'Número de confirmação',
             cancellationPolicies: {
                 unknown: 'Desconhecido',

src/languages/zh-hans.ts

@@ -4837,6 +4837,7 @@ ${amount}，商户：${merchant} - 日期：${date}`,
             roomType: '房型',
             cancellation: '取消政策',
             cancellationUntil: '免费取消截止至',
+            hotelLocalTime: '酒店当地时间',
             confirmation: '确认编号',
             cancellationPolicies: {
                 unknown: '未知',

src/libs/DateUtils.ts

@@ -965,18 +965,26 @@ function getCancellationDateTimezoneLabel(venueTimezone: string): string {
  * Dates are formatted as follows:
  * 1. When the date refers to the current year: Wednesday, Mar 17 8:00 AM, GMT+7
  * 2. When the date refers not to the current year: Wednesday, Mar 17, 2023 8:00 AM, GMT+7
+ * When the string has no offset, `localTimeLabel` (e.g. "hotel's local time") is appended instead of a timezone label, if passed.
  */
-function getFormattedCancellationDate(isoDateString: string, dateFnsLocale: DateFnsLocale | undefined): string {
+function getFormattedCancellationDate(isoDateString: string, dateFnsLocale: DateFnsLocale | undefined, localTimeLabel?: string): string {
     if (!isoDateString) {
         return '';
     }
-    const offsetMatch = isoDateString.match(/([+-]\d{2}:\d{2})$/);
+    const offsetMatch = isoDateString.match(CONST.REGEX.ISO_8601_UTC_OFFSET_SUFFIX);
     const venueTimezone = offsetMatch ? offsetMatch[1] : 'UTC';
-    const date = new Date(isoDateString);
+    // A string with no offset and no `Z` is the venue's wall-clock time in an unknown timezone. `new Date` would read it
+    // in the device's timezone, so read it as-is and leave out the timezone label instead of guessing one.
+    const isWallClockTime = !offsetMatch && !isoDateString.endsWith('Z');
+    const date = isWallClockTime ? fromZonedTime(isoDateString, venueTimezone) : new Date(isoDateString);
     const pattern = isThisYear(date) ? `EEEE, MMM d ${CONST.DATE.LOCAL_TIME_FORMAT}` : `EEEE, MMM d, yyyy ${CONST.DATE.LOCAL_TIME_FORMAT}`;
+    const formattedDate = formatInTimeZone(date, venueTimezone, pattern, {locale: dateFnsLocale});
+    if (isWallClockTime) {
+        return localTimeLabel ? `${formattedDate}, ${localTimeLabel}` : formattedDate;
+    }
     // `formatInTimeZone`'s `zzz` token relies on `Intl.DateTimeFormat`, which rejects raw offset strings like
     // `+07:00`, so the timezone label is derived from the offset and appended manually.
-    return `${formatInTimeZone(date, venueTimezone, pattern, {locale: dateFnsLocale})}, ${getCancellationDateTimezoneLabel(venueTimezone)}`;
+    return `${formattedDate}, ${getCancellationDateTimezoneLabel(venueTimezone)}`;
 }
 
 /**

src/libs/TripReservationUtils.ts

@@ -8,8 +8,6 @@ import type IconAsset from '@src/types/utils/IconAsset';
 
 import type {ArrayValues} from 'type-fest';
 
-import {format, subSeconds} from 'date-fns';
-import {fromZonedTime, toZonedTime} from 'date-fns-tz';
 import {SafeString} from 'expensify-common';
 
 import {getMoneyRequestSpendBreakdown} from './ReportUtils';
@@ -241,35 +239,21 @@ function getAirReservations(pnr: Pnr, travelers: PnrTraveler[]): ReservationItem
 }
 
 function getCancellationDeadline(pnrData: HotelPnr): string | undefined {
+    // A deadline would show "Free cancellation until …", which is wrong for a non-refundable room.
+    if (pnrData.room.cancellationPolicy?.policy === CONST.CANCELLATION_POLICY.NON_REFUNDABLE) {
+        return undefined;
+    }
     const deadlineUtc = pnrData.room.cancellationPolicy?.deadlineUtc?.iso8601;
-    const duration = pnrData.room.cancellationPolicy?.durationBeforeArrivalDeadline?.iso8601;
-    const checkIn = pnrData.checkInDateTime?.iso8601;
-    if (deadlineUtc && duration && checkIn) {
-        // 1. Extract the target UTC offset from deadlineUtc (e.g. "-04:00")
-        const match = deadlineUtc.match(/(Z|[+-]\d{2}:\d{2})$/);
-        if (!match) {
-            return pnrData.room.cancellationPolicy?.deadlineUtc?.iso8601;
-        }
-        const utcOffset = match[1] === 'Z' ? '+00:00' : match[1];
-
-        // 2. Convert the check-in wall-clock time to an absolute UTC instant,
-        //    treating it as being expressed in the target offset timezone.
-        const checkInUtc = fromZonedTime(checkIn, utcOffset);
-
-        // 3. Subtract the duration in UTC-space (preserves wall-clock intent for
-        //    day/hour units; DST transitions are irrelevant for fixed offsets).
-        const deadlineUtcInstant = subSeconds(checkInUtc, parseDurationToSeconds(duration));
-
-        // 4. Convert back to the target offset's wall-clock representation.
-        const deadlineZoned = toZonedTime(deadlineUtcInstant, utcOffset);
-
-        // 5. Format as ISO-8601 with the explicit offset suffix.
-        //    `format` with "yyyy-MM-dd'T'HH:mm:ss" gives the bare local datetime;
-        //    we then append the offset so the result is a proper fixed-offset string.
-        const localPart = format(deadlineZoned, "yyyy-MM-dd'T'HH:mm:ss");
-        return `${localPart}${utcOffset}`;
+    // `deadlineUtc` with an offset is the exact deadline Spotnana shows, in the hotel's timezone.
+    if (deadlineUtc && CONST.REGEX.ISO_8601_UTC_OFFSET_SUFFIX.test(deadlineUtc)) {
+        return deadlineUtc;
+    }
+    // `deadline` is usually the hotel's wall-clock time with no offset.
+    const deadline = pnrData.room.cancellationPolicy?.deadline?.iso8601;
+    if (deadline) {
+        return deadline;
     }
-    return pnrData.room.cancellationPolicy?.deadlineUtc?.iso8601;
+    return deadlineUtc;
 }
 
 function getHotelReservations(pnr: Pnr, travelers: PnrTraveler[]): ReservationItem[] {

src/pages/Travel/HotelTripDetails.tsx

@@ -38,7 +38,7 @@ function HotelTripDetails({reservation, personalDetails}: HotelTripDetailsProps)
     const checkInDate = DateUtils.getFormattedTransportDateAndHour(new Date(reservation.start.date), dateFnsLocale);
     const checkOutDate = DateUtils.getFormattedTransportDateAndHour(new Date(reservation.end.date), dateFnsLocale);
     const cancellationText = reservation.cancellationDeadline
-        ? `${translate('travel.hotelDetails.cancellationUntil')} ${DateUtils.getFormattedCancellationDate(reservation.cancellationDeadline, dateFnsLocale)}`
+        ? `${translate('travel.hotelDetails.cancellationUntil')} ${DateUtils.getFormattedCancellationDate(reservation.cancellationDeadline, dateFnsLocale, translate('travel.hotelDetails.hotelLocalTime'))}`
         : cancellationMapping[reservation.cancellationPolicy ?? CONST.CANCELLATION_POLICY.UNKNOWN];
 
     const displayName = personalDetails?.displayName ?? reservation.travelerPersonalInfo?.name;

tests/unit/DateUtilsTest.ts

@@ -979,11 +979,52 @@ describe('DateUtils', () => {
             expect(DateUtils.getFormattedCancellationDate('', undefined)).toBe('');
         });
 
-        it('should fall back to UTC when no timezone offset is present in the ISO string', () => {
+        it('should show the wall-clock time without a timezone label when no timezone offset is present in the ISO string', () => {
+            // Given a wall-clock time with no offset, so its timezone is unknown.
             // Pin "now" before 2026 so the 2026 date is treated as a non-current year and the year is shown.
             jest.useFakeTimers();
             jest.setSystemTime(new Date('2025-01-01T00:00:00Z'));
+
+            // When it is formatted
             const result = DateUtils.getFormattedCancellationDate('2026-04-19T15:00:00', undefined);
+
+            // Then the time is shown as-is with no guessed timezone label
+            expect(result).toBe('Sunday, Apr 19, 2026 3:00 PM');
+        });
+
+        it('should append the local time label when no timezone offset is present in the ISO string', () => {
+            // Given a hotel-local deadline with no offset, so the hotel page passes a label saying it is the hotel's local time
+            jest.useFakeTimers();
+            jest.setSystemTime(new Date('2026-10-01T00:00:00Z'));
+
+            // When it is formatted with the label
+            const result = DateUtils.getFormattedCancellationDate('2026-10-19T23:59:00', undefined, "hotel's local time");
+
+            // Then the label is shown at the end in place of a timezone label
+            expect(result).toBe("Monday, Oct 19 11:59 PM, hotel's local time");
+        });
+
+        it('should keep the GMT offset label instead of the local time label when an offset is present', () => {
+            // Given a hotel deadline with a known offset
+            jest.useFakeTimers();
+            jest.setSystemTime(new Date('2026-10-01T00:00:00Z'));
+
+            // When it is formatted with the local time label
+            const result = DateUtils.getFormattedCancellationDate('2026-10-19T23:59:00+01:00', undefined, "hotel's local time");
+
+            // Then the known offset is shown, since it is more precise than the label
+            expect(result).toBe('Monday, Oct 19 11:59 PM, GMT+1');
+        });
+
+        it('should label a UTC time ending in Z as UTC', () => {
+            // Given a deadline that ends in Z, so its timezone is known
+            jest.useFakeTimers();
+            jest.setSystemTime(new Date('2025-01-01T00:00:00Z'));
+
+            // When it is formatted
+            const result = DateUtils.getFormattedCancellationDate('2026-04-19T15:00:00Z', undefined);
+
+            // Then it keeps the UTC label
             expect(result).toBe('Sunday, Apr 19, 2026 3:00 PM, UTC');
         });