Skip to content

Commit 26fabdc

Browse files
authored
Minor fixes following up Temporal refactor (#18139)
Fixes twentyhq/core-team-issues#2034
1 parent 8261772 commit 26fabdc

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/getRelativeDateDisplayValue.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const getRelativeDateDisplayValue = (
2929
const timeZoneAbbreviation =
3030
getRelativeDateFilterTimeZoneAbbreviation(relativeDate);
3131

32-
unitFormatted = `${unitFormatted ?? ''} ${shouldDisplayTimeZoneAbbreviation ? `(${timeZoneAbbreviation})` : ''}`;
32+
unitFormatted = `${unitFormatted ?? ''}${shouldDisplayTimeZoneAbbreviation ? ` (${timeZoneAbbreviation})` : ''}`;
3333
}
3434

3535
return [directionFormatted, amountFormatted, unitFormatted]

packages/twenty-front/src/modules/ui/input/components/internal/date/components/DateTimePicker.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -451,9 +451,12 @@ export const DateTimePicker = ({
451451
? highlightedDates.map((plainDate) => {
452452
const date = new Date();
453453

454-
date.setDate(plainDate.day);
455-
date.setMonth(plainDate.month - 1);
454+
date.setDate(1);
455+
456456
date.setFullYear(plainDate.year);
457+
date.setMonth(plainDate.month - 1);
458+
459+
date.setDate(plainDate.day);
457460

458461
return date;
459462
})

0 commit comments

Comments
 (0)