diff --git a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx index 94c1e217c7..4275b505f6 100644 --- a/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx +++ b/packages/twenty-front/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdownCalendarViewContent.tsx @@ -12,6 +12,7 @@ import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/ho import { useUpdateCurrentView } from '@/views/hooks/useUpdateCurrentView'; import { t } from '@lingui/core/macro'; import { useRecoilValue, useSetRecoilState } from 'recoil'; +import { Pill } from 'twenty-ui/components'; import { IconCalendarMonth, IconCalendarWeek, @@ -81,6 +82,8 @@ export const ObjectOptionsDropdownCalendarViewContent = () => { text={t`Week`} selected={recordIndexCalendarLayout === ViewCalendarLayout.WEEK} focused={selectedItemId === ViewCalendarLayout.WEEK} + contextualText={} + contextualTextPosition="right" disabled /> @@ -105,6 +108,8 @@ export const ObjectOptionsDropdownCalendarViewContent = () => { text={t`Timeline`} selected={recordIndexCalendarLayout === ViewCalendarLayout.DAY} focused={selectedItemId === ViewCalendarLayout.DAY} + contextualText={} + contextualTextPosition="right" disabled /> diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx index 1826e7d8af..01b58b1fb7 100644 --- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx +++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx @@ -1,9 +1,7 @@ import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext'; import { recordCalendarSelectedDateComponentState } from '@/object-record/record-calendar/states/recordCalendarSelectedDateComponentState'; -import { recordIndexCalendarLayoutState } from '@/object-record/record-index/states/recordIndexCalendarLayoutState'; import { DatePickerWithoutCalendar } from '@/ui/input/components/internal/date/components/DatePickerWithoutCalendar'; import { TimeZoneAbbreviation } from '@/ui/input/components/internal/date/components/TimeZoneAbbreviation'; -import { Select } from '@/ui/input/components/Select'; import { SelectControl } from '@/ui/input/components/SelectControl'; import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown'; import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent'; @@ -14,7 +12,6 @@ import { useRecoilComponentState } from '@/ui/utilities/state/component-state/ho import styled from '@emotion/styled'; import { t } from '@lingui/core/macro'; import { format } from 'date-fns'; -import { useRecoilValue } from 'recoil'; import { Temporal } from 'temporal-polyfill'; import { type Nullable } from 'twenty-shared/types'; import { @@ -23,7 +20,6 @@ import { } from 'twenty-shared/utils'; import { IconChevronLeft, IconChevronRight } from 'twenty-ui/display'; import { Button } from 'twenty-ui/input'; -import { ViewCalendarLayout } from '~/generated/graphql'; const StyledContainer = styled.div` align-items: center; @@ -55,10 +51,6 @@ export const RecordCalendarTopBar = () => { RecordCalendarComponentInstanceContext, ); - const recordIndexCalendarLayout = useRecoilValue( - recordIndexCalendarLayoutState, - ); - const [recordCalendarSelectedDate, setRecordCalendarSelectedDate] = useRecoilComponentState(recordCalendarSelectedDateComponentState); @@ -98,27 +90,6 @@ export const RecordCalendarTopBar = () => { return ( -