From 26fabdc3d0a40a512d2436b76fbd3a9683aa8fa4 Mon Sep 17 00:00:00 2001 From: Lucas Bordeau Date: Fri, 20 Feb 2026 16:54:38 +0100 Subject: [PATCH] Minor fixes following up Temporal refactor (#18139) Fixes https://github.com/twentyhq/core-team-issues/issues/2034 --- .../utils/getRelativeDateDisplayValue.ts | 2 +- .../components/internal/date/components/DateTimePicker.tsx | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getRelativeDateDisplayValue.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getRelativeDateDisplayValue.ts index 191ea45b73..3ad5bd0fab 100644 --- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getRelativeDateDisplayValue.ts +++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getRelativeDateDisplayValue.ts @@ -29,7 +29,7 @@ export const getRelativeDateDisplayValue = ( const timeZoneAbbreviation = getRelativeDateFilterTimeZoneAbbreviation(relativeDate); - unitFormatted = `${unitFormatted ?? ''} ${shouldDisplayTimeZoneAbbreviation ? `(${timeZoneAbbreviation})` : ''}`; + unitFormatted = `${unitFormatted ?? ''}${shouldDisplayTimeZoneAbbreviation ? ` (${timeZoneAbbreviation})` : ''}`; } return [directionFormatted, amountFormatted, unitFormatted] diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx index cf4682743c..df4760b36d 100644 --- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx +++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx @@ -451,9 +451,12 @@ export const DateTimePicker = ({ ? highlightedDates.map((plainDate) => { const date = new Date(); - date.setDate(plainDate.day); - date.setMonth(plainDate.month - 1); + date.setDate(1); + date.setFullYear(plainDate.year); + date.setMonth(plainDate.month - 1); + + date.setDate(plainDate.day); return date; })