The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Untangle the front ui module from app and domain code (#27432)
Félix Malfait30dd9572746f
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsxindex ada712ccdbb..13cadce0794 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/components/TimelineCard.tsx@@ -11,7 +11,6 @@ import { StyledWidgetScrollContainer } from '@/ui/layout/components/WidgetContenimport { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';import { t } from '@lingui/core/macro';-import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme';const StyledMainContainer = styled(StyledWidgetScrollContainer)`diff --git a/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx b/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsxindex af191a81b32..2e07841e41b 100644--- a/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx+++ b/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx@@ -15,7 +15,7 @@ import { agentChatIsMessageBeforeFirstUserMessageComponentFamilySelector } fromimport { agentChatMessageComponentFamilySelector } from '@/ai/states/selectors/agentChatMessageComponentFamilySelector';import { getAgentChatSenderLabel } from '@/ai/utils/getAgentChatSenderLabel';import { type AiChatError } from '@/ai/types/AiChatError';-import { LightCopyIconButton } from '@/object-record/record-field/ui/components/LightCopyIconButton';+import { LightCopyIconButton } from '@/ui/input/components/LightCopyIconButton';import { useAtomComponentFamilySelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilySelectorValue';import { useAtomComponentSelectorValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentSelectorValue';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';diff --git a/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatContent.tsx b/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatContent.tsxindex 4972fdc53cb..3160cd758a4 100644--- a/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatContent.tsx+++ b/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatContent.tsx@@ -1,4 +1,4 @@-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { themeCssVariables } from 'twenty-ui/theme';diff --git a/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatThreadItem.tsx b/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatThreadItem.tsxindex 616bcb5a222..94f9fdeb599 100644--- a/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatThreadItem.tsx+++ b/packages/twenty-front/src/modules/ai/components/NavigationDrawerAiChatThreadItem.tsx@@ -1,5 +1,5 @@import { IconMessage } from 'twenty-ui/icon';-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { useLingui } from '@lingui/react/macro';import { useId } from 'react';diff --git a/packages/twenty-front/src/modules/ai/components/__tests__/NavigationDrawerAiChatContent.test.tsx b/packages/twenty-front/src/modules/ai/components/__tests__/NavigationDrawerAiChatContent.test.tsxindex 6af97ca9008..461c4d66bd9 100644--- a/packages/twenty-front/src/modules/ai/components/__tests__/NavigationDrawerAiChatContent.test.tsx+++ b/packages/twenty-front/src/modules/ai/components/__tests__/NavigationDrawerAiChatContent.test.tsx@@ -46,9 +46,12 @@ jest.mock('@/ai/hooks/useAiChatThreadClick', () => ({useAiChatThreadClick: () => ({ handleThreadClick: jest.fn() }),}));-jest.mock('@/navigation/hooks/useIsNavigationDrawerContentExpanded', () => ({- useIsNavigationDrawerContentExpanded: () => true,-}));+jest.mock(+ '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded',+ () => ({+ useIsNavigationDrawerContentExpanded: () => true,+ }),+);jest.mock('@/ai/components/NavigationDrawerAiChatTriageSection', () => ({NavigationDrawerAiChatTriageSection: () => null,diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsx b/packages/twenty-front/src/modules/app/components/DefaultLayout.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/ui/layout/page/components/DefaultLayout.tsxrename to packages/twenty-front/src/modules/app/components/DefaultLayout.tsxdiff --git a/packages/twenty-front/src/modules/ui/layout/page/components/MainAppLayoutWithSidePanel.tsx b/packages/twenty-front/src/modules/app/components/MainAppLayoutWithSidePanel.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/ui/layout/page/components/MainAppLayoutWithSidePanel.tsxrename to packages/twenty-front/src/modules/app/components/MainAppLayoutWithSidePanel.tsxdiff --git a/packages/twenty-front/src/modules/ui/utilities/page-favicon/components/PageFavicon.tsx b/packages/twenty-front/src/modules/app/components/PageFavicon.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/ui/utilities/page-favicon/components/PageFavicon.tsxrename to packages/twenty-front/src/modules/app/components/PageFavicon.tsxdiff --git a/packages/twenty-front/src/modules/app/components/RootAppProviders.tsx b/packages/twenty-front/src/modules/app/components/RootAppProviders.tsxindex 5e842700128..bfa793da571 100644--- a/packages/twenty-front/src/modules/app/components/RootAppProviders.tsx+++ b/packages/twenty-front/src/modules/app/components/RootAppProviders.tsx@@ -14,7 +14,7 @@ import { UserMetadataProviderInitialEffect } from '@/metadata-store/effect-compoimport { DialogManager } from '@/ui/feedback/dialog-manager/components/DialogManager';import { DialogComponentInstanceContext } from '@/ui/feedback/dialog-manager/contexts/DialogComponentInstanceContext';import { AppToaster } from '@/ui/feedback/toast/components/AppToaster';-import { PageFavicon } from '@/ui/utilities/page-favicon/components/PageFavicon';+import { PageFavicon } from '@/app/components/PageFavicon';import { PageTitle } from '@/ui/utilities/page-title/components/PageTitle';import { WorkspaceProviderEffect } from '@/workspace/components/WorkspaceProviderEffect';import { getPageTitleFromPath } from '~/utils/title-utils';diff --git a/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsx b/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsxindex 3282c2d41b1..6a6465c9894 100644--- a/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsx+++ b/packages/twenty-front/src/modules/app/components/WorkspaceAppProviders.tsx@@ -34,9 +34,9 @@ import { DialogManager } from '@/ui/feedback/dialog-manager/components/DialogManimport { DialogComponentInstanceContext } from '@/ui/feedback/dialog-manager/contexts/DialogComponentInstanceContext';import { AppToaster } from '@/ui/feedback/toast/components/AppToaster';import { GlobalFilePreviewModal } from '@/ui/field/display/components/GlobalFilePreviewModal';-import { UserThemeProviderEffect } from '@/ui/theme/components/UserThemeProviderEffect';-import { UserUiScaleProviderEffect } from '@/ui/theme/components/UserUiScaleProviderEffect';-import { PageFavicon } from '@/ui/utilities/page-favicon/components/PageFavicon';+import { UserThemeProviderEffect } from '@/workspace-member/effect-components/UserThemeProviderEffect';+import { UserUiScaleProviderEffect } from '@/workspace-member/effect-components/UserUiScaleProviderEffect';+import { PageFavicon } from '@/app/components/PageFavicon';import { UserContextProvider } from '@/users/components/UserContextProvider';import { WorkspaceProviderEffect } from '@/workspace/components/WorkspaceProviderEffect';diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/__tests__/MainAppLayoutWithSidePanel.test.tsx b/packages/twenty-front/src/modules/app/components/__tests__/MainAppLayoutWithSidePanel.test.tsxsimilarity index 97%rename from packages/twenty-front/src/modules/ui/layout/page/components/__tests__/MainAppLayoutWithSidePanel.test.tsxrename to packages/twenty-front/src/modules/app/components/__tests__/MainAppLayoutWithSidePanel.test.tsxindex dccddce0b0d..94199c9679e 100644--- a/packages/twenty-front/src/modules/ui/layout/page/components/__tests__/MainAppLayoutWithSidePanel.test.tsx+++ b/packages/twenty-front/src/modules/app/components/__tests__/MainAppLayoutWithSidePanel.test.tsx@@ -16,7 +16,7 @@ import {import { type WorkspaceRouteObject } from '@/app/routing/types/WorkspaceRouteObject';import { getWorkspaceRouteObjectsForSurface } from '@/app/routing/utils/getWorkspaceRouteObjectsForSurface';-import { MainAppLayoutWithSidePanel } from '@/ui/layout/page/components/MainAppLayoutWithSidePanel';+import { MainAppLayoutWithSidePanel } from '@/app/components/MainAppLayoutWithSidePanel';const mockProviderStats = { current: 0, max: 0 };const mockSeenParams: Record<string, string | undefined>[] = [];diff --git a/packages/twenty-front/src/modules/app/hooks/useCreateWorkspaceAppRouter.tsx b/packages/twenty-front/src/modules/app/hooks/useCreateWorkspaceAppRouter.tsxindex a718b12b7a2..cf6ec4c97e0 100644--- a/packages/twenty-front/src/modules/app/hooks/useCreateWorkspaceAppRouter.tsx+++ b/packages/twenty-front/src/modules/app/hooks/useCreateWorkspaceAppRouter.tsx@@ -17,8 +17,8 @@ import { OnboardingStepPageLoader } from '@/onboarding/components/OnboardingStepimport { OnboardingTransitionOutlet } from '@/onboarding/components/OnboardingTransitionOutlet';import { AuthFlowLayout } from '@/ui/layout/page/components/AuthFlowLayout';import { BlankLayout } from '@/ui/layout/page/components/BlankLayout';-import { DefaultLayout } from '@/ui/layout/page/components/DefaultLayout';-import { MainAppLayoutWithSidePanel } from '@/ui/layout/page/components/MainAppLayoutWithSidePanel';+import { DefaultLayout } from '@/app/components/DefaultLayout';+import { MainAppLayoutWithSidePanel } from '@/app/components/MainAppLayoutWithSidePanel';import { Verify } from '~/pages/onboarding/Verify';import { lazyWithPreload } from '~/utils/lazyWithPreload';diff --git a/packages/twenty-front/src/modules/command-menu-item/display/components/__stories__/SidePanelCommandMenuItemDisplayPage.stories.tsx b/packages/twenty-front/src/modules/command-menu-item/display/components/__stories__/SidePanelCommandMenuItemDisplayPage.stories.tsxindex 1c9a58d6e72..a2d5b6d5b6f 100644--- a/packages/twenty-front/src/modules/command-menu-item/display/components/__stories__/SidePanelCommandMenuItemDisplayPage.stories.tsx+++ b/packages/twenty-front/src/modules/command-menu-item/display/components/__stories__/SidePanelCommandMenuItemDisplayPage.stories.tsx@@ -34,7 +34,6 @@ import { focusStackState } from '@/ui/utilities/focus/states/focusStackState';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';import { type ViewWithRelations } from '@/views/types/ViewWithRelations';-import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';import { type CommandMenuContextApi } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import {@@ -51,6 +50,7 @@ import { mockedCompanyRecords } from '~/testing/mock-data/generated/data/companiimport { mockedViews } from '~/testing/mock-data/generated/metadata/views/mock-views-data';import { mockedWorkspaceMemberData } from '~/testing/mock-data/users';import { setTestViewsInMetadataStore } from '~/testing/utils/setTestViewsInMetadataStore';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';const PINNED_ITEM_WIDTH = 100;diff --git a/packages/twenty-front/src/modules/command-menu-item/display/hooks/useCommandMenuAppActions.ts b/packages/twenty-front/src/modules/command-menu-item/display/hooks/useCommandMenuAppActions.tsindex f87a7e65ca7..c36c63e15d6 100644--- a/packages/twenty-front/src/modules/command-menu-item/display/hooks/useCommandMenuAppActions.ts+++ b/packages/twenty-front/src/modules/command-menu-item/display/hooks/useCommandMenuAppActions.ts@@ -4,24 +4,24 @@ import { isLogConsoleFullScreenState } from '@/log-console/states/isLogConsoleFuimport { logConsoleDisplayModeState } from '@/log-console/states/logConsoleDisplayModeState';import { logConsoleSelectedLogState } from '@/log-console/states/logConsoleSelectedLogState';import { useIsSettingsDrawer } from '@/navigation/hooks/useIsSettingsDrawer';-import { useNavigationDrawerTogglePresentation } from '@/navigation/hooks/useNavigationDrawerTogglePresentation';+import { useNavigationDrawerTogglePresentation } from '@/ui/navigation/navigation-drawer/hooks/useNavigationDrawerTogglePresentation';import { useSetAdvancedMode } from '@/navigation/hooks/useSetAdvancedMode';-import { useToggleNavigationDrawer } from '@/navigation/hooks/useToggleNavigationDrawer';+import { useToggleNavigationDrawer } from '@/ui/navigation/navigation-drawer/hooks/useToggleNavigationDrawer';import { sidePanelSearchState } from '@/side-panel/states/sidePanelSearchState';import { isAdvancedModeEnabledState } from '@/ui/navigation/navigation-drawer/states/isAdvancedModeEnabledState';import { isSelectOptionMatchingSearch } from '@/ui/input/components/internal/select/utils/isSelectOptionMatchingSearch';-import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';+import { useColorScheme } from '@/workspace-member/hooks/useColorScheme';import { normalizeSearchText, useIsMobile } from 'twenty-ui/utilities';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';-import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';import { useLingui } from '@lingui/react/macro';import { useContext } from 'react';import { IconCode, IconCopy, IconTerminal } from 'twenty-ui/icon';import { FeatureFlagKey } from '~/generated-metadata/graphql';import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';export const useCommandMenuAppActions = () => {const { t } = useLingui();diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemNumberInput.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemNumberInput.tsxindex c0537b39109..ee305c76de4 100644--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemNumberInput.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemNumberInput.tsx@@ -1,5 +1,5 @@import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { TextInput } from '@/ui/input/components/TextInput';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemTextInput.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemTextInput.tsxindex cdd8af714c1..2f02ce65077 100644--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemTextInput.tsx+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuItemTextInput.tsx@@ -1,5 +1,5 @@import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { TextInput } from '@/ui/input/components/TextInput';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';diff --git a/packages/twenty-front/src/modules/localization/hooks/__tests__/useFormatPreferences.test.tsx b/packages/twenty-front/src/modules/localization/hooks/__tests__/useFormatPreferences.test.tsxindex 5212783b0f8..2ddefaf4319 100644--- a/packages/twenty-front/src/modules/localization/hooks/__tests__/useFormatPreferences.test.tsx+++ b/packages/twenty-front/src/modules/localization/hooks/__tests__/useFormatPreferences.test.tsx@@ -15,11 +15,11 @@ import { detectNumberFormat } from '@/localization/utils/detection/detectNumberFimport { detectTimeFormat } from '@/localization/utils/detection/detectTimeFormat';import { detectTimeZone } from '@/localization/utils/detection/detectTimeZone';import { getWorkspaceMemberUpdateFromFormatPreferences } from '@/localization/utils/format-preferences/getWorkspaceMemberUpdateFromFormatPreferences';-import { useUpdateWorkspaceMemberSettings } from '@/settings/profile/hooks/useUpdateWorkspaceMemberSettings';+import { useUpdateWorkspaceMemberSettings } from '@/workspace-member/hooks/useUpdateWorkspaceMemberSettings';import { CalendarStartDay } from 'twenty-shared/constants';import { FirstDayOfTheWeek } from 'twenty-shared/types';-jest.mock('@/settings/profile/hooks/useUpdateWorkspaceMemberSettings', () => ({+jest.mock('@/workspace-member/hooks/useUpdateWorkspaceMemberSettings', () => ({useUpdateWorkspaceMemberSettings: jest.fn(),}));jest.mock('@/localization/utils/detection/detectTimeZone');diff --git a/packages/twenty-front/src/modules/localization/hooks/useFormatPreferences.ts b/packages/twenty-front/src/modules/localization/hooks/useFormatPreferences.tsindex ebd5c63e360..a561a534868 100644--- a/packages/twenty-front/src/modules/localization/hooks/useFormatPreferences.ts+++ b/packages/twenty-front/src/modules/localization/hooks/useFormatPreferences.ts@@ -15,7 +15,7 @@ import { detectTimeFormat } from '@/localization/utils/detection/detectTimeFormaimport { detectTimeZone } from '@/localization/utils/detection/detectTimeZone';import { getFormatPreferencesFromWorkspaceMember } from '@/localization/utils/format-preferences/getFormatPreferencesFromWorkspaceMember';import { getWorkspaceMemberUpdateFromFormatPreferences } from '@/localization/utils/format-preferences/getWorkspaceMemberUpdateFromFormatPreferences';-import { useUpdateWorkspaceMemberSettings } from '@/settings/profile/hooks/useUpdateWorkspaceMemberSettings';+import { useUpdateWorkspaceMemberSettings } from '@/workspace-member/hooks/useUpdateWorkspaceMemberSettings';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { CalendarStartDay } from 'twenty-shared/constants';diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsxindex ade932f43a7..edbdc763911 100644--- a/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx@@ -11,10 +11,6 @@ import { isCurrentUserLoadedState } from '@/auth/states/isCurrentUserLoadedStateimport { useInitializeFormatPreferences } from '@/localization/hooks/useInitializeFormatPreferences';import { getDateFnsLocale } from '@/ui/field/display/utils/getDateFnsLocale';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';-import {- type ColorScheme,- type UiScale,-} from '@/workspace-member/types/WorkspaceMember';import { enUS } from 'date-fns/locale';import { useStore } from 'jotai';import { useCallback, useEffect, useState } from 'react';@@ -28,6 +24,8 @@ import {} from '~/generated-metadata/graphql';import { dateLocaleState } from '~/localization/states/dateLocaleState';import { dynamicActivate } from '~/utils/i18n/dynamicActivate';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';+import { type UiScale } from '@/ui/theme/types/UiScale';export const UserMetadataProviderInitialEffect = () => {const isLogged = useIsLogged();diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemEditable.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemEditable.tsxindex b30c021e9c2..6b8ed30de15 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemEditable.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemEditable.tsx@@ -1,6 +1,6 @@import { type NavigationMenuItemMenuMode } from '@/navigation-menu-item/edit/types/NavigationMenuItemMenuMode';import { NavigationMenuItemObjectColorEditor } from '@/navigation-menu-item/edit/components/NavigationMenuItemObjectColorEditor';-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';// Aliased so both reads satisfy the matching-state-variable lint rule, which// requires the variable to be named after the state it reads.import {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInlineEditor.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInlineEditor.tsxindex 4c1daf2df54..4ccd66be91b 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInlineEditor.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/components/NavigationMenuItemInlineEditor.tsx@@ -20,7 +20,7 @@ import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/Folimport { NavigationDrawerItemEditingContext } from '@/ui/navigation/navigation-drawer/contexts/NavigationDrawerItemEditingContext';import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';const StyledEditor = styled.div`display: contents;diff --git a/packages/twenty-front/src/modules/navigation/components/AppNavigationDrawer.tsx b/packages/twenty-front/src/modules/navigation/components/AppNavigationDrawer.tsxindex 788fbf6219a..fc8af2bc874 100644--- a/packages/twenty-front/src/modules/navigation/components/AppNavigationDrawer.tsx+++ b/packages/twenty-front/src/modules/navigation/components/AppNavigationDrawer.tsx@@ -2,6 +2,7 @@ import { useIsSettingsDrawer } from '@/navigation/hooks/useIsSettingsDrawer';import { MainNavigationDrawerContent } from '@/navigation/components/MainNavigationDrawerContent';import { MainNavigationDrawerModeSwitcher } from '@/navigation/components/MainNavigationDrawerModeSwitcher';+import { NavigationDrawerHeader } from '@/navigation/components/NavigationDrawerHeader';import { NavigationDrawerModeTransition } from '@/navigation/components/NavigationDrawerModeTransition';import { SettingsNavigationDrawerContent } from '@/navigation/components/SettingsNavigationDrawerContent';import { NavigationDrawer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawer';@@ -24,7 +25,7 @@ export const AppNavigationDrawer = ({}return (- <NavigationDrawer className={className}>+ <NavigationDrawer className={className} header={<NavigationDrawerHeader />}>{/* Mobile switches modes from the bottom navigation bar instead. */}{!isMobile && (<NavigationDrawerFixedContent>diff --git a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerModeSwitcher.tsx b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerModeSwitcher.tsxindex a41a1eea82b..d4ed5f69ef6 100644--- a/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerModeSwitcher.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MainNavigationDrawerModeSwitcher.tsx@@ -8,7 +8,7 @@ import { useTheme, themeCssVariables } from 'twenty-ui/theme';import { agentChatOpenThreadsSummarySelector } from '@/ai/states/selectors/agentChatOpenThreadsSummarySelector';import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';import { useActiveNavigationDrawerMode } from '@/navigation/hooks/useActiveNavigationDrawerMode';-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { useNavigationDrawerModes } from '@/navigation/hooks/useNavigationDrawerModes';import { useSwitchNavigationDrawerMode } from '@/navigation/hooks/useSwitchNavigationDrawerMode';import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton.tsx b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton.tsxsimilarity index 69%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton.tsxrename to packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton.tsxindex 905f4104f86..026f614433a 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton.tsx@@ -1,12 +1,12 @@import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';-import { MultiWorkspaceDropdownClickableComponent } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent';-import { MultiWorkspaceDropdownDefaultComponents } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents';-import { MultiWorkspaceDropdownOpenRecordInComponents } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents';-import { MultiWorkspaceDropdownThemesComponents } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents';-import { MultiWorkspaceDropdownWorkspacesListComponents } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents';-import { MULTI_WORKSPACE_DROPDOWN_ID } from '@/ui/navigation/navigation-drawer/constants/MultiWorkspaceDropdownId';-import { MULTI_WORKSPACE_DROPDOWN_MOBILE_BOUNDARY_PADDING } from '@/ui/navigation/navigation-drawer/constants/MultiWorkspaceDropdownMobileBoundaryPadding';+import { MultiWorkspaceDropdownClickableComponent } from '@/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent';+import { MultiWorkspaceDropdownDefaultComponents } from '@/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents';+import { MultiWorkspaceDropdownOpenRecordInComponents } from '@/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents';+import { MultiWorkspaceDropdownThemesComponents } from '@/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents';+import { MultiWorkspaceDropdownWorkspacesListComponents } from '@/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents';+import { MULTI_WORKSPACE_DROPDOWN_ID } from '@/navigation/constants/MultiWorkspaceDropdownId';+import { MULTI_WORKSPACE_DROPDOWN_MOBILE_BOUNDARY_PADDING } from '@/navigation/constants/MultiWorkspaceDropdownMobileBoundaryPadding';import { styled } from '@linaria/react';import { Dropdown } from 'twenty-ui/components/navigation';import { useIsMobile } from 'twenty-ui/utilities';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/__stories__/MultiWorkspaceDropdownButton.stories.tsx b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/__stories__/MultiWorkspaceDropdownButton.stories.tsxsimilarity index 97%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/__stories__/MultiWorkspaceDropdownButton.stories.tsxrename to packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/__stories__/MultiWorkspaceDropdownButton.stories.tsxindex bc46bf2caad..63d6eaa1024 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/__stories__/MultiWorkspaceDropdownButton.stories.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/__stories__/MultiWorkspaceDropdownButton.stories.tsx@@ -3,7 +3,7 @@ import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMembeimport { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';import { domainConfigurationState } from '@/domain-manager/states/domainConfigurationState';import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';-import { MultiWorkspaceDropdownButton } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton';+import { MultiWorkspaceDropdownButton } from '@/navigation/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton';import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';import { type Meta, type StoryObj } from '@storybook/react-vite';@@ -55,7 +55,7 @@ const INVITED_WORKSPACE: AvailableWorkspace = {};const meta: Meta<typeof MultiWorkspaceDropdownButton> = {- title: 'UI/Navigation/NavigationDrawer/MultiWorkspaceDropdown/Workspace menu',+ title: 'Modules/Navigation/MultiWorkspaceDropdown/Workspace menu',component: MultiWorkspaceDropdownButton,decorators: [ComponentWithRouterDecorator, ToastDecorator],beforeEach: () => {diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent.tsx b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent.tsxsimilarity index 90%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent.tsxrename to packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent.tsxindex 24e1ba0c841..d3e65ee4539 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownClickableComponent.tsx@@ -4,10 +4,10 @@ import {StyledIconChevronDown,StyledLabel,StyledLabelWrapper,-} from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspacesDropdownStyles';+} from '@/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspacesDropdownStyles';import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper';import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { getWorkspaceAvatarColorSeed } from '@/workspace/utils/getWorkspaceAvatarColorSeed';import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsxsimilarity index 95%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsxrename to packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsxindex 80700a525a2..b1a4a83c566 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownDefaultComponents.tsx@@ -9,10 +9,10 @@ import { useOpenRecordInPreference } from '@/settings/experience/hooks/useOpenReimport { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';-import { AvailableWorkspaceItem } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem';+import { AvailableWorkspaceItem } from '@/navigation/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem';import { DEFAULT_WORKSPACE_LOGO } from '@/ui/navigation/navigation-drawer/constants/DefaultWorkspaceLogo';-import { OPEN_RECORD_IN_OPTIONS } from '@/ui/navigation/navigation-drawer/constants/OpenRecordInOptions';-import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';+import { OPEN_RECORD_IN_OPTIONS } from '@/navigation/constants/OpenRecordInOptions';+import { useColorScheme } from '@/workspace-member/hooks/useColorScheme';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { getWorkspaceAvatarColorSeed } from '@/workspace/utils/getWorkspaceAvatarColorSeed';import { useLingui } from '@lingui/react/macro';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsx b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsxsimilarity index 92%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsxrename to packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsxindex 67ec01ef005..2ef1501c417 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownOpenRecordInComponents.tsx@@ -1,7 +1,7 @@import { Dropdown } from 'twenty-ui/components/navigation';import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';import { useOpenRecordInPreference } from '@/settings/experience/hooks/useOpenRecordInPreference';-import { OPEN_RECORD_IN_OPTIONS } from '@/ui/navigation/navigation-drawer/constants/OpenRecordInOptions';+import { OPEN_RECORD_IN_OPTIONS } from '@/navigation/constants/OpenRecordInOptions';import { useLingui } from '@lingui/react/macro';import { OpenRecordIn } from 'twenty-shared/types';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsxsimilarity index 93%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsxrename to packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsxindex 7743c4d911d..96091847629 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents.tsx@@ -1,6 +1,6 @@import { Dropdown } from 'twenty-ui/components/navigation';import { SelectOptionIcon } from '@/ui/input/components/SelectOptionIcon';-import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';+import { useColorScheme } from '@/workspace-member/hooks/useColorScheme';import { useLingui } from '@lingui/react/macro';export const MultiWorkspaceDropdownThemesComponents = () => {diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsxsimilarity index 78%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsxrename to packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsxindex a7b06287b58..2216ee85412 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownWorkspacesListComponents.tsx@@ -1,6 +1,6 @@import { availableWorkspacesState } from '@/auth/states/availableWorkspacesState';-import { WorkspacesForSignIn } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignIn';-import { WorkspacesForSignUp } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignUp';+import { WorkspacesForSignIn } from '@/navigation/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignIn';+import { WorkspacesForSignUp } from '@/navigation/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignUp';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useLingui } from '@lingui/react/macro';import { useState } from 'react';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspacesDropdownStyles.tsx b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspacesDropdownStyles.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspacesDropdownStyles.tsxrename to packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspacesDropdownStyles.tsxdiff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/__stories__/MultiWorkspaceDropdownThemesComponents.stories.tsx b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/__stories__/MultiWorkspaceDropdownThemesComponents.stories.tsxsimilarity index 92%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/__stories__/MultiWorkspaceDropdownThemesComponents.stories.tsxrename to packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/__stories__/MultiWorkspaceDropdownThemesComponents.stories.tsxindex 4f500e5de86..97a21d90865 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/__stories__/MultiWorkspaceDropdownThemesComponents.stories.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/__stories__/MultiWorkspaceDropdownThemesComponents.stories.tsx@@ -8,7 +8,7 @@ import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMembeimport { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownRoot } from '@/ui/layout/dropdown/components/DropdownRoot';import { Dropdown } from 'twenty-ui/components/navigation';-import { MultiWorkspaceDropdownThemesComponents } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents';+import { MultiWorkspaceDropdownThemesComponents } from '@/navigation/components/MultiWorkspaceDropdown/internal/MultiWorkspaceDropdownThemesComponents';import { persistedColorSchemeState } from '@/ui/theme/states/persistedColorSchemeState';import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';import { ToastDecorator } from '~/testing/decorators/ToastDecorator';@@ -28,7 +28,7 @@ const ThemeDropdown = ({ onParentClick }: { onParentClick: () => void }) => ();const meta: Meta<typeof ThemeDropdown> = {- title: 'UI/Navigation/NavigationDrawer/MultiWorkspaceDropdown/Themes',+ title: 'Modules/Navigation/MultiWorkspaceDropdown/Themes',component: ThemeDropdown,decorators: [ComponentDecorator, ToastDecorator],args: {diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem.tsx b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem.tsxrename to packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem.tsxdiff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignIn.tsx b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignIn.tsxsimilarity index 80%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignIn.tsxrename to packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignIn.tsxindex 9179c49743c..d5fea36ba8f 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignIn.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignIn.tsx@@ -1,10 +1,10 @@import { Dropdown } from 'twenty-ui/components/navigation';import { useLingui } from '@lingui/react/macro';-import { useFilteredAvailableWorkspaces } from '@/ui/navigation/navigation-drawer/hooks/useFilteredAvailableWorkspaces';+import { useFilteredAvailableWorkspaces } from '@/navigation/hooks/useFilteredAvailableWorkspaces';import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { availableWorkspacesState } from '@/auth/states/availableWorkspacesState';-import { AvailableWorkspaceItem } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem';+import { AvailableWorkspaceItem } from '@/navigation/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem';export const WorkspacesForSignIn = ({searchValue,diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignUp.tsx b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignUp.tsxsimilarity index 80%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignUp.tsxrename to packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignUp.tsxindex 470b31a204b..2f59d30570f 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignUp.tsx+++ b/packages/twenty-front/src/modules/navigation/components/MultiWorkspaceDropdown/internal/components/WorkspacesForSignUp.tsx@@ -1,7 +1,7 @@import { Dropdown } from 'twenty-ui/components/navigation';import { useLingui } from '@lingui/react/macro';-import { useFilteredAvailableWorkspaces } from '@/ui/navigation/navigation-drawer/hooks/useFilteredAvailableWorkspaces';-import { AvailableWorkspaceItem } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem';+import { useFilteredAvailableWorkspaces } from '@/navigation/hooks/useFilteredAvailableWorkspaces';+import { AvailableWorkspaceItem } from '@/navigation/components/MultiWorkspaceDropdown/internal/components/AvailableWorkspaceItem';import { availableWorkspacesState } from '@/auth/states/availableWorkspacesState';import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx b/packages/twenty-front/src/modules/navigation/components/NavigationDrawerHeader.tsxsimilarity index 91%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsxrename to packages/twenty-front/src/modules/navigation/components/NavigationDrawerHeader.tsxindex 46fe9020bbd..831d0ea9959 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerHeader.tsx+++ b/packages/twenty-front/src/modules/navigation/components/NavigationDrawerHeader.tsx@@ -7,11 +7,11 @@ import { LightIconButton } from 'twenty-ui/components/input';import { IconSearch } from 'twenty-ui/icon';import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme';-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { useOpenRecordsSearchPageInSidePanel } from '@/side-panel/hooks/useOpenRecordsSearchPageInSidePanel';-import { MultiWorkspaceDropdownButton } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton';+import { MultiWorkspaceDropdownButton } from '@/navigation/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton';import { useIsMobile } from 'twenty-ui/utilities';-import { NavigationDrawerCollapseButton } from './NavigationDrawerCollapseButton';+import { NavigationDrawerCollapseButton } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton';const StyledContainer = styled.div`flex-shrink: 0;diff --git a/packages/twenty-front/src/modules/navigation/components/SettingsNavigationDrawerContent.tsx b/packages/twenty-front/src/modules/navigation/components/SettingsNavigationDrawerContent.tsxindex 11991ced699..1819027576b 100644--- a/packages/twenty-front/src/modules/navigation/components/SettingsNavigationDrawerContent.tsx+++ b/packages/twenty-front/src/modules/navigation/components/SettingsNavigationDrawerContent.tsx@@ -1,4 +1,4 @@-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { useSetAdvancedMode } from '@/navigation/hooks/useSetAdvancedMode';import { MOBILE_NAVIGATION_BAR_CLEARANCE } from '@/navigation/constants/MobileNavigationBarClearance';import { SettingsNavigationDrawerItems } from '@/settings/components/SettingsNavigationDrawerItems';diff --git a/packages/twenty-front/src/modules/navigation/components/__tests__/MainNavigationDrawerModeSwitcher.test.tsx b/packages/twenty-front/src/modules/navigation/components/__tests__/MainNavigationDrawerModeSwitcher.test.tsxindex ed018bb3259..7216992906a 100644--- a/packages/twenty-front/src/modules/navigation/components/__tests__/MainNavigationDrawerModeSwitcher.test.tsx+++ b/packages/twenty-front/src/modules/navigation/components/__tests__/MainNavigationDrawerModeSwitcher.test.tsx@@ -10,13 +10,15 @@ import { setAgentChatThreadList } from '@/ai/testing/setAgentChatThreadList';import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';import { MainNavigationDrawerModeSwitcher } from '@/navigation/components/MainNavigationDrawerModeSwitcher';import { useActiveNavigationDrawerMode } from '@/navigation/hooks/useActiveNavigationDrawerMode';-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { useNavigationDrawerModes } from '@/navigation/hooks/useNavigationDrawerModes';import { useSwitchNavigationDrawerMode } from '@/navigation/hooks/useSwitchNavigationDrawerMode';import { NAVIGATION_DRAWER_TABS } from '@/ui/navigation/states/navigationDrawerTabs';jest.mock('@/navigation/hooks/useActiveNavigationDrawerMode');-jest.mock('@/navigation/hooks/useIsNavigationDrawerContentExpanded');+jest.mock(+ '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded',+);jest.mock('@/navigation/hooks/useNavigationDrawerModes');jest.mock('@/navigation/hooks/useSwitchNavigationDrawerMode');diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/MultiWorkspaceDropdownId.ts b/packages/twenty-front/src/modules/navigation/constants/MultiWorkspaceDropdownId.tssimilarity index 100%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/MultiWorkspaceDropdownId.tsrename to packages/twenty-front/src/modules/navigation/constants/MultiWorkspaceDropdownId.tsdiff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/MultiWorkspaceDropdownMobileBoundaryPadding.ts b/packages/twenty-front/src/modules/navigation/constants/MultiWorkspaceDropdownMobileBoundaryPadding.tssimilarity index 100%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/MultiWorkspaceDropdownMobileBoundaryPadding.tsrename to packages/twenty-front/src/modules/navigation/constants/MultiWorkspaceDropdownMobileBoundaryPadding.tsdiff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/OpenRecordInOptions.ts b/packages/twenty-front/src/modules/navigation/constants/OpenRecordInOptions.tssimilarity index 100%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/constants/OpenRecordInOptions.tsrename to packages/twenty-front/src/modules/navigation/constants/OpenRecordInOptions.tsdiff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useFilteredAvailableWorkspaces.ts b/packages/twenty-front/src/modules/navigation/hooks/useFilteredAvailableWorkspaces.tssimilarity index 100%rename from packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useFilteredAvailableWorkspaces.tsrename to packages/twenty-front/src/modules/navigation/hooks/useFilteredAvailableWorkspaces.tsdiff --git a/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelValueFormCompositeFieldInput.tsx b/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelValueFormCompositeFieldInput.tsxindex 7a965a9df52..8eea071e3e1 100644--- a/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelValueFormCompositeFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/advanced-filter/side-panel/components/AdvancedFilterSidePanelValueFormCompositeFieldInput.tsx@@ -8,7 +8,7 @@ import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/cimport { FormWorkspaceMemberFilterValueInput } from '@/object-record/record-field/ui/form-types/components/FormWorkspaceMemberFilterValueInput';import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';-import { CURRENCIES } from '@/settings/data-model/constants/Currencies';+import { CURRENCIES } from '@/ui/input/components/internal/currency/constants/Currencies';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { useContext } from 'react';import { type SelectOption } from 'twenty-ui/primitives/input';diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsxindex 65cbf19bc56..fd534d178d1 100644--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownCurrencySelect.tsx@@ -4,7 +4,7 @@ import { fieldMetadataItemUsedInDropdownComponentSelector } from '@/object-recorimport { objectFilterDropdownCurrentRecordFilterComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState';import { turnCurrencyIntoSelectableItem } from '@/object-record/object-filter-dropdown/utils/turnCurrencyIntoSelectableItem';import { type SelectableItem } from '@/object-record/select/types/SelectableItem';-import { CURRENCIES } from '@/settings/data-model/constants/Currencies';+import { CURRENCIES } from '@/ui/input/components/internal/currency/constants/Currencies';import { LegacyDropdownContent } from '@/ui/layout/dropdown/components/LegacyDropdownContent';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput.tsxindex 661ca519e13..8e7ee74a2da 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput.tsx@@ -6,7 +6,7 @@ import { FormSelectFieldInput } from '@/object-record/record-field/ui/form-typesimport { type FormFieldCurrencyInputSettings } from '@/object-record/record-field/ui/form-types/types/FormFieldCurrencyInputSettings';import { type VariablePickerComponent } from '@/ui/input/types/VariablePickerComponent';import { type FormFieldCurrencyValue } from '@/object-record/record-field/ui/types/FieldMetadata';-import { CURRENCIES } from '@/settings/data-model/constants/Currencies';+import { CURRENCIES } from '@/ui/input/components/internal/currency/constants/Currencies';import { Field } from 'twenty-ui/primitives/input';import { t } from '@lingui/core/macro';import { useMemo } from 'react';diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput.tsxindex e66784fa375..adf1e5c7575 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput.tsx@@ -1,7 +1,7 @@import { SkeletonLine } from '@/ui/feedback/skeleton/components/SkeletonLine';import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';import { type FieldRichTextMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';import { useOpenRichTextInSidePanel } from '@/side-panel/hooks/useOpenRichTextInSidePanel';diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWidthEffect.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWidthEffect.tsxindex be2df30da73..2d060eb6a08 100644--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWidthEffect.tsx+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWidthEffect.tsx@@ -1,5 +1,5 @@import { recordTableWidthComponentState } from '@/object-record/record-table/states/recordTableWidthComponentState';-import { tableWidthResizeIsActiveState } from '@/object-record/record-table/states/tableWidthResizeIsActivedState';+import { isResizablePanelDraggingState } from '@/ui/layout/resizable-panel/states/isResizablePanelDraggingState';import { useScrollWrapperHTMLElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperHTMLElement';import { useSetAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useSetAtomComponentState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';@@ -12,8 +12,8 @@ export const RecordTableWidthEffect = () => {recordTableWidthComponentState,);- const tableWidthResizeIsActive = useAtomStateValue(- tableWidthResizeIsActiveState,+ const isResizablePanelDragging = useAtomStateValue(+ isResizablePanelDraggingState,);const { scrollWrapperHTMLElement } = useScrollWrapperHTMLElement();@@ -21,7 +21,7 @@ export const RecordTableWidthEffect = () => {useEffect(() => {const tableWidth = scrollWrapperHTMLElement?.clientWidth ?? 0;- if (tableWidthResizeIsActive) {+ if (!isResizablePanelDragging) {if (tableWidth > 0) {setRecordTableWidth(tableWidth);}@@ -43,7 +43,7 @@ export const RecordTableWidthEffect = () => {tableResizeObserver.disconnect();};}- }, [setRecordTableWidth, scrollWrapperHTMLElement, tableWidthResizeIsActive]);+ }, [setRecordTableWidth, scrollWrapperHTMLElement, isResizablePanelDragging]);return null;};diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/tableWidthResizeIsActivedState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/tableWidthResizeIsActivedState.tsdeleted file mode 100644index 8a5c281009d..00000000000--- a/packages/twenty-front/src/modules/object-record/record-table/states/tableWidthResizeIsActivedState.ts+++ /dev/null@@ -1,6 +0,0 @@-import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';--export const tableWidthResizeIsActiveState = createAtomState<boolean>({- key: 'tableWidthResizeIsActiveState',- defaultValue: true,-});diff --git a/packages/twenty-front/src/modules/object-record/record-table/utils/__tests__/buildValueFromFilter.spec.ts b/packages/twenty-front/src/modules/object-record/record-table/utils/__tests__/buildValueFromFilter.spec.tsindex b956ac66d14..d54e4930e9c 100644--- a/packages/twenty-front/src/modules/object-record/record-table/utils/__tests__/buildValueFromFilter.spec.ts+++ b/packages/twenty-front/src/modules/object-record/record-table/utils/__tests__/buildValueFromFilter.spec.ts@@ -1,12 +1,12 @@import { type FieldMetadataItemOption } from '@/object-metadata/types/FieldMetadataItem';import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';import { buildValueFromFilter } from '@/object-record/record-table/utils/buildValueFromFilter';-import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';import {type FilterableFieldType,ViewFilterOperand,} from 'twenty-shared/types';import { RelationType } from '~/generated-metadata/graphql';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';// TODO: fix the dates, and test the not supported typesconst mockDate = new Date('2024-03-20T12:00:00Z');diff --git a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldInput.tsxindex a7fd3ce3f8f..9b261640eed 100644--- a/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldInput.tsx+++ b/packages/twenty-front/src/modules/object-record/record-title-cell/components/RecordTitleCellTextFieldInput.tsx@@ -1,6 +1,6 @@import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';import { useTextField } from '@/object-record/record-field/ui/meta-types/hooks/useTextField';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { TextInput } from '@/ui/input/components/TextInput';import { useContext, useRef } from 'react';diff --git a/packages/twenty-front/src/modules/onboarding/components/OnboardingProfilePictureUploader.tsx b/packages/twenty-front/src/modules/onboarding/components/OnboardingProfilePictureUploader.tsxindex e1bc6b7aa01..9baa8fd964d 100644--- a/packages/twenty-front/src/modules/onboarding/components/OnboardingProfilePictureUploader.tsx+++ b/packages/twenty-front/src/modules/onboarding/components/OnboardingProfilePictureUploader.tsx@@ -1,6 +1,6 @@import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';import { useUploadWorkspaceMemberProfilePicture } from '@/settings/members/hooks/useUploadWorkspaceMemberProfilePicture';-import { useUpdateWorkspaceMemberSettings } from '@/settings/profile/hooks/useUpdateWorkspaceMemberSettings';+import { useUpdateWorkspaceMemberSettings } from '@/workspace-member/hooks/useUpdateWorkspaceMemberSettings';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { styled } from '@linaria/react';diff --git a/packages/twenty-front/src/modules/ui/layout/show-page/components/FieldRichTextCard.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field-rich-text/components/FieldRichTextCard.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/ui/layout/show-page/components/FieldRichTextCard.tsxrename to packages/twenty-front/src/modules/page-layout/widgets/field-rich-text/components/FieldRichTextCard.tsxdiff --git a/packages/twenty-front/src/modules/page-layout/widgets/field-rich-text/components/FieldRichTextWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/field-rich-text/components/FieldRichTextWidget.tsxindex f83b81d8e8b..b8ebf9c5511 100644--- a/packages/twenty-front/src/modules/page-layout/widgets/field-rich-text/components/FieldRichTextWidget.tsx+++ b/packages/twenty-front/src/modules/page-layout/widgets/field-rich-text/components/FieldRichTextWidget.tsx@@ -1,5 +1,5 @@import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';-import { FieldRichTextCard } from '@/ui/layout/show-page/components/FieldRichTextCard';+import { FieldRichTextCard } from '@/page-layout/widgets/field-rich-text/components/FieldRichTextCard';import { styled } from '@linaria/react';const StyledContainer = styled.div`diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/Currencies.ts b/packages/twenty-front/src/modules/settings/data-model/constants/Currencies.tsdeleted file mode 100644index d1f3b3d73b1..00000000000--- a/packages/twenty-front/src/modules/settings/data-model/constants/Currencies.ts+++ /dev/null@@ -1,10 +0,0 @@-import { SETTINGS_FIELD_CURRENCY_CODES } from '@/settings/data-model/constants/SettingsFieldCurrencyCodes';-import { type Currency } from '@/ui/input/components/internal/types/Currency';--export const CURRENCIES: Currency[] = Object.entries(- SETTINGS_FIELD_CURRENCY_CODES,-).map(([key, { Icon, label }]) => ({- value: key,- Icon,- label: `${label} (${key})`,-}));diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldCurrencyCodes.ts b/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldCurrencyCodes.tsdeleted file mode 100644index db0ef26ddf9..00000000000--- a/packages/twenty-front/src/modules/settings/data-model/constants/SettingsFieldCurrencyCodes.ts+++ /dev/null@@ -1,241 +0,0 @@-import {- CURRENCY_CODE_LABELS,- type CurrencyCode,-} from 'twenty-shared/constants';-import {- IconCoins,- IconCurrencyAfghani,- IconCurrencyBahraini,- IconCurrencyBaht,- IconCurrencyDinar,- IconCurrencyDirham,- IconCurrencyDollar,- IconCurrencyDollarAustralian,- IconCurrencyDollarBrunei,- IconCurrencyDollarCanadian,- IconCurrencyDollarGuyanese,- IconCurrencyDollarSingapore,- IconCurrencyDong,- IconCurrencyDram,- IconCurrencyEuro,- IconCurrencyFlorin,- IconCurrencyForint,- IconCurrencyFrank,- IconCurrencyGuarani,- IconCurrencyHryvnia,- IconCurrencyIranianRial,- IconCurrencyKip,- IconCurrencyKroneCzech,- IconCurrencyKroneDanish,- IconCurrencyKroneSwedish,- IconCurrencyLari,- IconCurrencyLeu,- IconCurrencyLira,- IconCurrencyLyd,- IconCurrencyManat,- IconCurrencyNaira,- IconCurrencyPaanga,- IconCurrencyPeso,- IconCurrencyPound,- IconCurrencyQuetzal,- IconCurrencyReal,- IconCurrencyRenminbi,- IconCurrencyRiyal,- IconCurrencyRubel,- IconCurrencyRufiyaa,- IconCurrencyRupee,- IconCurrencyRupeeNepalese,- IconCurrencyShekel,- IconCurrencySom,- IconCurrencyTaka,- IconCurrencyTenge,- IconCurrencyTugrik,- IconCurrencyWon,- IconCurrencyYen,- IconCurrencyYuan,- IconCurrencyZloty,- type IconComponent,-} from 'twenty-ui/icon';-export const SETTINGS_FIELD_CURRENCY_CODES: Record<- CurrencyCode,- { label: string; Icon: IconComponent }-> = {- AED: { label: CURRENCY_CODE_LABELS.AED.label, Icon: IconCurrencyDirham },- AFN: { label: CURRENCY_CODE_LABELS.AFN.label, Icon: IconCurrencyAfghani },- ALL: { label: CURRENCY_CODE_LABELS.ALL.label, Icon: IconCurrencyLeu },- AMD: { label: CURRENCY_CODE_LABELS.AMD.label, Icon: IconCurrencyDram },- ANG: { label: CURRENCY_CODE_LABELS.ANG.label, Icon: IconCurrencyFlorin },- AOA: { label: CURRENCY_CODE_LABELS.AOA.label, Icon: IconCoins },- ARS: { label: CURRENCY_CODE_LABELS.ARS.label, Icon: IconCoins },- AUD: {- label: CURRENCY_CODE_LABELS.AUD.label,- Icon: IconCurrencyDollarAustralian,- },- AWG: { label: CURRENCY_CODE_LABELS.AWG.label, Icon: IconCurrencyFlorin },- AZN: { label: CURRENCY_CODE_LABELS.AZN.label, Icon: IconCurrencyManat },- BAM: { label: CURRENCY_CODE_LABELS.BAM.label, Icon: IconCoins },- BBD: { label: CURRENCY_CODE_LABELS.BBD.label, Icon: IconCurrencyDollar },- BDT: { label: CURRENCY_CODE_LABELS.BDT.label, Icon: IconCurrencyTaka },- BGN: { label: CURRENCY_CODE_LABELS.BGN.label, Icon: IconCoins },- BHD: { label: CURRENCY_CODE_LABELS.BHD.label, Icon: IconCurrencyBahraini },- BIF: { label: CURRENCY_CODE_LABELS.BIF.label, Icon: IconCoins },- BMD: { label: CURRENCY_CODE_LABELS.BMD.label, Icon: IconCurrencyDollar },- BND: {- label: CURRENCY_CODE_LABELS.BND.label,- Icon: IconCurrencyDollarBrunei,- },- BOB: { label: CURRENCY_CODE_LABELS.BOB.label, Icon: IconCoins },- BRL: { label: CURRENCY_CODE_LABELS.BRL.label, Icon: IconCurrencyReal },- BSD: { label: CURRENCY_CODE_LABELS.BSD.label, Icon: IconCurrencyDollar },- BTN: { label: CURRENCY_CODE_LABELS.BTN.label, Icon: IconCurrencyDollar },- BWP: { label: CURRENCY_CODE_LABELS.BWP.label, Icon: IconCoins },- BYN: { label: CURRENCY_CODE_LABELS.BYN.label, Icon: IconCoins },- BZD: { label: CURRENCY_CODE_LABELS.BZD.label, Icon: IconCurrencyDollar },- CAD: {- label: CURRENCY_CODE_LABELS.CAD.label,- Icon: IconCurrencyDollarCanadian,- },- CDF: { label: CURRENCY_CODE_LABELS.CDF.label, Icon: IconCoins },- CHF: { label: CURRENCY_CODE_LABELS.CHF.label, Icon: IconCurrencyFrank },- CLP: { label: CURRENCY_CODE_LABELS.CLP.label, Icon: IconCoins },- CLF: { label: CURRENCY_CODE_LABELS.CLF.label, Icon: IconCoins },- CNY: { label: CURRENCY_CODE_LABELS.CNY.label, Icon: IconCurrencyYuan },- COP: { label: CURRENCY_CODE_LABELS.COP.label, Icon: IconCoins },- CRC: { label: CURRENCY_CODE_LABELS.CRC.label, Icon: IconCoins },- CUP: { label: CURRENCY_CODE_LABELS.CUP.label, Icon: IconCoins },- CVE: { label: CURRENCY_CODE_LABELS.CVE.label, Icon: IconCoins },- CZK: { label: CURRENCY_CODE_LABELS.CZK.label, Icon: IconCurrencyKroneCzech },- DJF: { label: CURRENCY_CODE_LABELS.DJF.label, Icon: IconCoins },- DKK: { label: CURRENCY_CODE_LABELS.DKK.label, Icon: IconCurrencyKroneDanish },- DOP: { label: CURRENCY_CODE_LABELS.DOP.label, Icon: IconCoins },- DZD: { label: CURRENCY_CODE_LABELS.DZD.label, Icon: IconCoins },- EGP: { label: CURRENCY_CODE_LABELS.EGP.label, Icon: IconCoins },- ERN: { label: CURRENCY_CODE_LABELS.ERN.label, Icon: IconCoins },- ETB: { label: CURRENCY_CODE_LABELS.ETB.label, Icon: IconCoins },- EUR: { label: CURRENCY_CODE_LABELS.EUR.label, Icon: IconCurrencyEuro },- FJD: { label: CURRENCY_CODE_LABELS.FJD.label, Icon: IconCurrencyDollar },- FKP: { label: CURRENCY_CODE_LABELS.FKP.label, Icon: IconCoins },- GBP: { label: CURRENCY_CODE_LABELS.GBP.label, Icon: IconCurrencyPound },- GEL: { label: CURRENCY_CODE_LABELS.GEL.label, Icon: IconCurrencyLari },- GHS: { label: CURRENCY_CODE_LABELS.GHS.label, Icon: IconCoins },- GIP: { label: CURRENCY_CODE_LABELS.GIP.label, Icon: IconCoins },- GMD: { label: CURRENCY_CODE_LABELS.GMD.label, Icon: IconCoins },- GNF: { label: CURRENCY_CODE_LABELS.GNF.label, Icon: IconCoins },- GTQ: { label: CURRENCY_CODE_LABELS.GTQ.label, Icon: IconCurrencyQuetzal },- GYD: {- label: CURRENCY_CODE_LABELS.GYD.label,- Icon: IconCurrencyDollarGuyanese,- },- HKD: { label: CURRENCY_CODE_LABELS.HKD.label, Icon: IconCurrencyRenminbi },- HNL: { label: CURRENCY_CODE_LABELS.HNL.label, Icon: IconCurrencyLeu },- HTG: { label: CURRENCY_CODE_LABELS.HTG.label, Icon: IconCoins },- HUF: { label: CURRENCY_CODE_LABELS.HUF.label, Icon: IconCurrencyForint },- IDR: { label: CURRENCY_CODE_LABELS.IDR.label, Icon: IconCoins },- ILS: { label: CURRENCY_CODE_LABELS.ILS.label, Icon: IconCurrencyShekel },- INR: { label: CURRENCY_CODE_LABELS.INR.label, Icon: IconCurrencyRupee },- IQD: { label: CURRENCY_CODE_LABELS.IQD.label, Icon: IconCoins },- IRR: { label: CURRENCY_CODE_LABELS.IRR.label, Icon: IconCurrencyIranianRial },- ISK: { label: CURRENCY_CODE_LABELS.ISK.label, Icon: IconCoins },- JMD: { label: CURRENCY_CODE_LABELS.JMD.label, Icon: IconCurrencyDollar },- JOD: { label: CURRENCY_CODE_LABELS.JOD.label, Icon: IconCoins },- JPY: { label: CURRENCY_CODE_LABELS.JPY.label, Icon: IconCurrencyYen },- KES: { label: CURRENCY_CODE_LABELS.KES.label, Icon: IconCoins },- KGS: { label: CURRENCY_CODE_LABELS.KGS.label, Icon: IconCurrencySom },- KHR: { label: CURRENCY_CODE_LABELS.KHR.label, Icon: IconCoins },- KMF: { label: CURRENCY_CODE_LABELS.KMF.label, Icon: IconCoins },- KPW: { label: CURRENCY_CODE_LABELS.KPW.label, Icon: IconCurrencyWon },- KRW: { label: CURRENCY_CODE_LABELS.KRW.label, Icon: IconCurrencyWon },- KWD: { label: CURRENCY_CODE_LABELS.KWD.label, Icon: IconCurrencyDinar },- KYD: { label: CURRENCY_CODE_LABELS.KYD.label, Icon: IconCurrencyDollar },- KZT: { label: CURRENCY_CODE_LABELS.KZT.label, Icon: IconCurrencyTenge },- LAK: { label: CURRENCY_CODE_LABELS.LAK.label, Icon: IconCurrencyKip },- LBP: { label: CURRENCY_CODE_LABELS.LBP.label, Icon: IconCoins },- LKR: { label: CURRENCY_CODE_LABELS.LKR.label, Icon: IconCoins },- LRD: { label: CURRENCY_CODE_LABELS.LRD.label, Icon: IconCurrencyDollar },- LSL: { label: CURRENCY_CODE_LABELS.LSL.label, Icon: IconCurrencyLeu },- LYD: { label: CURRENCY_CODE_LABELS.LYD.label, Icon: IconCurrencyLyd },- MAD: { label: CURRENCY_CODE_LABELS.MAD.label, Icon: IconCurrencyDirham },- MDL: { label: CURRENCY_CODE_LABELS.MDL.label, Icon: IconCurrencyLeu },- MGA: { label: CURRENCY_CODE_LABELS.MGA.label, Icon: IconCoins },- MKD: { label: CURRENCY_CODE_LABELS.MKD.label, Icon: IconCoins },- MMK: { label: CURRENCY_CODE_LABELS.MMK.label, Icon: IconCoins },- MNT: { label: CURRENCY_CODE_LABELS.MNT.label, Icon: IconCurrencyTugrik },- MOP: { label: CURRENCY_CODE_LABELS.MOP.label, Icon: IconCurrencyRenminbi },- MRU: { label: CURRENCY_CODE_LABELS.MRU.label, Icon: IconCoins },- MUR: { label: CURRENCY_CODE_LABELS.MUR.label, Icon: IconCoins },- MVR: { label: CURRENCY_CODE_LABELS.MVR.label, Icon: IconCurrencyRufiyaa },- MWK: { label: CURRENCY_CODE_LABELS.MWK.label, Icon: IconCoins },- MXN: { label: CURRENCY_CODE_LABELS.MXN.label, Icon: IconCoins },- MYR: { label: CURRENCY_CODE_LABELS.MYR.label, Icon: IconCoins },- MZN: { label: CURRENCY_CODE_LABELS.MZN.label, Icon: IconCoins },- NAD: { label: CURRENCY_CODE_LABELS.NAD.label, Icon: IconCurrencyDollar },- NGN: { label: CURRENCY_CODE_LABELS.NGN.label, Icon: IconCurrencyNaira },- NIO: { label: CURRENCY_CODE_LABELS.NIO.label, Icon: IconCoins },- NOK: {- label: CURRENCY_CODE_LABELS.NOK.label,- Icon: IconCurrencyKroneSwedish,- },- NPR: {- label: CURRENCY_CODE_LABELS.NPR.label,- Icon: IconCurrencyRupeeNepalese,- },- NZD: { label: CURRENCY_CODE_LABELS.NZD.label, Icon: IconCurrencyDollar },- OMR: { label: CURRENCY_CODE_LABELS.OMR.label, Icon: IconCoins },- PAB: { label: CURRENCY_CODE_LABELS.PAB.label, Icon: IconCoins },- PEN: { label: CURRENCY_CODE_LABELS.PEN.label, Icon: IconCoins },- PGK: { label: CURRENCY_CODE_LABELS.PGK.label, Icon: IconCoins },- PHP: { label: CURRENCY_CODE_LABELS.PHP.label, Icon: IconCurrencyPeso },- PKR: { label: CURRENCY_CODE_LABELS.PKR.label, Icon: IconCoins },- PLN: { label: CURRENCY_CODE_LABELS.PLN.label, Icon: IconCurrencyZloty },- PYG: { label: CURRENCY_CODE_LABELS.PYG.label, Icon: IconCurrencyGuarani },- QAR: { label: CURRENCY_CODE_LABELS.QAR.label, Icon: IconCurrencyRiyal },- RON: { label: CURRENCY_CODE_LABELS.RON.label, Icon: IconCurrencyLeu },- RSD: { label: CURRENCY_CODE_LABELS.RSD.label, Icon: IconCoins },- RUB: { label: CURRENCY_CODE_LABELS.RUB.label, Icon: IconCurrencyRubel },- RWF: { label: CURRENCY_CODE_LABELS.RWF.label, Icon: IconCoins },- SAR: { label: CURRENCY_CODE_LABELS.SAR.label, Icon: IconCoins },- SBD: { label: CURRENCY_CODE_LABELS.SBD.label, Icon: IconCurrencyDollar },- SCR: { label: CURRENCY_CODE_LABELS.SCR.label, Icon: IconCoins },- SDG: { label: CURRENCY_CODE_LABELS.SDG.label, Icon: IconCoins },- SEK: {- label: CURRENCY_CODE_LABELS.SEK.label,- Icon: IconCurrencyKroneSwedish,- },- SGD: {- label: CURRENCY_CODE_LABELS.SGD.label,- Icon: IconCurrencyDollarSingapore,- },- SHP: { label: CURRENCY_CODE_LABELS.SHP.label, Icon: IconCoins },- SLE: { label: CURRENCY_CODE_LABELS.SLE.label, Icon: IconCoins },- SOS: { label: CURRENCY_CODE_LABELS.SOS.label, Icon: IconCoins },- SRD: { label: CURRENCY_CODE_LABELS.SRD.label, Icon: IconCurrencyDollar },- SSP: { label: CURRENCY_CODE_LABELS.SSP.label, Icon: IconCoins },- STN: { label: CURRENCY_CODE_LABELS.STN.label, Icon: IconCoins },- SVC: { label: CURRENCY_CODE_LABELS.SVC.label, Icon: IconCoins },- SYP: { label: CURRENCY_CODE_LABELS.SYP.label, Icon: IconCoins },- SZL: { label: CURRENCY_CODE_LABELS.SZL.label, Icon: IconCurrencyLeu },- THB: { label: CURRENCY_CODE_LABELS.THB.label, Icon: IconCurrencyBaht },- TJS: { label: CURRENCY_CODE_LABELS.TJS.label, Icon: IconCoins },- TMT: { label: CURRENCY_CODE_LABELS.TMT.label, Icon: IconCurrencyManat },- TND: { label: CURRENCY_CODE_LABELS.TND.label, Icon: IconCoins },- TOP: { label: CURRENCY_CODE_LABELS.TOP.label, Icon: IconCurrencyPaanga },- TRY: { label: CURRENCY_CODE_LABELS.TRY.label, Icon: IconCurrencyLira },- TTD: { label: CURRENCY_CODE_LABELS.TTD.label, Icon: IconCurrencyDollar },- TWD: { label: CURRENCY_CODE_LABELS.TWD.label, Icon: IconCurrencyRenminbi },- TZS: { label: CURRENCY_CODE_LABELS.TZS.label, Icon: IconCoins },- UAH: { label: CURRENCY_CODE_LABELS.UAH.label, Icon: IconCurrencyHryvnia },- UGX: { label: CURRENCY_CODE_LABELS.UGX.label, Icon: IconCoins },- USD: { label: CURRENCY_CODE_LABELS.USD.label, Icon: IconCurrencyDollar },- UYU: { label: CURRENCY_CODE_LABELS.UYU.label, Icon: IconCoins },- UZS: { label: CURRENCY_CODE_LABELS.UZS.label, Icon: IconCoins },- VES: { label: CURRENCY_CODE_LABELS.VES.label, Icon: IconCoins },- VND: { label: CURRENCY_CODE_LABELS.VND.label, Icon: IconCurrencyDong },- VUV: { label: CURRENCY_CODE_LABELS.VUV.label, Icon: IconCoins },- WST: { label: CURRENCY_CODE_LABELS.WST.label, Icon: IconCoins },- XOF: { label: CURRENCY_CODE_LABELS.XOF.label, Icon: IconCoins },- XCD: { label: CURRENCY_CODE_LABELS.XCD.label, Icon: IconCurrencyDollar },- YER: { label: CURRENCY_CODE_LABELS.YER.label, Icon: IconCoins },- ZAR: { label: CURRENCY_CODE_LABELS.ZAR.label, Icon: IconCoins },- ZMW: { label: CURRENCY_CODE_LABELS.ZMW.label, Icon: IconCoins },- ZWG: { label: CURRENCY_CODE_LABELS.ZWG.label, Icon: IconCoins },-};diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsxindex 2f2d17d5426..0afaaa3cd4b 100644--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx@@ -10,7 +10,7 @@ import { currencyFieldSettingsSchema } from '@/object-record/record-field/ui/valimport { Separator } from '@/settings/components/Separator';import { SettingsOptionCardContentCounter } from '@/settings/components/SettingsOptions/SettingsOptionCardContentCounter';import { SettingsOptionCardContentSelect } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSelect';-import { CURRENCIES } from '@/settings/data-model/constants/Currencies';+import { CURRENCIES } from '@/ui/input/components/internal/currency/constants/Currencies';import { useCurrencySettingsFormInitialValues } from '@/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues';import { Select } from '@/ui/input/components/Select';import { plural } from '@lingui/core/macro';diff --git a/packages/twenty-front/src/modules/settings/experience/components/UiScalePicker.tsx b/packages/twenty-front/src/modules/settings/experience/components/UiScalePicker.tsxindex bbb48639d43..b1746ac9a5f 100644--- a/packages/twenty-front/src/modules/settings/experience/components/UiScalePicker.tsx+++ b/packages/twenty-front/src/modules/settings/experience/components/UiScalePicker.tsx@@ -1,8 +1,8 @@import { UI_SCALE_MULTIPLIERS } from '@/ui/theme/constants/UiScaleMultipliers';-import { useUiScale } from '@/ui/theme/hooks/useUiScale';+import { useUiScale } from '@/workspace-member/hooks/useUiScale';import { Select } from '@/ui/input/components/Select';-import { type UiScale } from '@/workspace-member/types/WorkspaceMember';import { useLingui } from '@lingui/react/macro';+import { type UiScale } from '@/ui/theme/types/UiScale';export const UiScalePicker = () => {const { t } = useLingui();diff --git a/packages/twenty-front/src/modules/settings/experience/hooks/useOpenRecordInPreference.ts b/packages/twenty-front/src/modules/settings/experience/hooks/useOpenRecordInPreference.tsindex 36f80b88471..869b5833fe7 100644--- a/packages/twenty-front/src/modules/settings/experience/hooks/useOpenRecordInPreference.ts+++ b/packages/twenty-front/src/modules/settings/experience/hooks/useOpenRecordInPreference.ts@@ -1,6 +1,6 @@import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';import { DEFAULT_OPEN_RECORD_IN_PREFERENCE } from '@/object-record/record-index/constants/DefaultOpenRecordInPreference';-import { useUpdateWorkspaceMemberSettings } from '@/settings/profile/hooks/useUpdateWorkspaceMemberSettings';+import { useUpdateWorkspaceMemberSettings } from '@/workspace-member/hooks/useUpdateWorkspaceMemberSettings';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useCallback } from 'react';import { type OpenRecordIn } from 'twenty-shared/types';diff --git a/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetup.tsx b/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetup.tsxindex d05415a25f3..48e79db9933 100644--- a/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetup.tsx+++ b/packages/twenty-front/src/modules/settings/mcp-and-apis/components/SettingsMcpSetup.tsx@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';import { Fragment } from 'react';-import { LightCopyIconButton } from '@/object-record/record-field/ui/components/LightCopyIconButton';+import { LightCopyIconButton } from '@/ui/input/components/LightCopyIconButton';import ModelContextProtocolLogo from '@/settings/mcp-and-apis/assets/model-context-protocol-logo.svg?react';import { SettingsMcpSetupCard } from '@/settings/mcp-and-apis/components/SettingsMcpSetupCard';import { buildMcpSetupCategories } from '@/settings/mcp-and-apis/utils/buildMcpSetupCategories';diff --git a/packages/twenty-front/src/modules/settings/profile/components/NameFields.tsx b/packages/twenty-front/src/modules/settings/profile/components/NameFields.tsxindex 63b4c24ec88..66415f541e3 100644--- a/packages/twenty-front/src/modules/settings/profile/components/NameFields.tsx+++ b/packages/twenty-front/src/modules/settings/profile/components/NameFields.tsx@@ -7,7 +7,7 @@ import { currentUserState } from '@/auth/states/currentUserState';import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useCanEditProfileField } from '@/settings/profile/hooks/useCanEditProfileField';-import { useUpdateWorkspaceMemberSettings } from '@/settings/profile/hooks/useUpdateWorkspaceMemberSettings';+import { useUpdateWorkspaceMemberSettings } from '@/workspace-member/hooks/useUpdateWorkspaceMemberSettings';import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';import { themeCssVariables } from 'twenty-ui/theme';import { logError } from '~/utils/logError';diff --git a/packages/twenty-front/src/modules/settings/workspace-member/components/WorkspaceMemberPictureUploader.tsx b/packages/twenty-front/src/modules/settings/workspace-member/components/WorkspaceMemberPictureUploader.tsxindex 3c4d73dad4a..cf3d9023d3c 100644--- a/packages/twenty-front/src/modules/settings/workspace-member/components/WorkspaceMemberPictureUploader.tsx+++ b/packages/twenty-front/src/modules/settings/workspace-member/components/WorkspaceMemberPictureUploader.tsx@@ -4,7 +4,7 @@ import { useState } from 'react';import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';import { useUploadWorkspaceMemberProfilePicture } from '@/settings/members/hooks/useUploadWorkspaceMemberProfilePicture';import { useCanEditProfileField } from '@/settings/profile/hooks/useCanEditProfileField';-import { useUpdateWorkspaceMemberSettings } from '@/settings/profile/hooks/useUpdateWorkspaceMemberSettings';+import { useUpdateWorkspaceMemberSettings } from '@/workspace-member/hooks/useUpdateWorkspaceMemberSettings';import { SettingsImageInput } from '@/settings/components/SettingsImageInput';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelForDesktop.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelForDesktop.tsxindex e26f82333dd..641aa74dbc0 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelForDesktop.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelForDesktop.tsx@@ -1,4 +1,4 @@-import { tableWidthResizeIsActiveState } from '@/object-record/record-table/states/tableWidthResizeIsActivedState';+import { isResizablePanelDraggingState } from '@/ui/layout/resizable-panel/states/isResizablePanelDraggingState';import { SidePanelAskAiHandoffEffect } from '@/side-panel/components/SidePanelAskAiHandoffEffect';import { SidePanelRouter } from '@/side-panel/components/SidePanelRouter';import { SidePanelWidthEffect } from '@/side-panel/components/SidePanelWidthEffect';@@ -102,8 +102,8 @@ export const SidePanelForDesktop = () => {setIsShrinkingFromFullWidth(true);}, [shouldReduceMotion]);- const setTableWidthResizeIsActive = useSetAtomState(- tableWidthResizeIsActiveState,+ const setIsResizablePanelDragging = useSetAtomState(+ isResizablePanelDraggingState,);const shouldShowContent = isSidePanelOpened || shouldRenderContent;@@ -145,9 +145,9 @@ export const SidePanelForDesktop = () => {setSidePanelWidth(width);setLiveWidth(null);setIsResizing(false);- setTableWidthResizeIsActive(true);+ setIsResizablePanelDragging(false);},- [setSidePanelWidth, setTableWidthResizeIsActive],+ [setSidePanelWidth, setIsResizablePanelDragging],);const handleWidthPreview = (width: number) => {@@ -161,20 +161,20 @@ export const SidePanelForDesktop = () => {const handleResizeEnd = () => {setLiveWidth(null);setIsResizing(false);- setTableWidthResizeIsActive(true);+ setIsResizablePanelDragging(false);};const handleResizeStart = useCallback(() => {setIsResizing(true);- setTableWidthResizeIsActive(false);- }, [setTableWidthResizeIsActive]);+ setIsResizablePanelDragging(true);+ }, [setIsResizablePanelDragging]);const handleCollapse = useCallback(() => {closeSidePanelMenu();setLiveWidth(null);setIsResizing(false);- setTableWidthResizeIsActive(true);- }, [closeSidePanelMenu, setTableWidthResizeIsActive]);+ setIsResizablePanelDragging(false);+ }, [closeSidePanelMenu, setIsResizablePanelDragging]);return (<>diff --git a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsxindex 6ab0f48abc1..0e817a2839f 100644--- a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx+++ b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx@@ -9,7 +9,8 @@ import {type FieldCurrencyMetadata,type FieldCurrencyValue,} from '@/object-record/record-field/ui/types/FieldMetadata';-import { SETTINGS_FIELD_CURRENCY_CODES } from '@/settings/data-model/constants/SettingsFieldCurrencyCodes';+import { CURRENCY_CODE_LABELS } from 'twenty-shared/constants';+import { CURRENCY_CODE_ICONS } from '@/ui/input/components/internal/currency/constants/CurrencyCodeIcons';import { EllipsisDisplay } from '@/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay';import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';import { DEFAULT_DECIMAL_VALUE } from '~/utils/format/formatNumber';@@ -31,10 +32,12 @@ export const CurrencyDisplay = ({const theme = useTheme();const currencyCode = currencyValue?.currencyCode;- const currencyMetadata = isDefined(currencyCode)- ? SETTINGS_FIELD_CURRENCY_CODES[currencyCode]+ const CurrencyIcon = isDefined(currencyCode)+ ? CURRENCY_CODE_ICONS[currencyCode]: null;- const CurrencyIcon = currencyMetadata?.Icon ?? null;+ const currencyLabel = isDefined(currencyCode)+ ? CURRENCY_CODE_LABELS[currencyCode]?.label+ : undefined;const amountToDisplay = !isDefined(currencyValue?.amountMicros)? null@@ -46,7 +49,7 @@ export const CurrencyDisplay = ({const { formatNumber } = useNumberFormat();const currencyTooltipContent = isDefined(currencyCode)- ? `${currencyCode}${currencyMetadata?.label ? ` - ${currencyMetadata.label}` : ''}`+ ? `${currencyCode}${isDefined(currencyLabel) ? ` - ${currencyLabel}` : ''}`: undefined;const shouldShowCurrencyTooltip =isDefined(CurrencyIcon) &&diff --git a/packages/twenty-front/src/modules/ui/field/input/components/AddressInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/AddressInput.tsxindex 7e686a4ab22..10f7f81c181 100644--- a/packages/twenty-front/src/modules/ui/field/input/components/AddressInput.tsx+++ b/packages/twenty-front/src/modules/ui/field/input/components/AddressInput.tsx@@ -4,7 +4,7 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react';import { PlaceAutocompleteSelect } from '@/geo-map/components/PlaceAutocompleteSelect';import { SELECT_AUTOCOMPLETE_LIST_DROPDOWN_ID } from '@/geo-map/constants/SelectAutocompleteListDropDownId';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { type FieldAddressDraftValue } from '@/object-record/record-field/ui/types/FieldInputDraftValue';import { TextInput } from '@/ui/input/components/TextInput';import { AutocompleteRoot } from '@/ui/input/components/AutocompleteRoot';diff --git a/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsxindex ff04293c868..b39a0258972 100644--- a/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx+++ b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx@@ -2,9 +2,9 @@ import { isDefined } from 'twenty-shared/utils';import { styled } from '@linaria/react';import { useEffect, useRef, useState } from 'react';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { useNumberFormat } from '@/localization/hooks/useNumberFormat';-import { CURRENCIES } from '@/settings/data-model/constants/Currencies';+import { CURRENCIES } from '@/ui/input/components/internal/currency/constants/Currencies';import { CurrencyPickerDropdownButton } from '@/ui/input/components/internal/currency/components/CurrencyPickerDropdownButton';import { CURRENCY_MICROS_DECIMAL_PLACES } from '@/ui/field/input/constants/CurrencyMicrosDecimalPlaces';import { IMaskInput } from 'react-imask';diff --git a/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsxindex 887139e1e0f..2abad2d5f48 100644--- a/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx+++ b/packages/twenty-front/src/modules/ui/field/input/components/DateInput.tsx@@ -1,6 +1,6 @@import { useCallback, useRef, useState } from 'react';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { DatePicker } from '@/ui/input/components/internal/date/components/DatePicker';import { currentFocusIdSelector } from '@/ui/utilities/focus/states/currentFocusIdSelector';import { useStore } from 'jotai';diff --git a/packages/twenty-front/src/modules/ui/field/input/components/DateTimeInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/DateTimeInput.tsxindex 409e8c16898..bccb7429f42 100644--- a/packages/twenty-front/src/modules/ui/field/input/components/DateTimeInput.tsx+++ b/packages/twenty-front/src/modules/ui/field/input/components/DateTimeInput.tsx@@ -1,6 +1,6 @@import { useCallback, useRef, useState } from 'react';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { DateTimePicker } from '@/ui/input/components/internal/date/components/DateTimePicker';import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';import { currentFocusIdSelector } from '@/ui/utilities/focus/states/currentFocusIdSelector';diff --git a/packages/twenty-front/src/modules/ui/field/input/components/TextAreaInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/TextAreaInput.tsxindex be6a9a4475f..6a23feda8da 100644--- a/packages/twenty-front/src/modules/ui/field/input/components/TextAreaInput.tsx+++ b/packages/twenty-front/src/modules/ui/field/input/components/TextAreaInput.tsx@@ -2,8 +2,8 @@ import { styled } from '@linaria/react';import { useEffect, useRef, useState, type ChangeEvent } from 'react';import TextareaAutosize from 'react-textarea-autosize';-import { LightCopyIconButton } from '@/object-record/record-field/ui/components/LightCopyIconButton';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { LightCopyIconButton } from '@/ui/input/components/LightCopyIconButton';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { isDefined } from 'twenty-shared/utils';import { turnIntoEmptyStringIfWhitespacesOnly } from '~/utils/string/turnIntoEmptyStringIfWhitespacesOnly';import { themeCssVariables } from 'twenty-ui/theme';diff --git a/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsxindex b3ff0b7f70f..2f9de99ea5b 100644--- a/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx+++ b/packages/twenty-front/src/modules/ui/field/input/components/TextInput.tsx@@ -1,8 +1,8 @@import { styled } from '@linaria/react';import { useEffect, useRef, useState, type ChangeEvent } from 'react';-import { LightCopyIconButton } from '@/object-record/record-field/ui/components/LightCopyIconButton';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { LightCopyIconButton } from '@/ui/input/components/LightCopyIconButton';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { themeCssVariables } from 'twenty-ui/theme';export const StyledTextInput = styled.input`diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/components/LightCopyIconButton.tsx b/packages/twenty-front/src/modules/ui/input/components/LightCopyIconButton.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/object-record/record-field/ui/components/LightCopyIconButton.tsxrename to packages/twenty-front/src/modules/ui/input/components/LightCopyIconButton.tsxdiff --git a/packages/twenty-front/src/modules/ui/input/components/TitleInput.tsx b/packages/twenty-front/src/modules/ui/input/components/TitleInput.tsxindex 58e195792df..a00e3d9ce03 100644--- a/packages/twenty-front/src/modules/ui/input/components/TitleInput.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/TitleInput.tsx@@ -3,7 +3,7 @@ import { type TextInputSize } from '@/ui/input/types/TextInputSize';import { useRef, useState } from 'react';import { isDefined } from 'twenty-shared/utils';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { TitleInputAutoOpenEffect } from '@/ui/input/components/TitleInputAutoOpenEffect';import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/constants/Currencies.ts b/packages/twenty-front/src/modules/ui/input/components/internal/currency/constants/Currencies.tsnew file mode 100644index 00000000000..05d5361e8fd--- /dev/null+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/constants/Currencies.ts@@ -0,0 +1,12 @@+import { CURRENCY_CODE_ICONS } from '@/ui/input/components/internal/currency/constants/CurrencyCodeIcons';+import { type Currency } from '@/ui/input/components/internal/types/Currency';+import { CURRENCY_CODE_LABELS } from 'twenty-shared/constants';+import { typedObjectEntries } from 'twenty-shared/utils';++export const CURRENCIES: Currency[] = typedObjectEntries(+ CURRENCY_CODE_LABELS,+).map(([code, { label }]) => ({+ value: code,+ Icon: CURRENCY_CODE_ICONS[code],+ label: `${label} (${code})`,+}));diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/constants/CurrencyCodeIcons.ts b/packages/twenty-front/src/modules/ui/input/components/internal/currency/constants/CurrencyCodeIcons.tsnew file mode 100644index 00000000000..1ca9a9f03c7--- /dev/null+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/constants/CurrencyCodeIcons.ts@@ -0,0 +1,211 @@+import { type CurrencyCode } from 'twenty-shared/constants';+import {+ IconCoins,+ IconCurrencyAfghani,+ IconCurrencyBahraini,+ IconCurrencyBaht,+ IconCurrencyDinar,+ IconCurrencyDirham,+ IconCurrencyDollar,+ IconCurrencyDollarAustralian,+ IconCurrencyDollarBrunei,+ IconCurrencyDollarCanadian,+ IconCurrencyDollarGuyanese,+ IconCurrencyDollarSingapore,+ IconCurrencyDong,+ IconCurrencyDram,+ IconCurrencyEuro,+ IconCurrencyFlorin,+ IconCurrencyForint,+ IconCurrencyFrank,+ IconCurrencyGuarani,+ IconCurrencyHryvnia,+ IconCurrencyIranianRial,+ IconCurrencyKip,+ IconCurrencyKroneCzech,+ IconCurrencyKroneDanish,+ IconCurrencyKroneSwedish,+ IconCurrencyLari,+ IconCurrencyLeu,+ IconCurrencyLira,+ IconCurrencyLyd,+ IconCurrencyManat,+ IconCurrencyNaira,+ IconCurrencyPaanga,+ IconCurrencyPeso,+ IconCurrencyPound,+ IconCurrencyQuetzal,+ IconCurrencyReal,+ IconCurrencyRenminbi,+ IconCurrencyRiyal,+ IconCurrencyRubel,+ IconCurrencyRufiyaa,+ IconCurrencyRupee,+ IconCurrencyRupeeNepalese,+ IconCurrencyShekel,+ IconCurrencySom,+ IconCurrencyTaka,+ IconCurrencyTenge,+ IconCurrencyTugrik,+ IconCurrencyWon,+ IconCurrencyYen,+ IconCurrencyYuan,+ IconCurrencyZloty,+ type IconComponent,+} from 'twenty-ui/icon';+export const CURRENCY_CODE_ICONS: Record<CurrencyCode, IconComponent> = {+ AED: IconCurrencyDirham,+ AFN: IconCurrencyAfghani,+ ALL: IconCurrencyLeu,+ AMD: IconCurrencyDram,+ ANG: IconCurrencyFlorin,+ AOA: IconCoins,+ ARS: IconCoins,+ AUD: IconCurrencyDollarAustralian,+ AWG: IconCurrencyFlorin,+ AZN: IconCurrencyManat,+ BAM: IconCoins,+ BBD: IconCurrencyDollar,+ BDT: IconCurrencyTaka,+ BGN: IconCoins,+ BHD: IconCurrencyBahraini,+ BIF: IconCoins,+ BMD: IconCurrencyDollar,+ BND: IconCurrencyDollarBrunei,+ BOB: IconCoins,+ BRL: IconCurrencyReal,+ BSD: IconCurrencyDollar,+ BTN: IconCurrencyDollar,+ BWP: IconCoins,+ BYN: IconCoins,+ BZD: IconCurrencyDollar,+ CAD: IconCurrencyDollarCanadian,+ CDF: IconCoins,+ CHF: IconCurrencyFrank,+ CLP: IconCoins,+ CLF: IconCoins,+ CNY: IconCurrencyYuan,+ COP: IconCoins,+ CRC: IconCoins,+ CUP: IconCoins,+ CVE: IconCoins,+ CZK: IconCurrencyKroneCzech,+ DJF: IconCoins,+ DKK: IconCurrencyKroneDanish,+ DOP: IconCoins,+ DZD: IconCoins,+ EGP: IconCoins,+ ERN: IconCoins,+ ETB: IconCoins,+ EUR: IconCurrencyEuro,+ FJD: IconCurrencyDollar,+ FKP: IconCoins,+ GBP: IconCurrencyPound,+ GEL: IconCurrencyLari,+ GHS: IconCoins,+ GIP: IconCoins,+ GMD: IconCoins,+ GNF: IconCoins,+ GTQ: IconCurrencyQuetzal,+ GYD: IconCurrencyDollarGuyanese,+ HKD: IconCurrencyRenminbi,+ HNL: IconCurrencyLeu,+ HTG: IconCoins,+ HUF: IconCurrencyForint,+ IDR: IconCoins,+ ILS: IconCurrencyShekel,+ INR: IconCurrencyRupee,+ IQD: IconCoins,+ IRR: IconCurrencyIranianRial,+ ISK: IconCoins,+ JMD: IconCurrencyDollar,+ JOD: IconCoins,+ JPY: IconCurrencyYen,+ KES: IconCoins,+ KGS: IconCurrencySom,+ KHR: IconCoins,+ KMF: IconCoins,+ KPW: IconCurrencyWon,+ KRW: IconCurrencyWon,+ KWD: IconCurrencyDinar,+ KYD: IconCurrencyDollar,+ KZT: IconCurrencyTenge,+ LAK: IconCurrencyKip,+ LBP: IconCoins,+ LKR: IconCoins,+ LRD: IconCurrencyDollar,+ LSL: IconCurrencyLeu,+ LYD: IconCurrencyLyd,+ MAD: IconCurrencyDirham,+ MDL: IconCurrencyLeu,+ MGA: IconCoins,+ MKD: IconCoins,+ MMK: IconCoins,+ MNT: IconCurrencyTugrik,+ MOP: IconCurrencyRenminbi,+ MRU: IconCoins,+ MUR: IconCoins,+ MVR: IconCurrencyRufiyaa,+ MWK: IconCoins,+ MXN: IconCoins,+ MYR: IconCoins,+ MZN: IconCoins,+ NAD: IconCurrencyDollar,+ NGN: IconCurrencyNaira,+ NIO: IconCoins,+ NOK: IconCurrencyKroneSwedish,+ NPR: IconCurrencyRupeeNepalese,+ NZD: IconCurrencyDollar,+ OMR: IconCoins,+ PAB: IconCoins,+ PEN: IconCoins,+ PGK: IconCoins,+ PHP: IconCurrencyPeso,+ PKR: IconCoins,+ PLN: IconCurrencyZloty,+ PYG: IconCurrencyGuarani,+ QAR: IconCurrencyRiyal,+ RON: IconCurrencyLeu,+ RSD: IconCoins,+ RUB: IconCurrencyRubel,+ RWF: IconCoins,+ SAR: IconCoins,+ SBD: IconCurrencyDollar,+ SCR: IconCoins,+ SDG: IconCoins,+ SEK: IconCurrencyKroneSwedish,+ SGD: IconCurrencyDollarSingapore,+ SHP: IconCoins,+ SLE: IconCoins,+ SOS: IconCoins,+ SRD: IconCurrencyDollar,+ SSP: IconCoins,+ STN: IconCoins,+ SVC: IconCoins,+ SYP: IconCoins,+ SZL: IconCurrencyLeu,+ THB: IconCurrencyBaht,+ TJS: IconCoins,+ TMT: IconCurrencyManat,+ TND: IconCoins,+ TOP: IconCurrencyPaanga,+ TRY: IconCurrencyLira,+ TTD: IconCurrencyDollar,+ TWD: IconCurrencyRenminbi,+ TZS: IconCoins,+ UAH: IconCurrencyHryvnia,+ UGX: IconCoins,+ USD: IconCurrencyDollar,+ UYU: IconCoins,+ UZS: IconCoins,+ VES: IconCoins,+ VND: IconCurrencyDong,+ VUV: IconCoins,+ WST: IconCoins,+ XOF: IconCoins,+ XCD: IconCurrencyDollar,+ YER: IconCoins,+ ZAR: IconCoins,+ ZMW: IconCoins,+ ZWG: IconCoins,+};diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/currency/constants/CurrencyPickerCurrencies.ts b/packages/twenty-front/src/modules/ui/input/components/internal/currency/constants/CurrencyPickerCurrencies.tsindex 22a0b55abd0..71ee24b5eaa 100644--- a/packages/twenty-front/src/modules/ui/input/components/internal/currency/constants/CurrencyPickerCurrencies.ts+++ b/packages/twenty-front/src/modules/ui/input/components/internal/currency/constants/CurrencyPickerCurrencies.ts@@ -1,8 +1,8 @@-import { SETTINGS_FIELD_CURRENCY_CODES } from '@/settings/data-model/constants/SettingsFieldCurrencyCodes';import { type CurrencyPickerOption } from 'twenty-ui/components/input';+import { CURRENCY_CODE_LABELS } from 'twenty-shared/constants';export const CURRENCY_PICKER_CURRENCIES: readonly CurrencyPickerOption[] =- Object.entries(SETTINGS_FIELD_CURRENCY_CODES).map(([code, { label }]) => ({+ Object.entries(CURRENCY_CODE_LABELS).map(([code, { label }]) => ({code,name: label,}));diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/__tests__/useRegisterInputEvents.test.tsx b/packages/twenty-front/src/modules/ui/input/hooks/__tests__/useRegisterInputEvents.test.tsxsimilarity index 96%rename from packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/__tests__/useRegisterInputEvents.test.tsxrename to packages/twenty-front/src/modules/ui/input/hooks/__tests__/useRegisterInputEvents.test.tsxindex 01855163f1f..a4ca3e7ffd8 100644--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/__tests__/useRegisterInputEvents.test.tsx+++ b/packages/twenty-front/src/modules/ui/input/hooks/__tests__/useRegisterInputEvents.test.tsx@@ -2,7 +2,7 @@ import { act, render, screen } from '@testing-library/react';import userEvent from '@testing-library/user-event';import { useRef } from 'react';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { focusStackState } from '@/ui/utilities/focus/states/focusStackState';import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';import { DEFAULT_GLOBAL_HOTKEYS_CONFIG } from '@/ui/utilities/hotkey/constants/DefaultGlobalHotkeysConfig';diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents.ts b/packages/twenty-front/src/modules/ui/input/hooks/useRegisterInputEvents.tssimilarity index 100%rename from packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents.tsrename to packages/twenty-front/src/modules/ui/input/hooks/useRegisterInputEvents.tsdiff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInput.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInput.tsxindex 0a7ed684983..3575ecca3ce 100644--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInput.tsx+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/DropdownMenuInput.tsx@@ -7,7 +7,7 @@ import {} from 'react';import 'react-phone-number-input/style.css';-import { useRegisterInputEvents } from '@/object-record/record-field/ui/meta-types/input/hooks/useRegisterInputEvents';+import { useRegisterInputEvents } from '@/ui/input/hooks/useRegisterInputEvents';import { isDefined } from 'twenty-shared/utils';import { themeCssVariables } from 'twenty-ui/theme';import { combineRefs } from '~/utils/combineRefs';diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/PageCardHeader.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/PageCardHeader.tsxindex 86e01efee4c..f8762b8615c 100644--- a/packages/twenty-front/src/modules/ui/layout/page/components/PageCardHeader.tsx+++ b/packages/twenty-front/src/modules/ui/layout/page/components/PageCardHeader.tsx@@ -1,5 +1,5 @@import { APP_HEADER_HEIGHT } from '@/ui/layout/constants/AppHeaderHeight';-import { useNavigationDrawerExpanded } from '@/navigation/hooks/useNavigationDrawerExpanded';+import { useNavigationDrawerExpanded } from '@/ui/navigation/navigation-drawer/hooks/useNavigationDrawerExpanded';import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';import { useWorkspaceSurfaceHeaderPortal } from '@/ui/layout/hooks/useWorkspaceSurfaceHeaderPortal';import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';diff --git a/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsxindex 5af8d98fe97..2bbf317b85f 100644--- a/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx+++ b/packages/twenty-front/src/modules/ui/layout/page/components/PageHeader.tsx@@ -6,7 +6,7 @@ import { FrontComponentMediaSessionIndicator } from '@/front-components/media-seimport { NavigationDrawerCollapseButton } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton';import { useIsSettingsPage } from '@/navigation/hooks/useIsSettingsPage';-import { useNavigationDrawerExpanded } from '@/navigation/hooks/useNavigationDrawerExpanded';+import { useNavigationDrawerExpanded } from '@/ui/navigation/navigation-drawer/hooks/useNavigationDrawerExpanded';import { PAGE_ACTION_CONTAINER_CLICK_OUTSIDE_ID } from '@/ui/layout/page/constants/PageActionContainerClickOutsideId';import { PAGE_BAR_MIN_HEIGHT } from '@/ui/layout/page/constants/PageBarMinHeight';import { useIsMobile } from 'twenty-ui/utilities';diff --git a/packages/twenty-front/src/modules/ui/layout/resizable-panel/states/isResizablePanelDraggingState.ts b/packages/twenty-front/src/modules/ui/layout/resizable-panel/states/isResizablePanelDraggingState.tsnew file mode 100644index 00000000000..96971462644--- /dev/null+++ b/packages/twenty-front/src/modules/ui/layout/resizable-panel/states/isResizablePanelDraggingState.ts@@ -0,0 +1,6 @@+import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';++export const isResizablePanelDraggingState = createAtomState<boolean>({+ key: 'isResizablePanelDraggingState',+ defaultValue: false,+});diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/CollapsibleNavigationDrawerSection.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/CollapsibleNavigationDrawerSection.tsxindex 31083549e74..12459ae7520 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/CollapsibleNavigationDrawerSection.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/CollapsibleNavigationDrawerSection.tsx@@ -1,4 +1,4 @@-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';import { NavigationDrawerSectionTitle } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle';import { useNavigationSection } from '@/ui/navigation/navigation-drawer/hooks/useNavigationSection';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsxindex 3a84cc565e2..8a3f56bbd87 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx@@ -1,8 +1,8 @@import { styled } from '@linaria/react';import { type ReactNode, useRef, useState } from 'react';-import { useNavigationDrawerExpanded } from '@/navigation/hooks/useNavigationDrawerExpanded';-import { tableWidthResizeIsActiveState } from '@/object-record/record-table/states/tableWidthResizeIsActivedState';+import { useNavigationDrawerExpanded } from '@/ui/navigation/navigation-drawer/hooks/useNavigationDrawerExpanded';+import { isResizablePanelDraggingState } from '@/ui/layout/resizable-panel/states/isResizablePanelDraggingState';import { ResizeHandle } from 'twenty-ui/primitives/layout';import { useLingui } from '@lingui/react/macro';import { getUiZoom } from '@/ui/theme/utils/getUiZoom';@@ -22,11 +22,11 @@ import { useIsMobile } from 'twenty-ui/utilities';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme';-import { NavigationDrawerHeader } from './NavigationDrawerHeader';export type NavigationDrawerProps = {children?: ReactNode;className?: string;+ header?: ReactNode;};const StyledAnimatedContainer = styled.div<{@@ -84,6 +84,7 @@ const StyledContent = styled.div`export const NavigationDrawer = ({children,className,+ header,}: NavigationDrawerProps) => {const { t } = useLingui();const resizeHandleRef = useRef<HTMLDivElement>(null);@@ -100,8 +101,8 @@ export const NavigationDrawer = ({const setNavigationDrawerActiveTab = useSetAtomState(navigationDrawerActiveTabState,);- const setTableWidthResizeIsActive = useSetAtomState(- tableWidthResizeIsActiveState,+ const setIsResizablePanelDragging = useSetAtomState(+ isResizablePanelDraggingState,);const setShouldFocusNavigationDrawerExpandButton = useSetAtomState(shouldFocusNavigationDrawerExpandButtonState,@@ -115,14 +116,14 @@ export const NavigationDrawer = ({setLiveWidth(null);setNavigationDrawerActiveTab(NAVIGATION_DRAWER_TABS.NAVIGATION_MENU);setIsResizing(false);- setTableWidthResizeIsActive(true);+ setIsResizablePanelDragging(false);};const handleWidthChange = (width: number) => {setNavigationDrawerWidth(width);setLiveWidth(null);setIsResizing(false);- setTableWidthResizeIsActive(true);+ setIsResizablePanelDragging(false);};const handleWidthPreview = (width: number) => {@@ -136,12 +137,12 @@ export const NavigationDrawer = ({const handleResizeEnd = () => {setLiveWidth(null);setIsResizing(false);- setTableWidthResizeIsActive(true);+ setIsResizablePanelDragging(false);};const handleResizeStart = () => {setIsResizing(true);- setTableWidthResizeIsActive(false);+ setIsResizablePanelDragging(true);};return (@@ -154,7 +155,7 @@ export const NavigationDrawer = ({isResizing={isResizing}><StyledContainer isExpanded={isExpanded}>- <NavigationDrawerHeader />+ {header}<StyledContent>{children}</StyledContent></StyledContainer>diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper.tsxindex 8ca895958e8..c9d08fde479 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper.tsx@@ -1,4 +1,4 @@-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { styled } from '@linaria/react';import {type AnimationControls,diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsxindex 90185490dc7..9c31351ed0b 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton.tsx@@ -1,6 +1,6 @@import { useIsSettingsDrawer } from '@/navigation/hooks/useIsSettingsDrawer';-import { useNavigationDrawerTogglePresentation } from '@/navigation/hooks/useNavigationDrawerTogglePresentation';-import { useToggleNavigationDrawer } from '@/navigation/hooks/useToggleNavigationDrawer';+import { useNavigationDrawerTogglePresentation } from '@/ui/navigation/navigation-drawer/hooks/useNavigationDrawerTogglePresentation';+import { useToggleNavigationDrawer } from '@/ui/navigation/navigation-drawer/hooks/useToggleNavigationDrawer';import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';import { useNavigationDrawerExpandButtonFocusHandOff } from '@/ui/navigation/navigation-drawer/hooks/useNavigationDrawerExpandButtonFocusHandOff';import { useIsMobile } from 'twenty-ui/utilities';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsxindex b6586cc9565..81c4e190d61 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItem.tsx@@ -1,7 +1,7 @@import { type NavigationDrawerItemProps } from '@/ui/navigation/navigation-drawer/types/NavigationDrawerItemProps';import { VisuallyHidden } from 'twenty-ui/primitives/accessibility';import { isObject } from '@sniptt/guards';-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper';import { NavigationDrawerItemBreadcrumb } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItemBreadcrumb';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItemsCollapsableContainer.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItemsCollapsableContainer.tsxindex d4d8615eaf0..9c14b715b51 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItemsCollapsableContainer.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerItemsCollapsableContainer.tsx@@ -1,5 +1,5 @@import { NAVIGATION_DRAWER_COLLAPSED_BUTTON_SIZE } from '@/ui/navigation/navigation-drawer/constants/NavigationDrawerCollapsedButtonSize';-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { styled } from '@linaria/react';import { type ReactNode } from 'react';import {diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsxindex 572d3f7c751..731f7a6843a 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle.tsx@@ -1,4 +1,4 @@-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { useIsMobile } from 'twenty-ui/utilities';import { styled } from '@linaria/react';import { motion } from 'framer-motion';diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsxindex 8c126a76ed8..cf8693559c1 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx@@ -37,6 +37,7 @@ import {IconUsers,} from 'twenty-ui/icon';+import { NavigationDrawerHeader } from '@/navigation/components/NavigationDrawerHeader';import { NavigationDrawer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawer';import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';import { NavigationDrawerItemGroup } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItemGroup';@@ -69,7 +70,8 @@ const meta: Meta<typeof NavigationDrawer> = {layout: 'fullscreen',msw: graphqlMocks,},- argTypes: { children: { control: false } },+ args: { header: <NavigationDrawerHeader /> },+ argTypes: { children: { control: false }, header: { control: false } },};export default meta;diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__tests__/NavigationDrawer.test.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__tests__/NavigationDrawer.test.tsxindex f175184664f..05c7594e232 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__tests__/NavigationDrawer.test.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__tests__/NavigationDrawer.test.tsx@@ -15,13 +15,6 @@ import {resetJotaiStore,} from '@/ui/utilities/state/jotai/jotaiStore';-jest.mock(- '@/ui/navigation/navigation-drawer/components/NavigationDrawerHeader',- () => ({- NavigationDrawerHeader: () => null,- }),-);-const PageHeaderExpandButton = () => {const isNavigationDrawerExpanded = useAtomStateValue(isNavigationDrawerExpandedState,diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__tests__/NavigationDrawerAnimatedCollapseWrapper.test.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__tests__/NavigationDrawerAnimatedCollapseWrapper.test.tsxindex edf33f5af7f..aee1d3379d4 100644--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__tests__/NavigationDrawerAnimatedCollapseWrapper.test.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__tests__/NavigationDrawerAnimatedCollapseWrapper.test.tsx@@ -1,8 +1,10 @@-import { useIsNavigationDrawerContentExpanded } from '@/navigation/hooks/useIsNavigationDrawerContentExpanded';+import { useIsNavigationDrawerContentExpanded } from '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded';import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper';import { render, screen, waitFor } from '@testing-library/react';-jest.mock('@/navigation/hooks/useIsNavigationDrawerContentExpanded');+jest.mock(+ '@/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded',+);const NavigationModes = () => (<NavigationDrawerAnimatedCollapseWrapper>diff --git a/packages/twenty-front/src/modules/navigation/hooks/__tests__/useToggleNavigationDrawer.test.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/__tests__/useToggleNavigationDrawer.test.tsxsimilarity index 95%rename from packages/twenty-front/src/modules/navigation/hooks/__tests__/useToggleNavigationDrawer.test.tsxrename to packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/__tests__/useToggleNavigationDrawer.test.tsxindex eea973c5408..aee2a7adabe 100644--- a/packages/twenty-front/src/modules/navigation/hooks/__tests__/useToggleNavigationDrawer.test.tsx+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/__tests__/useToggleNavigationDrawer.test.tsx@@ -1,4 +1,4 @@-import { useToggleNavigationDrawer } from '@/navigation/hooks/useToggleNavigationDrawer';+import { useToggleNavigationDrawer } from '@/ui/navigation/navigation-drawer/hooks/useToggleNavigationDrawer';import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';import { navigationDrawerActiveTabState } from '@/ui/navigation/states/navigationDrawerActiveTabState';import { NAVIGATION_DRAWER_TABS } from '@/ui/navigation/states/navigationDrawerTabs';diff --git a/packages/twenty-front/src/modules/navigation/hooks/useIsNavigationDrawerContentExpanded.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded.tssimilarity index 77%rename from packages/twenty-front/src/modules/navigation/hooks/useIsNavigationDrawerContentExpanded.tsrename to packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded.tsindex a3a67295701..7ec39892005 100644--- a/packages/twenty-front/src/modules/navigation/hooks/useIsNavigationDrawerContentExpanded.ts+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useIsNavigationDrawerContentExpanded.ts@@ -1,4 +1,4 @@-import { useNavigationDrawerExpanded } from '@/navigation/hooks/useNavigationDrawerExpanded';+import { useNavigationDrawerExpanded } from '@/ui/navigation/navigation-drawer/hooks/useNavigationDrawerExpanded';import { useIsMobile } from 'twenty-ui/utilities';// For the content (useNavigationDrawerExpanded is for the drawer container); mobile has no icon rail, so it always renders expanded there.diff --git a/packages/twenty-front/src/modules/navigation/hooks/useNavigationDrawerExpanded.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useNavigationDrawerExpanded.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation/hooks/useNavigationDrawerExpanded.tsrename to packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useNavigationDrawerExpanded.tsdiff --git a/packages/twenty-front/src/modules/navigation/hooks/useNavigationDrawerTogglePresentation.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useNavigationDrawerTogglePresentation.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation/hooks/useNavigationDrawerTogglePresentation.tsrename to packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useNavigationDrawerTogglePresentation.tsdiff --git a/packages/twenty-front/src/modules/navigation/hooks/useToggleNavigationDrawer.ts b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useToggleNavigationDrawer.tssimilarity index 100%rename from packages/twenty-front/src/modules/navigation/hooks/useToggleNavigationDrawer.tsrename to packages/twenty-front/src/modules/ui/navigation/navigation-drawer/hooks/useToggleNavigationDrawer.tsdiff --git a/packages/twenty-front/src/modules/ui/theme/components/BaseThemeProvider.tsx b/packages/twenty-front/src/modules/ui/theme/components/BaseThemeProvider.tsxindex a7b2825e13f..a5b3b854d33 100644--- a/packages/twenty-front/src/modules/ui/theme/components/BaseThemeProvider.tsx+++ b/packages/twenty-front/src/modules/ui/theme/components/BaseThemeProvider.tsx@@ -6,8 +6,8 @@ import { persistedColorSchemeState } from '@/ui/theme/states/persistedColorSchemimport { persistedUiScaleStepState } from '@/ui/theme/states/persistedUiScaleStepState';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';import { ThemeProvider } from 'twenty-ui/theme';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';type BaseThemeProviderProps = {children: JSX.Element | JSX.Element[];diff --git a/packages/twenty-front/src/modules/ui/theme/constants/UiScaleMultipliers.ts b/packages/twenty-front/src/modules/ui/theme/constants/UiScaleMultipliers.tsindex 3dbba055ab2..ad463f5a6cc 100644--- a/packages/twenty-front/src/modules/ui/theme/constants/UiScaleMultipliers.ts+++ b/packages/twenty-front/src/modules/ui/theme/constants/UiScaleMultipliers.ts@@ -1,4 +1,4 @@-import { type UiScale } from '@/workspace-member/types/WorkspaceMember';+import { type UiScale } from '@/ui/theme/types/UiScale';// Multiplies --t-scale-user, which every dimension token derives from; Default is today's rendering.// Steps bracket the range where layout survives, as breakpoints do not move with the scale (unlike browser zoom)diff --git a/packages/twenty-front/src/modules/ui/theme/hooks/useSystemColorScheme.ts b/packages/twenty-front/src/modules/ui/theme/hooks/useSystemColorScheme.tsindex 4de27d8d4ca..bc4b1bfc803 100644--- a/packages/twenty-front/src/modules/ui/theme/hooks/useSystemColorScheme.ts+++ b/packages/twenty-front/src/modules/ui/theme/hooks/useSystemColorScheme.ts@@ -1,6 +1,5 @@import { useMediaQuery } from 'twenty-ui/utilities';--import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';export const useSystemColorScheme = (): ColorScheme =>useMediaQuery('(prefers-color-scheme: dark)') ? 'Dark' : 'Light';diff --git a/packages/twenty-front/src/modules/ui/theme/states/persistedColorSchemeState.ts b/packages/twenty-front/src/modules/ui/theme/states/persistedColorSchemeState.tsindex 010e7c87d13..389e740aa7e 100644--- a/packages/twenty-front/src/modules/ui/theme/states/persistedColorSchemeState.ts+++ b/packages/twenty-front/src/modules/ui/theme/states/persistedColorSchemeState.ts@@ -1,5 +1,5 @@-import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';export const persistedColorSchemeState = createAtomState<ColorScheme>({key: 'persistedColorSchemeState',diff --git a/packages/twenty-front/src/modules/ui/theme/states/persistedUiScaleStepState.ts b/packages/twenty-front/src/modules/ui/theme/states/persistedUiScaleStepState.tsindex 30adf16710a..3b01f687c52 100644--- a/packages/twenty-front/src/modules/ui/theme/states/persistedUiScaleStepState.ts+++ b/packages/twenty-front/src/modules/ui/theme/states/persistedUiScaleStepState.ts@@ -1,6 +1,6 @@import { UI_SCALE_MULTIPLIERS } from '@/ui/theme/constants/UiScaleMultipliers';-import { type UiScale } from '@/workspace-member/types/WorkspaceMember';import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';+import { type UiScale } from '@/ui/theme/types/UiScale';export const persistedUiScaleStepState = createAtomState<UiScale>({key: 'persistedUiScaleStepState',diff --git a/packages/twenty-front/src/modules/ui/theme/types/ColorScheme.ts b/packages/twenty-front/src/modules/ui/theme/types/ColorScheme.tsnew file mode 100644index 00000000000..0a5f3723d78--- /dev/null+++ b/packages/twenty-front/src/modules/ui/theme/types/ColorScheme.ts@@ -0,0 +1 @@+export type ColorScheme = 'Dark' | 'Light' | 'System';diff --git a/packages/twenty-front/src/modules/ui/theme/types/UiScale.ts b/packages/twenty-front/src/modules/ui/theme/types/UiScale.tsnew file mode 100644index 00000000000..85c1375fbaf--- /dev/null+++ b/packages/twenty-front/src/modules/ui/theme/types/UiScale.ts@@ -0,0 +1,3 @@+import type { UI_SCALE_VALUES } from 'twenty-shared/constants';++export type UiScale = (typeof UI_SCALE_VALUES)[number];diff --git a/packages/twenty-front/src/modules/users/hooks/useLoadCurrentUser.ts b/packages/twenty-front/src/modules/users/hooks/useLoadCurrentUser.tsindex 01bd7441d8c..e24856f3eeb 100644--- a/packages/twenty-front/src/modules/users/hooks/useLoadCurrentUser.ts+++ b/packages/twenty-front/src/modules/users/hooks/useLoadCurrentUser.ts@@ -16,14 +16,12 @@ import { SOURCE_LOCALE, type APP_LOCALES } from 'twenty-shared/translations';import { type CurrentUserWorkspaceObjectPermissions } from '@/auth/types/CurrentUserWorkspaceObjectPermissions';import { isDefined } from 'twenty-shared/utils';import { toOpenRecordInPreference } from '@/workspace-member/utils/toOpenRecordInPreference';-import {- type ColorScheme,- type UiScale,-} from '@/workspace-member/types/WorkspaceMember';import { useApolloClient } from '@apollo/client/react';import { GetCurrentUserDocument } from '~/generated-metadata/graphql';import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';import { dynamicActivate } from '~/utils/i18n/dynamicActivate';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';+import { type UiScale } from '@/ui/theme/types/UiScale';export const useLoadCurrentUser = () => {const setCurrentUser = useSetAtomState(currentUserState);diff --git a/packages/twenty-front/src/modules/workflow/components/WorkflowStepExecutionResult.tsx b/packages/twenty-front/src/modules/workflow/components/WorkflowStepExecutionResult.tsxindex fc0366edd65..2f716b46336 100644--- a/packages/twenty-front/src/modules/workflow/components/WorkflowStepExecutionResult.tsx+++ b/packages/twenty-front/src/modules/workflow/components/WorkflowStepExecutionResult.tsx@@ -1,4 +1,4 @@-import { LightCopyIconButton } from '@/object-record/record-field/ui/components/LightCopyIconButton';+import { LightCopyIconButton } from '@/ui/input/components/LightCopyIconButton';import { AnimatedCircleLoading } from '@/workflow/components/internal/AnimatedCircleLoading/AnimatedCircleLoading';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterValueCompositeInput.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterValueCompositeInput.tsxindex 866d2765324..36c82aeaed6 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterValueCompositeInput.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterValueCompositeInput.tsx@@ -7,7 +7,7 @@ import {type FieldRelationToOneValue,type FieldRelationValue,} from '@/object-record/record-field/ui/types/FieldMetadata';-import { CURRENCIES } from '@/settings/data-model/constants/Currencies';+import { CURRENCIES } from '@/ui/input/components/internal/currency/constants/Currencies';import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/filters/states/context/WorkflowStepFilterContext';import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';import { useContext } from 'react';diff --git a/packages/twenty-front/src/modules/ui/theme/components/UserThemeProviderEffect.tsx b/packages/twenty-front/src/modules/workspace-member/effect-components/UserThemeProviderEffect.tsxsimilarity index 83%rename from packages/twenty-front/src/modules/ui/theme/components/UserThemeProviderEffect.tsxrename to packages/twenty-front/src/modules/workspace-member/effect-components/UserThemeProviderEffect.tsxindex 72cb40054c1..5f6c6d36c06 100644--- a/packages/twenty-front/src/modules/ui/theme/components/UserThemeProviderEffect.tsx+++ b/packages/twenty-front/src/modules/workspace-member/effect-components/UserThemeProviderEffect.tsx@@ -1,7 +1,7 @@import { useContext, useEffect } from 'react';import { ThemeSchemeContext } from '@/ui/theme/components/BaseThemeProvider';-import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';+import { useColorScheme } from '@/workspace-member/hooks/useColorScheme';export const UserThemeProviderEffect = () => {const { colorScheme } = useColorScheme();diff --git a/packages/twenty-front/src/modules/ui/theme/components/UserUiScaleProviderEffect.tsx b/packages/twenty-front/src/modules/workspace-member/effect-components/UserUiScaleProviderEffect.tsxsimilarity index 100%rename from packages/twenty-front/src/modules/ui/theme/components/UserUiScaleProviderEffect.tsxrename to packages/twenty-front/src/modules/workspace-member/effect-components/UserUiScaleProviderEffect.tsxdiff --git a/packages/twenty-front/src/modules/settings/profile/graphql/mutations/updateWorkspaceMemberSettings.ts b/packages/twenty-front/src/modules/workspace-member/graphql/mutations/updateWorkspaceMemberSettings.tssimilarity index 100%rename from packages/twenty-front/src/modules/settings/profile/graphql/mutations/updateWorkspaceMemberSettings.tsrename to packages/twenty-front/src/modules/workspace-member/graphql/mutations/updateWorkspaceMemberSettings.tsdiff --git a/packages/twenty-front/src/modules/ui/theme/hooks/__tests__/useColorScheme.test.tsx b/packages/twenty-front/src/modules/workspace-member/hooks/__tests__/useColorScheme.test.tsxsimilarity index 98%rename from packages/twenty-front/src/modules/ui/theme/hooks/__tests__/useColorScheme.test.tsxrename to packages/twenty-front/src/modules/workspace-member/hooks/__tests__/useColorScheme.test.tsxindex b7b6641e66f..42dadf9f7ae 100644--- a/packages/twenty-front/src/modules/ui/theme/hooks/__tests__/useColorScheme.test.tsx+++ b/packages/twenty-front/src/modules/workspace-member/hooks/__tests__/useColorScheme.test.tsx@@ -2,7 +2,7 @@ import {currentWorkspaceMemberState,type CurrentWorkspaceMember,} from '@/auth/states/currentWorkspaceMemberState';-import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';+import { useColorScheme } from '@/workspace-member/hooks/useColorScheme';import { persistedColorSchemeState } from '@/ui/theme/states/persistedColorSchemeState';import { resetJotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';import { CombinedGraphQLErrors } from '@apollo/client/errors';diff --git a/packages/twenty-front/src/modules/ui/theme/hooks/useColorScheme.ts b/packages/twenty-front/src/modules/workspace-member/hooks/useColorScheme.tssimilarity index 93%rename from packages/twenty-front/src/modules/ui/theme/hooks/useColorScheme.tsrename to packages/twenty-front/src/modules/workspace-member/hooks/useColorScheme.tsindex 160fa6544a8..f18e62c8e54 100644--- a/packages/twenty-front/src/modules/ui/theme/hooks/useColorScheme.ts+++ b/packages/twenty-front/src/modules/workspace-member/hooks/useColorScheme.ts@@ -1,9 +1,8 @@import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';-import { useUpdateWorkspaceMemberSettings } from '@/settings/profile/hooks/useUpdateWorkspaceMemberSettings';+import { useUpdateWorkspaceMemberSettings } from '@/workspace-member/hooks/useUpdateWorkspaceMemberSettings';import { persistedColorSchemeState } from '@/ui/theme/states/persistedColorSchemeState';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';import { useStore } from 'jotai';import { useCallback } from 'react';@@ -16,6 +15,7 @@ import {IconSun,IconSunMoon,} from 'twenty-ui/icon';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';export const useColorScheme = () => {const currentWorkspaceMember = useAtomStateValue(currentWorkspaceMemberState);diff --git a/packages/twenty-front/src/modules/ui/theme/hooks/useUiScale.ts b/packages/twenty-front/src/modules/workspace-member/hooks/useUiScale.tssimilarity index 89%rename from packages/twenty-front/src/modules/ui/theme/hooks/useUiScale.tsrename to packages/twenty-front/src/modules/workspace-member/hooks/useUiScale.tsindex 767b8f7d8da..031733d740d 100644--- a/packages/twenty-front/src/modules/ui/theme/hooks/useUiScale.ts+++ b/packages/twenty-front/src/modules/workspace-member/hooks/useUiScale.ts@@ -1,11 +1,11 @@import { useCallback } from 'react';import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';-import { useUpdateWorkspaceMemberSettings } from '@/settings/profile/hooks/useUpdateWorkspaceMemberSettings';+import { useUpdateWorkspaceMemberSettings } from '@/workspace-member/hooks/useUpdateWorkspaceMemberSettings';import { persistedUiScaleStepState } from '@/ui/theme/states/persistedUiScaleStepState';-import { type UiScale } from '@/workspace-member/types/WorkspaceMember';import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { isDefined } from 'twenty-shared/utils';+import { type UiScale } from '@/ui/theme/types/UiScale';export const useUiScale = () => {const [currentWorkspaceMember, setCurrentWorkspaceMember] = useAtomState(diff --git a/packages/twenty-front/src/modules/settings/profile/hooks/useUpdateWorkspaceMemberSettings.ts b/packages/twenty-front/src/modules/workspace-member/hooks/useUpdateWorkspaceMemberSettings.tssimilarity index 89%rename from packages/twenty-front/src/modules/settings/profile/hooks/useUpdateWorkspaceMemberSettings.tsrename to packages/twenty-front/src/modules/workspace-member/hooks/useUpdateWorkspaceMemberSettings.tsindex 65d302b210a..843e708e02e 100644--- a/packages/twenty-front/src/modules/settings/profile/hooks/useUpdateWorkspaceMemberSettings.ts+++ b/packages/twenty-front/src/modules/workspace-member/hooks/useUpdateWorkspaceMemberSettings.ts@@ -4,11 +4,11 @@ import {type CurrentWorkspaceMember,currentWorkspaceMemberState,} from '@/auth/states/currentWorkspaceMemberState';-import { UPDATE_WORKSPACE_MEMBER_SETTINGS } from '@/settings/profile/graphql/mutations/updateWorkspaceMemberSettings';+import { UPDATE_WORKSPACE_MEMBER_SETTINGS } from '@/workspace-member/graphql/mutations/updateWorkspaceMemberSettings';import {mergeWorkspaceMemberSettingsIntoCurrent,type WorkspaceMemberSettingsUpdateInput,-} from '@/settings/profile/utils/mergeWorkspaceMemberSettingsIntoCurrent';+} from '@/workspace-member/utils/mergeWorkspaceMemberSettingsIntoCurrent';import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';type UpdateWorkspaceMemberSettingsMutationData = {diff --git a/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts b/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.tsindex 82e284b25b5..7943b1086d7 100644--- a/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts+++ b/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts@@ -1,4 +1,5 @@-import type { UI_SCALE_VALUES } from 'twenty-shared/constants';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';+import { type UiScale } from '@/ui/theme/types/UiScale';import { type OpenRecordIn } from 'twenty-shared/types';import {type WorkspaceMemberDateFormatEnum,@@ -6,10 +7,6 @@ import {type WorkspaceMemberTimeFormatEnum,} from '~/generated-metadata/graphql';-export type ColorScheme = 'Dark' | 'Light' | 'System';--export type UiScale = (typeof UI_SCALE_VALUES)[number];-export type WorkspaceMember = {__typename: 'WorkspaceMember';id: string;diff --git a/packages/twenty-front/src/modules/settings/profile/utils/__tests__/mergeWorkspaceMemberSettingsIntoCurrent.test.ts b/packages/twenty-front/src/modules/workspace-member/utils/__tests__/mergeWorkspaceMemberSettingsIntoCurrent.test.tssimilarity index 97%rename from packages/twenty-front/src/modules/settings/profile/utils/__tests__/mergeWorkspaceMemberSettingsIntoCurrent.test.tsrename to packages/twenty-front/src/modules/workspace-member/utils/__tests__/mergeWorkspaceMemberSettingsIntoCurrent.test.tsindex 7380ce9813c..fdd4ac45a13 100644--- a/packages/twenty-front/src/modules/settings/profile/utils/__tests__/mergeWorkspaceMemberSettingsIntoCurrent.test.ts+++ b/packages/twenty-front/src/modules/workspace-member/utils/__tests__/mergeWorkspaceMemberSettingsIntoCurrent.test.ts@@ -1,5 +1,5 @@import { type CurrentWorkspaceMember } from '@/auth/states/currentWorkspaceMemberState';-import { mergeWorkspaceMemberSettingsIntoCurrent } from '@/settings/profile/utils/mergeWorkspaceMemberSettingsIntoCurrent';+import { mergeWorkspaceMemberSettingsIntoCurrent } from '@/workspace-member/utils/mergeWorkspaceMemberSettingsIntoCurrent';const createBaseWorkspaceMember = (): CurrentWorkspaceMember => ({id: 'workspace-member-id',diff --git a/packages/twenty-front/src/modules/settings/profile/utils/mergeWorkspaceMemberSettingsIntoCurrent.ts b/packages/twenty-front/src/modules/workspace-member/utils/mergeWorkspaceMemberSettingsIntoCurrent.tssimilarity index 98%rename from packages/twenty-front/src/modules/settings/profile/utils/mergeWorkspaceMemberSettingsIntoCurrent.tsrename to packages/twenty-front/src/modules/workspace-member/utils/mergeWorkspaceMemberSettingsIntoCurrent.tsindex 53c2e625d0e..c286c49ca9f 100644--- a/packages/twenty-front/src/modules/settings/profile/utils/mergeWorkspaceMemberSettingsIntoCurrent.ts+++ b/packages/twenty-front/src/modules/workspace-member/utils/mergeWorkspaceMemberSettingsIntoCurrent.ts@@ -1,7 +1,6 @@import { isNull, isNumber, isString } from '@sniptt/guards';import { type CurrentWorkspaceMember } from '@/auth/states/currentWorkspaceMemberState';-import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';import { isOpenRecordIn } from '@/workspace-member/utils/toOpenRecordInPreference';import { type OpenRecordIn } from 'twenty-shared/types';import { isDefined, isPlainObject } from 'twenty-shared/utils';@@ -10,6 +9,7 @@ import {WorkspaceMemberNumberFormatEnum,WorkspaceMemberTimeFormatEnum,} from '~/generated-metadata/graphql';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';export type WorkspaceMemberNameUpdate = {firstName: string;diff --git a/packages/twenty-front/src/pages/mobile-home/MobileHomePage.tsx b/packages/twenty-front/src/pages/mobile-home/MobileHomePage.tsxindex 5122a547b5b..2570c2fff14 100644--- a/packages/twenty-front/src/pages/mobile-home/MobileHomePage.tsx+++ b/packages/twenty-front/src/pages/mobile-home/MobileHomePage.tsx@@ -2,7 +2,7 @@ import { MobileHomeAiChatSection } from '@/ai/components/MobileHomeAiChatSectionimport { MainNavigationDrawerNavigationContent } from '@/navigation/components/MainNavigationDrawerNavigationContent';import { useDefaultHomePagePath } from '@/navigation/hooks/useDefaultHomePagePath';import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';-import { MultiWorkspaceDropdownButton } from '@/ui/navigation/navigation-drawer/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton';+import { MultiWorkspaceDropdownButton } from '@/navigation/components/MultiWorkspaceDropdown/MultiWorkspaceDropdownButton';import { NavigationDrawerFixedContent } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerFixedContent';import { NavigationDrawerScrollableContent } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerScrollableContent';import { useIsMobile } from 'twenty-ui/utilities';diff --git a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsxindex 5bfff00edfc..7702bb9a372 100644--- a/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx+++ b/packages/twenty-front/src/pages/onboarding/CreateProfile.tsx@@ -15,7 +15,7 @@ import { useSetNextOnboardingStatus } from '@/onboarding/hooks/useSetNextOnboardimport { useSetOnboardingStepFreeCredits } from '@/onboarding/hooks/useSetOnboardingStepFreeCredits';import { onboardingCreateProfileDraftState } from '@/onboarding/states/onboardingCreateProfileDraftState';import { onboardingCreditsProgressSelector } from '@/onboarding/states/selectors/onboardingCreditsProgressSelector';-import { useUpdateWorkspaceMemberSettings } from '@/settings/profile/hooks/useUpdateWorkspaceMemberSettings';+import { useUpdateWorkspaceMemberSettings } from '@/workspace-member/hooks/useUpdateWorkspaceMemberSettings';import { PageFocusId } from '@/types/PageFocusId';import { TextInput } from '@/ui/input/components/TextInput';import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsxindex d45f6660f7b..1f79bd1576f 100644--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx@@ -4,7 +4,7 @@ import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMembeimport { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';import { getDateFnsLocale } from '@/ui/field/display/utils/getDateFnsLocale';import { Select } from '@/ui/input/components/Select';-import { useUpdateWorkspaceMemberSettings } from '@/settings/profile/hooks/useUpdateWorkspaceMemberSettings';+import { useUpdateWorkspaceMemberSettings } from '@/workspace-member/hooks/useUpdateWorkspaceMemberSettings';import { useInvalidateMetadataStore } from '@/metadata-store/hooks/useInvalidateMetadataStore';import { useStore } from 'jotai';diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearance.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearance.tsxindex 71195808566..34f5b50b234 100644--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearance.tsx+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearance.tsx@@ -2,14 +2,14 @@ import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';-import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';+import { useColorScheme } from '@/workspace-member/hooks/useColorScheme';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';-import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';import { isDefined } from 'twenty-shared/utils';import { Section } from 'twenty-ui/components/layout';import { RadioGroup } from 'twenty-ui/primitives/input';import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme';import { SettingsAppearanceOption } from '~/pages/settings/profile/appearance/components/SettingsAppearanceOption';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';const StyledChoices = styled.div`width: 100%;diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearanceOption.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearanceOption.tsxindex 1506b4f42f5..7732f1e8b18 100644--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearanceOption.tsx+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearanceOption.tsx@@ -1,11 +1,11 @@import { styled } from '@linaria/react';import { useId } from 'react';-import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';import { IconCheck } from 'twenty-ui/icon';import { Radio } from 'twenty-ui/primitives/input';import { MOBILE_VIEWPORT, themeCssVariables, useTheme } from 'twenty-ui/theme';import { SettingsAppearancePreview } from '~/pages/settings/profile/appearance/components/SettingsAppearancePreview';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';const StyledChoice = styled.label`display: flex;diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearancePreview.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearancePreview.tsxindex 98740147d18..6d00a57da94 100644--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearancePreview.tsx+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/SettingsAppearancePreview.tsx@@ -1,12 +1,12 @@import { styled } from '@linaria/react';import { type CSSProperties } from 'react';-import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';import {GRAY_SCALE_DARK,GRAY_SCALE_LIGHT,themeCssVariables,} from 'twenty-ui/theme';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';const StyledPreview = styled.div`border-radius: ${themeCssVariables.border.radius.md};diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/__stories__/SettingsAppearance.stories.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/__stories__/SettingsAppearance.stories.tsxindex 72ee666010a..e15005173d7 100644--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/__stories__/SettingsAppearance.stories.tsx+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/__stories__/SettingsAppearance.stories.tsx@@ -1,7 +1,6 @@import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';import { persistedColorSchemeState } from '@/ui/theme/states/persistedColorSchemeState';import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';-import { type ColorScheme } from '@/workspace-member/types/WorkspaceMember';import { type Meta, type StoryObj } from '@storybook/react-vite';import { graphql, HttpResponse } from 'msw';import { expect, within } from 'storybook/test';@@ -9,6 +8,7 @@ import { ToastProvider } from 'twenty-ui/components/feedback';import { DirectionProvider } from 'twenty-ui/primitives/layout';import { ThemeProvider, themeCssVariables } from 'twenty-ui/theme';import { SettingsAppearance } from '~/pages/settings/profile/appearance/components/SettingsAppearance';+import { type ColorScheme } from '@/ui/theme/types/ColorScheme';const meta = {title: 'Pages/Settings/Appearance',diff --git a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx b/packages/twenty-front/src/testing/decorators/PageDecorator.tsxindex efd643b3deb..b39b0e256a4 100644--- a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx+++ b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx@@ -12,7 +12,7 @@ import { Provider as JotaiProvider } from 'jotai';import { RouterProvider, createMemoryRouter } from 'react-router-dom';import { UserMetadataProviderInitialEffect } from '@/metadata-store/effect-components/UserMetadataProviderInitialEffect';-import { DefaultLayout } from '@/ui/layout/page/components/DefaultLayout';+import { DefaultLayout } from '@/app/components/DefaultLayout';import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';import { UserContextProvider } from '@/users/components/UserContextProvider';import { type JSX, useState } from 'react';