diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDateFormatSelect.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDateFormatSelect.tsx
new file mode 100644
index 000000000..278af533e
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDateFormatSelect.tsx
@@ -0,0 +1,34 @@
+import { formatInTimeZone } from 'date-fns-tz';
+
+import { DateFormat } from '@/settings/accounts/constants/DateFormat';
+import { Select } from '@/ui/input/components/Select';
+
+type SettingsAccountsCalendarDateFormatSelectProps = {
+ value: DateFormat;
+ onChange: (nextValue: DateFormat) => void;
+ timeZone: string;
+};
+
+export const SettingsAccountsCalendarDateFormatSelect = ({
+ onChange,
+ timeZone,
+ value,
+}: SettingsAccountsCalendarDateFormatSelectProps) => (
+
+);
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDisplaySettings.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDisplaySettings.tsx
index 880cf68c0..4f01ed496 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDisplaySettings.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarDisplaySettings.tsx
@@ -1,10 +1,12 @@
import { useState } from 'react';
import styled from '@emotion/styled';
-import { formatInTimeZone } from 'date-fns-tz';
+import { SettingsAccountsCalendarDateFormatSelect } from '@/settings/accounts/components/SettingsAccountsCalendarDateFormatSelect';
+import { SettingsAccountsCalendarTimeFormatSelect } from '@/settings/accounts/components/SettingsAccountsCalendarTimeFormatSelect';
import { SettingsAccountsCalendarTimeZoneSelect } from '@/settings/accounts/components/SettingsAccountsCalendarTimeZoneSelect';
+import { DateFormat } from '@/settings/accounts/constants/DateFormat';
+import { TimeFormat } from '@/settings/accounts/constants/TimeFormat';
import { detectTimeZone } from '@/settings/accounts/utils/detectTimeZone';
-import { Select } from '@/ui/input/components/Select';
const StyledContainer = styled.div`
display: flex;
@@ -16,8 +18,11 @@ export const SettingsAccountsCalendarDisplaySettings = () => {
// TODO: use the user's saved time zone. If undefined, default it with the user's detected time zone.
const [timeZone, setTimeZone] = useState(detectTimeZone());
+ // TODO: use the user's saved date format.
+ const [dateFormat, setDateFormat] = useState(DateFormat.US);
+
// TODO: use the user's saved time format.
- const [timeFormat, setTimeFormat] = useState<12 | 24>(24);
+ const [timeFormat, setTimeFormat] = useState(TimeFormat['24h']);
return (
@@ -25,22 +30,15 @@ export const SettingsAccountsCalendarDisplaySettings = () => {
value={timeZone}
onChange={setTimeZone}
/>
-
+
);
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarTimeFormatSelect.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarTimeFormatSelect.tsx
new file mode 100644
index 000000000..cab95257d
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsCalendarTimeFormatSelect.tsx
@@ -0,0 +1,42 @@
+import { formatInTimeZone } from 'date-fns-tz';
+
+import { TimeFormat } from '@/settings/accounts/constants/TimeFormat';
+import { Select } from '@/ui/input/components/Select';
+
+type SettingsAccountsCalendarTimeFormatSelectProps = {
+ value: TimeFormat;
+ onChange: (nextValue: TimeFormat) => void;
+ timeZone: string;
+};
+
+export const SettingsAccountsCalendarTimeFormatSelect = ({
+ onChange,
+ timeZone,
+ value,
+}: SettingsAccountsCalendarTimeFormatSelectProps) => (
+
+);
diff --git a/packages/twenty-front/src/modules/settings/accounts/constants/DateFormat.ts b/packages/twenty-front/src/modules/settings/accounts/constants/DateFormat.ts
new file mode 100644
index 000000000..985814c67
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/constants/DateFormat.ts
@@ -0,0 +1,4 @@
+export enum DateFormat {
+ US = 'MMM d, yyyy',
+ UK = 'd MMM yyyy',
+}
diff --git a/packages/twenty-front/src/modules/settings/accounts/constants/TimeFormat.ts b/packages/twenty-front/src/modules/settings/accounts/constants/TimeFormat.ts
new file mode 100644
index 000000000..e168d1fda
--- /dev/null
+++ b/packages/twenty-front/src/modules/settings/accounts/constants/TimeFormat.ts
@@ -0,0 +1,4 @@
+export enum TimeFormat {
+ '24h' = 'HH:mm',
+ '12h' = 'h:mm aa',
+}