The open alternative to Salesforce, designed for AI.
TypeScript crmcrm-systemcustomergood-first-issuegraphqlhacktoberfestjavascriptmarketingmonoreponestjsopen-sourcepostgresqlreactreactjssalestypescriptweb
Object icon visual parity (#19374)
Abdul Rahman34a903b4fad1
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventIconDynamicComponent.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventIconDynamicComponent.tsxindex c28e0f88229..ba60995bdd4 100644--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventIconDynamicComponent.tsx+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventIconDynamicComponent.tsx@@ -1,11 +1,11 @@import { type TimelineActivity } from '@/activities/timeline-activities/types/TimelineActivity';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import {IconCirclePlus,IconEditCircle,IconRestore,IconTrash,- useIcons,} from 'twenty-ui/display';export const EventIconDynamicComponent = ({@@ -15,7 +15,6 @@ export const EventIconDynamicComponent = ({event: TimelineActivity;linkedObjectMetadataItem: EnrichedObjectMetadataItem | null;}) => {- const { getIcon } = useIcons();const [, eventAction] = event.name.split('.');if (eventAction === 'created') {@@ -31,7 +30,5 @@ export const EventIconDynamicComponent = ({return <IconRestore />;}- const IconComponent = getIcon(linkedObjectMetadataItem?.icon);-- return <IconComponent />;+ return <ObjectMetadataIcon objectMetadataItem={linkedObjectMetadataItem} />;};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemDefaultIconColor.constant.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemDefaultIconColor.constant.tsdeleted file mode 100644index d420bcb6532..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/constants/NavigationMenuItemDefaultIconColor.constant.ts+++ /dev/null@@ -1,3 +0,0 @@-import type { ThemeColor } from 'twenty-ui/theme';--export const DEFAULT_NAV_ITEM_ICON_COLOR: ThemeColor = 'gray';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemColor.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemColor.tsindex 0000178d405..34306713260 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemColor.ts+++ b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemColor.ts@@ -2,11 +2,10 @@ import { isNonEmptyString } from '@sniptt/guards';import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorLink';-import { DEFAULT_NAV_ITEM_ICON_COLOR } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultIconColor.constant';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';+import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';import { NavigationMenuItemType } from 'twenty-shared/types';-import { type ThemeColor } from 'twenty-ui/theme';+import { DEFAULT_THEME_COLOR_FALLBACK, type ThemeColor } from 'twenty-ui/theme';export const getNavigationMenuItemColor = (navigationMenuItem: {@@ -35,8 +34,8 @@ export const getNavigationMenuItemColor = (if (objectMetadataItem) {return getObjectColorWithFallback(objectMetadataItem);}- return DEFAULT_NAV_ITEM_ICON_COLOR;+ return DEFAULT_THEME_COLOR_FALLBACK;}- return DEFAULT_NAV_ITEM_ICON_COLOR;+ return DEFAULT_THEME_COLOR_FALLBACK;};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor.tsdeleted file mode 100644index e775304c2e6..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor.ts+++ /dev/null@@ -1,17 +0,0 @@-import { getColorFromTheme } from '@/navigation-menu-item/common/utils/getColorFromTheme';-import { COLOR_SHADE_BACKGROUND } from '@/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBackground';-import { COLOR_SHADE_BORDER } from '@/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBorder';-import { COLOR_SHADE_ICON } from '@/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeIcon';-import { type NavigationMenuItemIconStyle } from '@/navigation-menu-item/common/utils/navigationMenuItemIconStyle';-import { parseThemeColor } from '@/navigation-menu-item/common/utils/parseThemeColor';--export const getNavigationMenuItemIconStyleFromColor = (- color: string | null | undefined,-): NavigationMenuItemIconStyle => {- const themeColor = parseThemeColor(color);- return {- backgroundColor: getColorFromTheme(themeColor, COLOR_SHADE_BACKGROUND),- iconColor: getColorFromTheme(themeColor, COLOR_SHADE_ICON),- borderColor: getColorFromTheme(themeColor, COLOR_SHADE_BORDER),- };-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBackground.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBackground.tsdeleted file mode 100644index 13bf6ae5a14..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBackground.ts+++ /dev/null@@ -1 +0,0 @@-export const COLOR_SHADE_BACKGROUND = 5;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBorder.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBorder.tsdeleted file mode 100644index 8167e2df31e..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeBorder.ts+++ /dev/null@@ -1 +0,0 @@-export const COLOR_SHADE_BORDER = 6;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeIcon.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeIcon.tsdeleted file mode 100644index fabc31d4e9d..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconColorShadeIcon.ts+++ /dev/null@@ -1 +0,0 @@-export const COLOR_SHADE_ICON = 11;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconStyle.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconStyle.tsdeleted file mode 100644index 5fbf0b7ea8b..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/navigationMenuItemIconStyle.ts+++ /dev/null@@ -1,5 +0,0 @@-export type NavigationMenuItemIconStyle = {- backgroundColor: string;- iconColor: string;- borderColor: string;-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/parseThemeColor.ts b/packages/twenty-front/src/modules/navigation-menu-item/common/utils/parseThemeColor.tsdeleted file mode 100644index 847a242720d..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/parseThemeColor.ts+++ /dev/null@@ -1,11 +0,0 @@-import { type ThemeColor } from 'twenty-ui/theme';-import { themeColorSchema } from 'twenty-ui/utilities';--import { DEFAULT_NAV_ITEM_ICON_COLOR } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultIconColor.constant';--export const parseThemeColor = (- color: string | null | undefined,-): ThemeColor => {- const result = themeColorSchema.safeParse(color ?? '');- return result.success ? result.data : DEFAULT_NAV_ITEM_ICON_COLOR;-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsxindex 95b257b5551..831ad46e56c 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIcon.tsx@@ -1,18 +1,23 @@import { NavigationMenuItemType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { Avatar, IconLink, IconWorld, useIcons } from 'twenty-ui/display';+import {+ Avatar,+ IconLink,+ IconWorld,+ StyledTintedIconTileContainer,+ getIconTileColorShades,+ useIcons,+} from 'twenty-ui/display';import { themeCssVariables } from 'twenty-ui/theme-constants';import { type NavigationMenuItem } from '~/generated-metadata/graphql';-import { LinkIconWithLinkOverlay } from '@/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay';-import { StyledNavigationMenuItemIconContainer } from '@/navigation-menu-item/display/components/NavigationMenuItemIconContainer';-import { ObjectIconWithViewOverlay } from '@/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay';import { getNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemColor';+import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/common/utils/recordIdentifierToObjectRecordIdentifier';+import { LinkIconWithLinkOverlay } from '@/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay';+import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular';import { getNavigationMenuItemComputedLink } from '@/navigation-menu-item/display/utils/getNavigationMenuItemComputedLink';-import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor';import { getNavigationMenuItemLabel } from '@/navigation-menu-item/display/utils/getNavigationMenuItemLabel';-import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular';-import { recordIdentifierToObjectRecordIdentifier } from '@/navigation-menu-item/common/utils/recordIdentifierToObjectRecordIdentifier';+import { ObjectIconWithViewOverlay } from '@/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay';import { useGetStandardObjectIcon } from '@/object-metadata/hooks/useGetStandardObjectIcon';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';@@ -98,7 +103,7 @@ export const NavigationMenuItemIcon = ({);const useStyledIcon = !isRecord;const iconStyle = useStyledIcon- ? getNavigationMenuItemIconStyleFromColor(effectiveColor)+ ? getIconTileColorShades(effectiveColor): null;const iconColorToUse = iconStyle@@ -140,11 +145,11 @@ export const NavigationMenuItemIcon = ({}return (- <StyledNavigationMenuItemIconContainer+ <StyledTintedIconTileContainer$backgroundColor={iconStyle.backgroundColor}$borderColor={iconStyle.borderColor}>{avatar}- </StyledNavigationMenuItemIconContainer>+ </StyledTintedIconTileContainer>);};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemStyleIcon.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemStyleIcon.tsxdeleted file mode 100644index 7a8d57047a4..00000000000--- a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemStyleIcon.tsx+++ /dev/null@@ -1,30 +0,0 @@-import type { IconComponent } from 'twenty-ui/display';-import { StyledNavigationMenuItemIconContainer } from '@/navigation-menu-item/display/components/NavigationMenuItemIconContainer';-import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor';-import { useContext } from 'react';-import { ThemeContext } from 'twenty-ui/theme-constants';--export type NavigationMenuItemStyleIconProps = {- Icon: IconComponent;- color?: string | null;-};--export const NavigationMenuItemStyleIcon = ({- Icon,- color,-}: NavigationMenuItemStyleIconProps) => {- const { theme } = useContext(ThemeContext);- const style = getNavigationMenuItemIconStyleFromColor(color);- return (- <StyledNavigationMenuItemIconContainer- $backgroundColor={style.backgroundColor}- $borderColor={style.borderColor}- >- <Icon- size={theme.icon.size.md}- stroke={theme.icon.stroke.md}- color={style.iconColor}- />- </StyledNavigationMenuItemIconContainer>- );-};diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsxindex 0804248746b..452df60f1ae 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/dnd/components/AddToNavigationDragHandle.tsx@@ -1,11 +1,14 @@import { styled } from '@linaria/react';import { useContext, type ReactNode } from 'react';+import { NavigationMenuItemType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';-import { IconGripVertical, type IconComponent } from 'twenty-ui/display';+import {+ IconGripVertical,+ TintedIconTile,+ type IconComponent,+} from 'twenty-ui/display';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';-import { NavigationMenuItemType } from 'twenty-shared/types';import type { AddToNavigationDragPayload } from '@/navigation-menu-item/common/types/add-to-navigation-drag-payload';import { getNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemColor';@@ -110,7 +113,7 @@ export const AddToNavigationDragHandle = ({) : showCustomContentWithoutWrapper ? (customIconContent) : hasBackgroundColor && icon ? (- <NavigationMenuItemStyleIcon Icon={icon} color={effectiveColor} />+ <TintedIconTile Icon={icon} color={effectiveColor} />) : (<AddToNavigationDragHandleIconicon={icon}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay.tsxindex 33d0a83228b..8b9dc017266 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/link/components/LinkIconWithLinkOverlay.tsx@@ -1,12 +1,11 @@import { styled } from '@linaria/react';import { useContext, useState } from 'react';import { isDefined } from 'twenty-shared/utils';-import type { IconComponent } from 'twenty-ui/display';+import { type IconComponent, getIconTileColorShades } from 'twenty-ui/display';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorLink';import { getLinkFaviconUrl } from '@/navigation-menu-item/display/link/utils/getLinkFaviconUrl';-import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor';const failedFaviconUrls = new Set<string>();@@ -83,7 +82,7 @@ export const LinkIconWithLinkOverlay = ({const showFavicon =isDefined(faviconUrl) && !isKnownFailed && localFailedLink !== linkKey;- const linkStyle = getNavigationMenuItemIconStyleFromColor(+ const linkStyle = getIconTileColorShades(navItemColor ?? DEFAULT_NAVIGATION_MENU_ITEM_COLOR_LINK,);diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsx b/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsxindex 544862fc3e2..e12a37e2978 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/view/components/ObjectIconWithViewOverlay.tsx@@ -1,10 +1,8 @@import { styled } from '@linaria/react';import { useContext } from 'react';-import type { IconComponent } from 'twenty-ui/display';+import { type IconComponent, getIconTileColorShades } from 'twenty-ui/display';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';-import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor';-const StyledCompositeContainer = styled.div`align-items: center;border-radius: 4px;@@ -58,7 +56,7 @@ export const ObjectIconWithViewOverlay = ({objectColor,}: ObjectIconWithViewOverlayProps) => {const { theme } = useContext(ThemeContext);- const objectStyle = getNavigationMenuItemIconStyleFromColor(objectColor);+ const objectStyle = getIconTileColorShades(objectColor);return (<StyledCompositeContainer>diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsxindex 4499538d6d3..c6f59971596 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditFolderPickerSubPage.tsx@@ -1,15 +1,14 @@import { useLingui } from '@lingui/react/macro';import { useState } from 'react';-import { useIcons } from 'twenty-ui/display';+import { TintedIconTile, useIcons } from 'twenty-ui/display';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';import { DEFAULT_NAVIGATION_MENU_ITEM_COLOR_FOLDER } from '@/navigation-menu-item/common/constants/NavigationMenuItemDefaultColorFolder';+import { useFolderPickerSelectionData } from '@/navigation-menu-item/edit/side-panel/hooks/useFolderPickerSelectionData';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';-import { useFolderPickerSelectionData } from '@/navigation-menu-item/edit/side-panel/hooks/useFolderPickerSelectionData';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';@@ -71,10 +70,7 @@ export const SidePanelEditFolderPickerSubPage = () => {><CommandMenuItemLeftComponent={- <NavigationMenuItemStyleIcon- Icon={FolderIcon}- color={folderColor}- />+ <TintedIconTile Icon={FolderIcon} color={folderColor} />}label={folder.name}id={folder.id}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditObjectViewBase.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditObjectViewBase.tsxindex a04a24b0871..db0632a3518 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditObjectViewBase.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelEditObjectViewBase.tsx@@ -1,6 +1,5 @@import { navigationMenuItemsSelector } from '@/navigation-menu-item/common/states/navigationMenuItemsSelector';import { getNavigationMenuItemColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemColor';-import { parseThemeColor } from '@/navigation-menu-item/common/utils/parseThemeColor';import { getNavigationMenuItemObjectNameSingular } from '@/navigation-menu-item/display/object/utils/getNavigationMenuItemObjectNameSingular';import { SidePanelEditColorOption } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption';import {@@ -16,6 +15,7 @@ import { viewsSelector } from '@/views/states/selectors/viewsSelector';import { useLingui } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';import { isDefined } from 'twenty-shared/utils';+import { parseThemeColor } from 'twenty-ui/utilities';import { type NavigationMenuItem } from '~/generated-metadata/graphql';type SidePanelEditObjectViewBaseProps = OrganizeActionsProps & {diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsxindex b201525ba38..6c93cec625d 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNavigationMenuItemEditPage.tsx@@ -6,7 +6,6 @@ import { useSelectedNavigationMenuItemEditItem } from '@/navigation-menu-item/edimport { NavigationMenuItemType } from 'twenty-shared/types';import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';-import { parseThemeColor } from '@/navigation-menu-item/common/utils/parseThemeColor';import { useSelectedNavigationMenuItemEditItemLabel } from '@/navigation-menu-item/edit/hooks/useSelectedNavigationMenuItemEditItemLabel';import { useUpdateLinkInDraft } from '@/navigation-menu-item/edit/link/hooks/useUpdateLinkInDraft';import { SidePanelEditColorOption } from '@/navigation-menu-item/edit/side-panel/components/SidePanelEditColorOption';@@ -28,6 +27,7 @@ import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';import { IconPlus } from 'twenty-ui/display';import { themeCssVariables } from 'twenty-ui/theme-constants';+import { parseThemeColor } from 'twenty-ui/utilities';const ADD_ITEM_TO_FOLDER_ACTION_ID = 'add-item-to-folder';diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsxindex 3466f20cd11..546d70c69d1 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemMainMenu.tsx@@ -1,4 +1,5 @@import { useLingui } from '@lingui/react/macro';+import { NavigationMenuItemType } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';import {Avatar,@@ -6,19 +7,18 @@ import {IconFolder,IconLink,IconTable,+ TintedIconTile,} from 'twenty-ui/display';import { themeCssVariables } from 'twenty-ui/theme-constants';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';-import { NavigationMenuItemType } from 'twenty-shared/types';import { pendingInsertionNavigationMenuItemState } from '@/navigation-menu-item/common/states/pendingInsertionNavigationMenuItemState';+import { useAddFolderToNavigationMenu } from '@/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu';+import { useAddLinkToNavigationMenu } from '@/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu';import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePanelAddToNavigationDroppable';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelItemWithAddToNavigationDrag } from '@/side-panel/components/SidePanelItemWithAddToNavigationDrag';import { SidePanelList } from '@/side-panel/components/SidePanelList';-import { useAddFolderToNavigationMenu } from '@/navigation-menu-item/edit/side-panel/hooks/useAddFolderToNavigationMenu';-import { useAddLinkToNavigationMenu } from '@/navigation-menu-item/edit/side-panel/hooks/useAddLinkToNavigationMenu';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';@@ -70,7 +70,7 @@ export const SidePanelNewSidebarItemMainMenu = ({><CommandMenuItemIcon={() => (- <NavigationMenuItemStyleIcon+ <TintedIconTileIcon={IconBuildingSkyscraper}color="blue"/>@@ -86,12 +86,7 @@ export const SidePanelNewSidebarItemMainMenu = ({onEnter={onSelectView}><CommandMenuItem- Icon={() => (- <NavigationMenuItemStyleIcon- Icon={IconTable}- color="gray"- />- )}+ Icon={() => <TintedIconTile Icon={IconTable} />}label={t`View`}id={NavigationMenuItemType.VIEW}hasSubMenu={true}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsxindex 8326e2f0282..33ff84f1f44 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewObjectPickerSubView.tsx@@ -1,9 +1,8 @@import { useLingui } from '@lingui/react/macro';-import { IconSettings, useIcons } from 'twenty-ui/display';+import { IconSettings, TintedIconTile } from 'twenty-ui/display';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';@@ -29,7 +28,6 @@ export const SidePanelNewSidebarItemViewObjectPickerSubView = ({showSystemObjectsOption = true,}: SidePanelNewSidebarItemViewObjectPickerSubViewProps) => {const { t } = useLingui();- const { getIcon } = useIcons();const { filteredItems, selectableItemIds, isEmpty, hasSearchQuery } =useSidePanelFilteredPickerItems({items: objects,@@ -61,10 +59,7 @@ export const SidePanelNewSidebarItemViewObjectPickerSubView = ({><CommandMenuItemIcon={() => (- <NavigationMenuItemStyleIcon- Icon={getIcon(objectMetadataItem.icon)}- color={getObjectColorWithFallback(objectMetadataItem)}- />+ <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />)}label={objectMetadataItem.labelPlural}id={objectMetadataItem.id}@@ -76,7 +71,7 @@ export const SidePanelNewSidebarItemViewObjectPickerSubView = ({{showSystemObjectsOption && (<SelectableListItem itemId="system" onEnter={onOpenSystemPicker}><CommandMenuItem- Icon={() => <NavigationMenuItemStyleIcon Icon={IconSettings} />}+ Icon={() => <TintedIconTile Icon={IconSettings} />}label={t`System objects`}id="system"hasSubMenu={true}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemSubView.tsxindex 1a5c301b684..db2bce8a275 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemSubView.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelNewSidebarItemViewSystemSubView.tsx@@ -1,9 +1,7 @@import { useLingui } from '@lingui/react/macro';-import { useIcons } from 'twenty-ui/display';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';@@ -25,7 +23,6 @@ export const SidePanelNewSidebarItemViewSystemSubView = ({onSelectObject,}: SidePanelNewSidebarItemViewSystemSubViewProps) => {const { t } = useLingui();- const { getIcon } = useIcons();const {filteredItems: filteredSystemObjectMetadataItems,selectableItemIds,@@ -60,10 +57,7 @@ export const SidePanelNewSidebarItemViewSystemSubView = ({><CommandMenuItemIcon={() => (- <NavigationMenuItemStyleIcon- Icon={getIcon(objectMetadataItem.icon)}- color={getObjectColorWithFallback(objectMetadataItem)}- />+ <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />)}label={objectMetadataItem.labelPlural}id={objectMetadataItem.id}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem.tsxindex 9ef0898d991..db71ddb5031 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem.tsx@@ -1,9 +1,7 @@import { useLingui } from '@lingui/react/macro';import { isDefined } from 'twenty-shared/utils';-import { useIcons } from 'twenty-ui/display';-import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { NavigationMenuItemType } from 'twenty-shared/types';import { useDraftNavigationMenuItems } from '@/navigation-menu-item/edit/hooks/useDraftNavigationMenuItems';import { useNavigationMenuObjectMetadataFromDraft } from '@/navigation-menu-item/edit/hooks/useNavigationMenuObjectMetadataFromDraft';@@ -30,7 +28,6 @@ export const SidePanelObjectMenuItem = ({disableDrag = false,}: SidePanelObjectMenuItemProps) => {const { t } = useLingui();- const { getIcon } = useIcons();const { currentDraft } = useDraftNavigationMenuItems();const { objectMetadataIdsInWorkspace } =useNavigationMenuObjectMetadataFromDraft(currentDraft);@@ -41,7 +38,6 @@ export const SidePanelObjectMenuItem = ({indexViewIdFromObjectMetadataItemFamilySelector,{ objectMetadataItemId: objectMetadataItem.id },);- const Icon = getIcon(objectMetadataItem.icon);const iconColor = getObjectColorWithFallback(objectMetadataItem);const isDisabled = isAlreadyInNavbar || !isDefined(defaultViewId);@@ -53,7 +49,7 @@ export const SidePanelObjectMenuItem = ({};const styledIcon = () => (- <NavigationMenuItemStyleIcon Icon={Icon} color={iconColor} />+ <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />);return (diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem.tsxindex 5a6684b99ad..09b7a783804 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem.tsx@@ -1,9 +1,7 @@import { isDefined } from 'twenty-shared/utils';-import { useIcons } from 'twenty-ui/display';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { SidePanelObjectMenuItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectMenuItem';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';@@ -29,8 +27,6 @@ export const SidePanelObjectPickerItem = ({dragIndex,disableDrag = false,}: SidePanelObjectPickerItemProps) => {- const { getIcon } = useIcons();-if (isViewItem && isDefined(onSelectObjectForViewEdit)) {return (<SelectableListItem@@ -39,10 +35,7 @@ export const SidePanelObjectPickerItem = ({><CommandMenuItemIcon={() => (- <NavigationMenuItemStyleIcon- Icon={getIcon(objectMetadataItem.icon)}- color={getObjectColorWithFallback(objectMetadataItem)}- />+ <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />)}label={objectMetadataItem.labelPlural}id={objectMetadataItem.id}diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsx b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsxindex 7a2d8bec7d0..045a2bcb250 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsx+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerSubView.tsx@@ -1,15 +1,14 @@import { useLingui } from '@lingui/react/macro';-import { IconSettings } from 'twenty-ui/display';+import { IconSettings, TintedIconTile } from 'twenty-ui/display';import { CommandMenuItem } from '@/command-menu/components/CommandMenuItem';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';+import { SidePanelObjectPickerItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { SidePanelAddToNavigationDroppable } from '@/side-panel/components/SidePanelAddToNavigationDroppable';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { SidePanelList } from '@/side-panel/components/SidePanelList';import { SidePanelSubViewWithSearch } from '@/side-panel/components/SidePanelSubViewWithSearch';import { useSidePanelFilteredPickerItems } from '@/side-panel/hooks/useSidePanelFilteredPickerItems';-import { SidePanelObjectPickerItem } from '@/navigation-menu-item/edit/side-panel/components/SidePanelObjectPickerItem';import { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';type SidePanelObjectPickerSubViewProps = {@@ -70,7 +69,7 @@ export const SidePanelObjectPickerSubView = ({))}<SelectableListItem itemId="system" onEnter={onOpenSystemPicker}><CommandMenuItem- Icon={() => <NavigationMenuItemStyleIcon Icon={IconSettings} />}+ Icon={() => <TintedIconTile Icon={IconSettings} />}label={t`System objects`}id="system"hasSubMenudiff --git a/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataIcon.tsx b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataIcon.tsxnew file mode 100644index 00000000000..47b35c962ab--- /dev/null+++ b/packages/twenty-front/src/modules/object-metadata/components/ObjectMetadataIcon.tsx@@ -0,0 +1,32 @@+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';+import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';+import { TintedIconTile, useIcons } from 'twenty-ui/display';++export type ObjectMetadataIconInput = Pick<+ EnrichedObjectMetadataItem,+ 'icon' | 'nameSingular' | 'color' | 'isSystem'+>;++export type ObjectMetadataIconProps = {+ objectMetadataItem?: ObjectMetadataIconInput | null;+ size?: number;+ stroke?: number;+};++export const ObjectMetadataIcon = ({+ objectMetadataItem,+ size,+ stroke,+}: ObjectMetadataIconProps) => {+ const { getIcon } = useIcons();+ const Icon = getIcon(objectMetadataItem?.icon);++ return (+ <TintedIconTile+ Icon={Icon}+ color={getObjectColorWithFallback(objectMetadataItem)}+ size={size}+ stroke={stroke}+ />+ );+};diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataSelectHelpers.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataSelectHelpers.tsnew file mode 100644index 00000000000..084ca3e2e9a--- /dev/null+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataSelectHelpers.ts@@ -0,0 +1,23 @@+import { type IconComponent, useIcons } from 'twenty-ui/display';+import { type ThemeColor } from 'twenty-ui/theme';++import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';+import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';++type ObjectMetadataItemForSelectIcon = Pick<+ EnrichedObjectMetadataItem,+ 'icon' | 'nameSingular' | 'color' | 'isSystem'+>;++export const useObjectMetadataSelectHelpers = () => {+ const { getIcon } = useIcons();++ const getSelectIconPropsFromObjectMetadataItem = (+ objectMetadataItem: ObjectMetadataItemForSelectIcon,+ ): { Icon: IconComponent; iconThemeColor: ThemeColor } => ({+ Icon: getIcon(objectMetadataItem.icon),+ iconThemeColor: getObjectColorWithFallback(objectMetadataItem),+ });++ return { getSelectIconPropsFromObjectMetadataItem };+};diff --git a/packages/twenty-front/src/modules/object-metadata/utils/getObjectColorWithFallback.ts b/packages/twenty-front/src/modules/object-metadata/utils/getObjectColorWithFallback.tsindex 35e60e4290e..464ffe97b6a 100644--- a/packages/twenty-front/src/modules/object-metadata/utils/getObjectColorWithFallback.ts+++ b/packages/twenty-front/src/modules/object-metadata/utils/getObjectColorWithFallback.ts@@ -2,6 +2,7 @@ import { isNonEmptyString } from '@sniptt/guards';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { CoreObjectNameSingular } from 'twenty-shared/types';+import { isDefined } from 'twenty-shared/utils';import { type ThemeColor, MAIN_COLOR_NAMES } from 'twenty-ui/theme';const SYSTEM_OBJECT_COLOR: ThemeColor = 'gray';@@ -37,11 +38,15 @@ const getColorForCustomObject = (seed: string): ThemeColor => {};export const getObjectColorWithFallback = (- objectMetadataItem: Pick<- EnrichedObjectMetadataItem,- 'nameSingular' | 'color' | 'isSystem'- >,+ objectMetadataItem:+ | Pick<EnrichedObjectMetadataItem, 'nameSingular' | 'color' | 'isSystem'>+ | null+ | undefined,): ThemeColor => {+ if (!isDefined(objectMetadataItem)) {+ return SYSTEM_OBJECT_COLOR;+ }+if (objectMetadataItem.isSystem) {return SYSTEM_OBJECT_COLOR;}diff --git a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeaderIcon.tsx b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeaderIcon.tsxindex 86c69e48055..13c09117e43 100644--- a/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeaderIcon.tsx+++ b/packages/twenty-front/src/modules/object-record/record-index/components/RecordIndexPageHeaderIcon.tsx@@ -1,22 +1,15 @@-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { isDefined } from 'twenty-shared/utils';-import { useIcons } from 'twenty-ui/display';export const RecordIndexPageHeaderIcon = ({objectMetadataItem,}: {objectMetadataItem?: EnrichedObjectMetadataItem;}) => {- const { getIcon } = useIcons();- const ObjectIcon = getIcon(objectMetadataItem?.icon);-- if (!isDefined(ObjectIcon) || !isDefined(objectMetadataItem)) {+ if (!isDefined(objectMetadataItem)) {return null;}- const iconColor = getObjectColorWithFallback(objectMetadataItem);-- return <NavigationMenuItemStyleIcon Icon={ObjectIcon} color={iconColor} />;+ return <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />;};diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/ObjectRecordShowPageBreadcrumb.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/ObjectRecordShowPageBreadcrumb.tsxindex bce68d646d0..0350dc09369 100644--- a/packages/twenty-front/src/modules/object-record/record-show/components/ObjectRecordShowPageBreadcrumb.tsx+++ b/packages/twenty-front/src/modules/object-record/record-show/components/ObjectRecordShowPageBreadcrumb.tsx@@ -1,18 +1,15 @@-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';import { useIsRecordFieldReadOnly } from '@/object-record/read-only/hooks/useIsRecordFieldReadOnly';import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';import { useRecordShowContainerActions } from '@/object-record/record-show/hooks/useRecordShowContainerActions';-import { useRecordShowPage } from '@/object-record/record-show/hooks/useRecordShowPage';import { useRecordShowPagePagination } from '@/object-record/record-show/hooks/useRecordShowPagePagination';import { RecordTitleCell } from '@/object-record/record-title-cell/components/RecordTitleCell';import { RecordTitleCellContainerType } from '@/object-record/record-title-cell/types/RecordTitleCellContainerType';import { styled } from '@linaria/react';import { FieldMetadataType } from 'twenty-shared/types';-import { isDefined } from 'twenty-shared/utils';import { themeCssVariables } from 'twenty-ui/theme-constants';const StyledEditableTitleContainer = styled.div`@@ -32,6 +29,12 @@ const StyledEditableTitlePrefix = styled.div`gap: ${themeCssVariables.spacing[1]};`;+const StyledBreadcrumbPrefixObjectIcon = styled.div`+ display: flex;+ flex-shrink: 0;+ opacity: 0.64;+`;+const StyledTitle = styled.div`max-width: 100%;overflow: hidden;@@ -78,13 +81,6 @@ export const ObjectRecordShowPageBreadcrumb = ({const { navigateToIndexView, rankInView, totalCount } =useRecordShowPagePagination(objectNameSingular, objectRecordId);- const { headerIcon: HeaderIcon } = useRecordShowPage(- objectNameSingular,- objectRecordId,- );-- const iconColor = getObjectColorWithFallback(objectMetadataItem);-if (loading) {return null;}@@ -96,9 +92,9 @@ export const ObjectRecordShowPageBreadcrumb = ({navigateToIndexView();}}>- {isDefined(HeaderIcon) && (- <NavigationMenuItemStyleIcon Icon={HeaderIcon} color={iconColor} />- )}+ <StyledBreadcrumbPrefixObjectIcon>+ <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />+ </StyledBreadcrumbPrefixObjectIcon>{objectLabel}<span>{' / '}</span></StyledEditableTitlePrefix>diff --git a/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPage.ts b/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPage.tsindex fb3a92ebd51..3fbd1fe38cb 100644--- a/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPage.ts+++ b/packages/twenty-front/src/modules/object-record/record-show/hooks/useRecordShowPage.ts@@ -2,7 +2,6 @@ import { useParams } from 'react-router-dom';import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';import { isDefined } from 'twenty-shared/utils';-import { useIcons } from 'twenty-ui/display';export const useRecordShowPage = (propsObjectNameSingular: string,@@ -21,13 +20,10 @@ export const useRecordShowPage = (}const { objectMetadataItem } = useObjectMetadataItem({ objectNameSingular });- const { getIcon } = useIcons();- const headerIcon = getIcon(objectMetadataItem?.icon);return {objectNameSingular,objectRecordId,- headerIcon,objectMetadataItem,};};diff --git a/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx b/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsxindex d0708041e55..95dbafd974a 100644--- a/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx+++ b/packages/twenty-front/src/modules/settings/components/SettingsMorphRelationMultiSelect.tsx@@ -8,6 +8,7 @@ import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/Dropdowimport { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { isObjectMetadataAvailableForRelation } from '@/object-metadata/utils/isObjectMetadataAvailableForRelation';import { MultiSelectControl } from '@/ui/input/components/MultiSelectControl';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';@@ -21,7 +22,7 @@ import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/statesimport { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';import { isNonEmptyString } from '@sniptt/guards';import { isDefined } from 'twenty-shared/utils';-import { IconBox, useIcons, type IconComponent } from 'twenty-ui/display';+import { IconBox, type IconComponent } from 'twenty-ui/display';import { MenuItem, MenuItemMultiSelect } from 'twenty-ui/navigation';import { themeCssVariables } from 'twenty-ui/theme-constants';@@ -101,12 +102,13 @@ export const SettingsMorphRelationMultiSelect = ({const [searchInputValue, setSearchInputValue] = useState('');+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const { activeObjectMetadataItems } = useFilteredObjectMetadataItems();const [localSelectedObjectMetadataIds, setLocalSelectedObjectMetadataIds] =useState<string[]>(selectedObjectMetadataIds);- const { getIcon } = useIcons();const options = activeObjectMetadataItems.filter(isObjectMetadataAvailableForRelation).sort((item1, item2) =>@@ -114,8 +116,8 @@ export const SettingsMorphRelationMultiSelect = ({).map((objectMetadataItem) => ({label: objectMetadataItem.labelSingular,- Icon: getIcon(objectMetadataItem.icon),objectMetadataId: objectMetadataItem.id,+ ...getSelectIconPropsFromObjectMetadataItem(objectMetadataItem),}));const selectedOptions = options.filter((option) =>@@ -256,6 +258,7 @@ export const SettingsMorphRelationMultiSelect = ({<MenuItemMultiSelectclassName=""LeftIcon={option.Icon ?? undefined}+ iconThemeColor={option.iconThemeColor}text={option.label}selected={selectedObjectMetadataIds.some((selectedObjectMetadataId) =>diff --git a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewField.tsx b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewField.tsxindex 46ecf92c826..1e8824d82c8 100644--- a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewField.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewField.tsx@@ -1,11 +1,11 @@-import { isDefined } from 'twenty-shared/utils';-import { styled } from '@linaria/react';-import { Handle, Position } from '@xyflow/react';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { objectMetadataItemsSelector } from '@/object-metadata/states/objectMetadataItemsSelector';-import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';-import { useIcons } from 'twenty-ui/display';+import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';+import { styled } from '@linaria/react';+import { Handle, Position } from '@xyflow/react';import { useContext } from 'react';+import { isDefined } from 'twenty-shared/utils';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';import { RelationType } from '~/generated-metadata/graphql';@@ -29,7 +29,6 @@ const StyledFieldName = styled.div`export const ObjectFieldRow = ({ field }: ObjectFieldRowProps) => {const { theme } = useContext(ThemeContext);const objectMetadataItems = useAtomStateValue(objectMetadataItemsSelector);- const { getIcon } = useIcons();const relatedObjectId = field.relation?.targetObjectMetadata.id;@@ -37,11 +36,14 @@ export const ObjectFieldRow = ({ field }: ObjectFieldRowProps) => {(x) => x.id === relatedObjectId,);- const Icon = getIcon(relatedObject?.icon);-return (<StyledRow>- {isDefined(Icon) && <Icon size={theme.icon.size.md} />}+ {isDefined(relatedObject) && (+ <ObjectMetadataIcon+ objectMetadataItem={relatedObject}+ size={theme.icon.size.md}+ />+ )}<StyledFieldName>{relatedObject?.labelPlural ?? ''}</StyledFieldName><Handletype={diff --git a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsx b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsxindex 380594d8513..81fd03a4d40 100644--- a/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/graph-overview/components/SettingsDataModelOverviewObject.tsx@@ -1,20 +1,21 @@-import { useContext, useState } from 'react';import { styled } from '@linaria/react';import { type Node, type NodeProps } from '@xyflow/react';+import { useContext, useState } from 'react';import { Link } from 'react-router-dom';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemField';import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';import { ObjectFieldRow } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverviewField';import { FieldMetadataType } from '~/generated-metadata/graphql';+import { SettingsItemTypeTag } from '@/settings/components/SettingsItemTypeTag';import { ObjectFieldRowWithoutRelation } from '@/settings/data-model/graph-overview/components/SettingsDataModelOverviewFieldWithoutRelation';import '@xyflow/react/dist/style.css';import { SettingsPath } from 'twenty-shared/types';-import { isDefined, getSettingsPath } from 'twenty-shared/utils';-import { IconChevronDown, IconChevronUp, useIcons } from 'twenty-ui/display';-import { SettingsItemTypeTag } from '@/settings/components/SettingsItemTypeTag';+import { getSettingsPath } from 'twenty-shared/utils';+import { IconChevronDown, IconChevronUp } from 'twenty-ui/display';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';type SettingsDataModelOverviewObjectNode = Node<@@ -107,7 +108,6 @@ export const SettingsDataModelOverviewObject = ({data: objectMetadataItem,}: SettingsDataModelOverviewObjectProps) => {const { theme } = useContext(ThemeContext);- const { getIcon } = useIcons();const [otherFieldsExpanded, setOtherFieldsExpanded] = useState(false);const { totalCount } = useFindManyRecords({@@ -122,8 +122,6 @@ export const SettingsDataModelOverviewObject = ({(x) => x.type !== FieldMetadataType.RELATION,).length;- const Icon = getIcon(objectMetadataItem.icon);-return (<StyledNode><StyledHeader>@@ -134,7 +132,10 @@ export const SettingsDataModelOverviewObject = ({objectNamePlural: objectMetadataItem.namePlural,})}>- {isDefined(Icon) && <Icon size={theme.icon.size.md} />}+ <ObjectMetadataIcon+ objectMetadataItem={objectMetadataItem}+ size={theme.icon.size.md}+ />{objectMetadataItem.labelPlural}</Link></StyledObjectLinkContainer>diff --git a/packages/twenty-front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectItemTableRow.tsxindex b3fcc26b2e5..c56d0fc3adc 100644--- a/packages/twenty-front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectItemTableRow.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/new-object/components/SettingsAvailableStandardObjectItemTableRow.tsx@@ -1,11 +1,10 @@-import { isDefined } from 'twenty-shared/utils';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { TableCell } from '@/ui/layout/table/components/TableCell';import { TableRow } from '@/ui/layout/table/components/TableRow';-import { Checkbox } from 'twenty-ui/input';-import { useIcons } from 'twenty-ui/display';import { styled } from '@linaria/react';import { useContext } from 'react';+import { Checkbox } from 'twenty-ui/input';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';export const AVAILABLE_STANDARD_OBJECTS_GRID_TEMPLATE_COLUMNS =@@ -29,8 +28,6 @@ export const SettingsAvailableStandardObjectItemTableRow = ({onClick,}: SettingsAvailableStandardObjectItemTableRowProps) => {const { theme } = useContext(ThemeContext);- const { getIcon } = useIcons();- const Icon = getIcon(objectItem.icon);return (<TableRow@@ -49,7 +46,10 @@ export const SettingsAvailableStandardObjectItemTableRow = ({color={themeCssVariables.font.color.primary}gap={themeCssVariables.spacing[2]}>- {isDefined(Icon) && <Icon size={theme.icon.size.md} />}+ <ObjectMetadataIcon+ objectMetadataItem={objectItem}+ size={theme.icon.size.md}+ />{objectItem.labelPlural}</TableCell><TableCell>diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsxindex fbcbdeeb4c1..a7d0e479b4d 100644--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectItemTableRow.tsx@@ -1,12 +1,11 @@-import { isDefined } from 'twenty-shared/utils';-import { type ReactNode, useContext } from 'react';import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';+import { type ReactNode, useContext } from 'react';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { isHiddenSystemField } from '@/object-metadata/utils/isHiddenSystemField';import { SettingsItemTypeTag } from '@/settings/components/SettingsItemTypeTag';-import { TableRow } from '@/ui/layout/table/components/TableRow';import {SETTINGS_OBJECT_TABLE_ROW_GRID_TEMPLATE_COLUMNS,StyledActionTableCell,@@ -14,7 +13,7 @@ import {StyledStickyFirstCell,} from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';import { TableCell } from '@/ui/layout/table/components/TableCell';-import { useIcons } from 'twenty-ui/display';+import { TableRow } from '@/ui/layout/table/components/TableRow';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';export type SettingsObjectMetadataItemTableRowProps = {@@ -59,11 +58,8 @@ export const SettingsObjectMetadataItemTableRow = ({link,totalObjectCount,}: SettingsObjectMetadataItemTableRowProps) => {- const { theme } = useContext(ThemeContext);const { t } = useLingui();-- const { getIcon } = useIcons();- const Icon = getIcon(objectMetadataItem.icon);+ const { theme } = useContext(ThemeContext);return (<TableRow@@ -73,15 +69,11 @@ export const SettingsObjectMetadataItemTableRow = ({><StyledStickyFirstCell><StyledNameTableCell>- {isDefined(Icon) && (- <Icon- style={{- minWidth: theme.icon.size.md,- }}- size={theme.icon.size.md}- stroke={theme.icon.stroke.sm}- />- )}+ <ObjectMetadataIcon+ objectMetadataItem={objectMetadataItem}+ size={theme.icon.size.md}+ stroke={theme.icon.stroke.sm}+ /><StyledNameContainer><StyledNameLabel title={objectMetadataItem.labelPlural}>{objectMetadataItem.labelPlural}diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsxindex a794bcd54c3..212298358bc 100644--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsUpdateDataModelObjectAboutForm.tsx@@ -1,5 +1,4 @@import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';-import { parseThemeColor } from '@/navigation-menu-item/common/utils/parseThemeColor';import { useUpdateOneObjectMetadataItem } from '@/object-metadata/hooks/useUpdateOneObjectMetadataItem';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { isObjectMetadataReadOnly } from '@/object-record/read-only/utils/isObjectMetadataReadOnly';@@ -16,6 +15,7 @@ import { zodResolver } from '@hookform/resolvers/zod';import { FormProvider, useForm } from 'react-hook-form';import { SettingsPath } from 'twenty-shared/types';import { isDefined } from 'twenty-shared/utils';+import { parseThemeColor } from 'twenty-ui/utilities';import { useNavigateSettings } from '~/hooks/useNavigateSettings';import { updatedObjectNamePluralState } from '~/pages/settings/data-model/states/updatedObjectNamePluralState';diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsDataModelObjectSummary.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsDataModelObjectSummary.tsxindex 179c1d7f697..2ba54b143fb 100644--- a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsDataModelObjectSummary.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsDataModelObjectSummary.tsx@@ -1,21 +1,25 @@-import { t } from '@lingui/core/macro';import { styled } from '@linaria/react';+import { t } from '@lingui/core/macro';import { useContext } from 'react';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';-import {- IconBox,- OverflowingTextWithTooltip,- useIcons,-} from 'twenty-ui/display';import { SettingsItemTypeTag } from '@/settings/components/SettingsItemTypeTag';+import { IconBox, OverflowingTextWithTooltip } from 'twenty-ui/display';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';export type SettingsDataModelObjectPreviewProps = {className?: string;objectMetadataItems: Pick<EnrichedObjectMetadataItem,- 'icon' | 'labelSingular' | 'labelPlural' | 'isCustom' | 'isRemote'+ | 'icon'+ | 'labelSingular'+ | 'labelPlural'+ | 'isCustom'+ | 'isRemote'+ | 'nameSingular'+ | 'color'+ | 'isSystem'>[];pluralizeLabel?: boolean;};@@ -56,7 +60,14 @@ const StyledSeparator = styled.div`type SettingsDataModelObjectPreviewItemProps = {objectMetadataItem: Pick<EnrichedObjectMetadataItem,- 'icon' | 'labelSingular' | 'labelPlural' | 'isCustom' | 'isRemote'+ | 'icon'+ | 'labelSingular'+ | 'labelPlural'+ | 'isCustom'+ | 'isRemote'+ | 'nameSingular'+ | 'color'+ | 'isSystem'>;pluralizeLabel: boolean;index: number;@@ -68,8 +79,6 @@ const SettingsDataModelObjectPreviewItem = ({index,}: SettingsDataModelObjectPreviewItemProps) => {const { theme } = useContext(ThemeContext);- const { getIcon } = useIcons();- const ObjectIcon = getIcon(objectMetadataItem.icon);return (<>@@ -77,7 +86,8 @@ const SettingsDataModelObjectPreviewItem = ({<StyledObjectPreview key={`${objectMetadataItem.labelSingular}-${index}`}><StyledObjectName><StyledIconContainer>- <ObjectIcon+ <ObjectMetadataIcon+ objectMetadataItem={objectMetadataItem}size={theme.icon.size.sm}stroke={theme.icon.stroke.md}/>diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsxindex 72643819f22..9cef1098317 100644--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm.tsx@@ -1,4 +1,3 @@-import { parseThemeColor } from '@/navigation-menu-item/common/utils/parseThemeColor';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { AdvancedSettingsWrapper } from '@/settings/components/AdvancedSettingsWrapper';import { SettingsOptionCardContentToggle } from '@/settings/components/SettingsOptions/SettingsOptionCardContentToggle';@@ -24,6 +23,7 @@ import {import { Button } from 'twenty-ui/input';import { Card } from 'twenty-ui/layout';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';+import { parseThemeColor } from 'twenty-ui/utilities';import { type StringKeyOf } from 'type-fest';import { useNavigateSettings } from '~/hooks/useNavigateSettings';import { computeMetadataNamesFromLabels } from '~/pages/settings/data-model/utils/computeMetadataNamesFromLabels';diff --git a/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx b/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsxindex 8b09142d3e9..086e6b97277 100644--- a/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx+++ b/packages/twenty-front/src/modules/settings/developers/components/WebhookEntitySelect.tsx@@ -1,4 +1,5 @@import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';@@ -11,9 +12,9 @@ import { SelectableList } from '@/ui/layout/selectable-list/components/Selectablimport { SelectableListItem } from '@/ui/layout/selectable-list/components/SelectableListItem';import { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { useContext, useState } from 'react';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';+import { useContext, useState } from 'react';import { isDefined } from 'twenty-shared/utils';import {IconBox,@@ -23,8 +24,8 @@ import {IconNorthStar,IconSettings,IconTable,- useIcons,} from 'twenty-ui/display';+import { type SelectOption } from 'twenty-ui/input';import { MenuItemSelect } from 'twenty-ui/navigation';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';@@ -85,9 +86,10 @@ export const WebhookEntitySelect = ({dropdownId = WEBHOOK_ENTITY_DROPDOWN_ID,}: WebhookEntitySelectProps) => {const { theme } = useContext(ThemeContext);+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const [searchInput, setSearchInput] = useState('');const { objectMetadataItems } = useObjectMetadataItems();- const { getIcon } = useIcons();const { closeDropdown } = useCloseDropdown();const selectedItemId = useAtomComponentStateValue(@@ -105,12 +107,12 @@ export const WebhookEntitySelect = ({{ label: t`Webhook`, value: 'metadata.webhook', icon: IconCode },];- const objectOptions = [+ const objectOptions: SelectOption<string>[] = [{ label: t`All Objects`, value: '*', Icon: IconNorthStar },...objectMetadataItems.map((item) => ({label: item.labelPlural,value: item.nameSingular,- Icon: getIcon(item.icon),+ ...getSelectIconPropsFromObjectMetadataItem(item),})),];@@ -199,6 +201,7 @@ export const WebhookEntitySelect = ({><MenuItemSelectLeftIcon={option.Icon}+ leftIconColor={option.iconThemeColor}text={option.label}selected={value === option.value}focused={selectedItemId === option.value}diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelObjectPicker.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelObjectPicker.tsxindex b963efd4a33..bd18ee23eb0 100644--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelObjectPicker.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelObjectPicker.tsx@@ -1,14 +1,15 @@/* oxlint-disable twenty/no-navigate-prefer-link */+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { SettingsCard } from '@/settings/components/SettingsCard';import { useFilterObjectMetadataItemsWithPermissionOverride } from '@/settings/roles/role-permissions/object-level-permissions/hooks/useFilterObjectWithPermissionOverride';import { useObjectMetadataItemsThatCanHavePermission } from '@/settings/roles/role-permissions/object-level-permissions/hooks/useObjectMetadataItemsThatCanHavePermission';import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';-import { useContext, useState } from 'react';import { styled } from '@linaria/react';import { t } from '@lingui/core/macro';+import { useContext, useState } from 'react';import { useSearchParams } from 'react-router-dom';import { SettingsPath } from 'twenty-shared/types';-import { H2Title, IconSearch, useIcons } from 'twenty-ui/display';+import { H2Title, IconSearch } from 'twenty-ui/display';import { Section } from 'twenty-ui/layout';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';import { useNavigateSettings } from '~/hooks/useNavigateSettings';@@ -60,8 +61,6 @@ export const SettingsRolePermissionsObjectLevelObjectPicker = ({const { objectMetadataItemsThatCanHavePermission } =useObjectMetadataItemsThatCanHavePermission();- const { getIcon } = useIcons();-const handleSearchChange = (text: string) => {setSearchFilter(text);};@@ -125,27 +124,25 @@ export const SettingsRolePermissionsObjectLevelObjectPicker = ({description={t`All the standard objects`}/><StyledContainer>- {standardObjects.map((objectMetadataItem) => {- const Icon = getIcon(objectMetadataItem.icon);- return (- <StyledCardContainer- key={objectMetadataItem.id}- onClick={() =>- handleSelectObjectMetadata(objectMetadataItem.id)+ {standardObjects.map((objectMetadataItem) => (+ <StyledCardContainer+ key={objectMetadataItem.id}+ onClick={() =>+ handleSelectObjectMetadata(objectMetadataItem.id)+ }+ >+ <SettingsCard+ Icon={+ <ObjectMetadataIcon+ objectMetadataItem={objectMetadataItem}+ size={theme.icon.size.lg}+ stroke={theme.icon.stroke.sm}+ />}- >- <SettingsCard- Icon={- <Icon- size={theme.icon.size.lg}- stroke={theme.icon.stroke.sm}- />- }- title={objectMetadataItem.labelPlural}- />- </StyledCardContainer>- );- })}+ title={objectMetadataItem.labelPlural}+ />+ </StyledCardContainer>+ ))}</StyledContainer></Section>)}@@ -153,28 +150,25 @@ export const SettingsRolePermissionsObjectLevelObjectPicker = ({<Section><H2Title title={t`Custom`} description={t`All your custom objects`} /><StyledContainer>- {customObjects.map((objectMetadataItem) => {- const Icon = getIcon(objectMetadataItem.icon);- return (- <StyledCardContainer- key={objectMetadataItem.id}- onClick={() =>- handleSelectObjectMetadata(objectMetadataItem.id)+ {customObjects.map((objectMetadataItem) => (+ <StyledCardContainer+ key={objectMetadataItem.id}+ onClick={() =>+ handleSelectObjectMetadata(objectMetadataItem.id)+ }+ >+ <SettingsCard+ Icon={+ <ObjectMetadataIcon+ objectMetadataItem={objectMetadataItem}+ size={theme.icon.size.lg}+ stroke={theme.icon.stroke.sm}+ />}- >- <SettingsCard- key={objectMetadataItem.id}- Icon={- <Icon- size={theme.icon.size.lg}- stroke={theme.icon.stroke.sm}- />- }- title={objectMetadataItem.labelPlural}- />- </StyledCardContainer>- );- })}+ title={objectMetadataItem.labelPlural}+ />+ </StyledCardContainer>+ ))}</StyledContainer></Section>)}diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRow.tsx b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRow.tsxindex a678cc6ca86..000ff7125f8 100644--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRow.tsx+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelTableRow.tsx@@ -1,3 +1,4 @@+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { SettingsRolePermissionsObjectLevelOverrideCellContainer } from '@/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelOverrideCellContainer';import { SettingsRolePermissionsObjectLevelSeeFieldsValueForObject } from '@/settings/roles/role-permissions/object-level-permissions/components/SettingsRolePermissionsObjectLevelSeeFieldsValueForObject';@@ -7,10 +8,10 @@ import { OBJECT_LEVEL_PERMISSION_TABLE_GRID_AUTO_COLUMNS } from '@/settings/roleimport { TableCell } from '@/ui/layout/table/components/TableCell';import { TableRow } from '@/ui/layout/table/components/TableRow';import { styled } from '@linaria/react';-import { SettingsPath } from 'twenty-shared/types';-import { isDefined, getSettingsPath } from 'twenty-shared/utils';-import { OverflowingTextWithTooltip, useIcons } from 'twenty-ui/display';import { useContext } from 'react';+import { SettingsPath } from 'twenty-shared/types';+import { getSettingsPath } from 'twenty-shared/utils';+import { OverflowingTextWithTooltip } from 'twenty-ui/display';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';const StyledNameLabel = styled.div`@@ -33,10 +34,6 @@ export const SettingsRolePermissionsObjectLevelTableRow = ({fromAgentId,}: SettingsRolePermissionsObjectLevelTableRowProps) => {const { theme } = useContext(ThemeContext);- const { getIcon } = useIcons();-- const Icon = getIcon(objectMetadataItem.icon);-const objectLabelPlural = objectMetadataItem.labelPlural;const navigationPath = getSettingsPath(SettingsPath.RoleObjectLevel, {roleId: roleId,@@ -56,15 +53,11 @@ export const SettingsRolePermissionsObjectLevelTableRow = ({color={themeCssVariables.font.color.primary}gap={themeCssVariables.spacing[1]}>- {isDefined(Icon) && (- <Icon- style={{- minWidth: theme.icon.size.md,- }}- size={theme.icon.size.md}- stroke={theme.icon.stroke.sm}- />- )}+ <ObjectMetadataIcon+ objectMetadataItem={objectMetadataItem}+ size={theme.icon.size.md}+ stroke={theme.icon.stroke.sm}+ /><StyledNameLabel title={objectLabelPlural}><OverflowingTextWithTooltip text={objectLabelPlural} /></StyledNameLabel>diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsxindex 869fe123ba1..e4b9689f5f8 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelFolderInfo.tsx@@ -1,16 +1,15 @@import { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';-import { useIcons } from 'twenty-ui/display';+import { NavigationMenuItemType } from 'twenty-shared/types';+import { TintedIconTile, useIcons } from 'twenty-ui/display';+import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';+import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';+import { useNavigationMenuItemSectionItems } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemSectionItems';+import { useUpdateFolderInDraft } from '@/navigation-menu-item/edit/folder/hooks/useUpdateFolderInDraft';import { SidePanelPageInfoLayout } from '@/side-panel/components/SidePanelPageInfoLayout';import { sidePanelPageInfoState } from '@/side-panel/states/sidePanelPageInfoState';import { sidePanelShouldFocusTitleInputComponentState } from '@/side-panel/states/sidePanelShouldFocusTitleInputComponentState';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';-import { FOLDER_ICON_DEFAULT } from '@/navigation-menu-item/common/constants/FolderIconDefault';-import { NavigationMenuItemType } from 'twenty-shared/types';-import { useUpdateFolderInDraft } from '@/navigation-menu-item/edit/folder/hooks/useUpdateFolderInDraft';-import { useNavigationMenuItemSectionItems } from '@/navigation-menu-item/display/hooks/useNavigationMenuItemSectionItems';-import { selectedNavigationMenuItemIdInEditModeState } from '@/navigation-menu-item/common/states/selectedNavigationMenuItemIdInEditModeState';import { IconPicker } from '@/ui/input/components/IconPicker';import { TitleInput } from '@/ui/input/components/TitleInput';import { useAtomComponentState } from '@/ui/utilities/state/jotai/hooks/useAtomComponentState';@@ -78,7 +77,7 @@ export const SidePanelFolderInfo = () => {}clickableComponent={<StyledClickableIconWrapper>- <NavigationMenuItemStyleIcon+ <TintedIconTileIcon={FolderIconComponent}color={selectedItem.color}/>diff --git a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsxindex e6cebd84078..7b9754c0bb8 100644--- a/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/components/SidePanelObjectFilterDropdownContent.tsx@@ -1,12 +1,11 @@import { useLingui } from '@lingui/react/macro';import { useState } from 'react';import { OBJECTS_WITH_CHANNEL_VISIBILITY_CONSTRAINTS } from 'twenty-shared/constants';-import { IconCube, useIcons } from 'twenty-ui/display';+import { IconCube, TintedIconTile } from 'twenty-ui/display';import { MenuItemSelectAvatar, MenuItemToggle } from 'twenty-ui/navigation';-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { useReadableObjectMetadataItems } from '@/object-metadata/hooks/useReadableObjectMetadataItems';-import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';import { OBJECT_FILTER_DROPDOWN_ID } from '@/side-panel/components/SidePanelObjectFilterDropdown';import { sidePanelShowHiddenObjectsState } from '@/side-panel/states/sidePanelShowHiddenObjectsState';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';@@ -33,7 +32,6 @@ export const SidePanelObjectFilterDropdownContent = ({onSelectObject,}: SidePanelObjectFilterDropdownContentProps) => {const { t } = useLingui();- const { getIcon } = useIcons();const [filterSearch, setFilterSearch] = useState('');const [sidePanelShowHiddenObjects, setSidePanelShowHiddenObjects] =useAtomState(sidePanelShowHiddenObjectsState);@@ -93,9 +91,7 @@ export const SidePanelObjectFilterDropdownContent = ({onEnter={() => handleSelect(null)}><MenuItemSelectAvatar- avatar={- <NavigationMenuItemStyleIcon Icon={IconCube} color="gray" />- }+ avatar={<TintedIconTile Icon={IconCube} />}text={t`All objects`}selected={selectedObjectNameSingular === null}onClick={() => handleSelect(null)}@@ -103,9 +99,6 @@ export const SidePanelObjectFilterDropdownContent = ({/></SelectableListItem>{displayedObjects.map((objectMetadataItem) => {- const ObjectIcon = getIcon(objectMetadataItem.icon);- const iconColor = getObjectColorWithFallback(objectMetadataItem);-return (<SelectableListItemkey={objectMetadataItem.id}@@ -114,9 +107,8 @@ export const SidePanelObjectFilterDropdownContent = ({><MenuItemSelectAvataravatar={- <NavigationMenuItemStyleIcon- Icon={ObjectIcon}- color={iconColor}+ <ObjectMetadataIcon+ objectMetadataItem={objectMetadataItem}/>}text={objectMetadataItem.labelPlural}diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsxindex b974beb2a8b..c903f81ed12 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/dropdown-content/ChartDataSourceDropdownContent.tsx@@ -1,10 +1,11 @@+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';+import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { filterReadableActiveObjectMetadataItems } from '@/object-metadata/utils/filterReadableActiveObjectMetadataItems';+import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';import { usePageLayoutIdFromContextStore } from '@/side-panel/pages/page-layout/hooks/usePageLayoutIdFromContextStore';import { useResetChartDraftFiltersSettings } from '@/side-panel/pages/page-layout/hooks/useResetChartDraftFiltersSettings';import { useUpdateCurrentWidgetConfig } from '@/side-panel/pages/page-layout/hooks/useUpdateCurrentWidgetConfig';import { useWidgetInEditMode } from '@/side-panel/pages/page-layout/hooks/useWidgetInEditMode';-import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';-import { filterReadableActiveObjectMetadataItems } from '@/object-metadata/utils/filterReadableActiveObjectMetadataItems';-import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';@@ -21,7 +22,7 @@ import { t } from '@lingui/core/macro';import { Trans } from '@lingui/react/macro';import { useState } from 'react';import { isDefined } from 'twenty-shared/utils';-import { IconChevronLeft, IconSettings, useIcons } from 'twenty-ui/display';+import { IconChevronLeft, IconSettings } from 'twenty-ui/display';import { MenuItem, MenuItemSelect } from 'twenty-ui/navigation';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';@@ -74,8 +75,6 @@ export const ChartDataSourceDropdownContent = () => {const { closeDropdown } = useCloseDropdown();- const { getIcon } = useIcons();-const { resetChartDraftFiltersSettings } =useResetChartDraftFiltersSettings();@@ -162,7 +161,9 @@ export const ChartDataSourceDropdownContent = () => {text={objectMetadataItem.labelPlural}selected={currentObjectMetadataItemId === objectMetadataItem.id}focused={selectedItemId === objectMetadataItem.id}- LeftIcon={getIcon(objectMetadataItem.icon)}+ LeftIcon={() => (+ <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />+ )}onClick={() => {handleSelectSource(objectMetadataItem.id);}}diff --git a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsxindex 892fc21c640..5a0ef44b906 100644--- a/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx+++ b/packages/twenty-front/src/modules/side-panel/pages/page-layout/components/record-table-settings/RecordTableDataSourceDropdownContent.tsx@@ -1,4 +1,6 @@+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { filterReadableActiveObjectMetadataItems } from '@/object-metadata/utils/filterReadableActiveObjectMetadataItems';import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';import { useUpdatePageLayoutWidget } from '@/page-layout/hooks/useUpdatePageLayoutWidget';import { useCreateViewForRecordTableWidget } from '@/page-layout/widgets/record-table/hooks/useCreateViewForRecordTableWidget';@@ -16,11 +18,9 @@ import { SelectableListItem } from '@/ui/layout/selectable-list/components/Selecimport { selectedItemIdComponentState } from '@/ui/layout/selectable-list/states/selectedItemIdComponentState';import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';-import { filterReadableActiveObjectMetadataItems } from '@/object-metadata/utils/filterReadableActiveObjectMetadataItems';import { t } from '@lingui/core/macro';import { useState } from 'react';import { isDefined } from 'twenty-shared/utils';-import { useIcons } from 'twenty-ui/display';import { MenuItemSelect } from 'twenty-ui/navigation';import { filterBySearchQuery } from '~/utils/filterBySearchQuery';@@ -56,7 +56,6 @@ export const RecordTableDataSourceDropdownContent = () => {const { updatePageLayoutWidget } = useUpdatePageLayoutWidget(pageLayoutId);const { closeDropdown } = useCloseDropdown();- const { getIcon } = useIcons();const readableActiveObjectMetadataItems =filterReadableActiveObjectMetadataItems(@@ -149,7 +148,9 @@ export const RecordTableDataSourceDropdownContent = () => {text={objectMetadataItem.labelPlural}selected={currentObjectMetadataItemId === objectMetadataItem.id}focused={selectedItemId === objectMetadataItem.id}- LeftIcon={getIcon(objectMetadataItem.icon)}+ LeftIcon={() => (+ <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />+ )}onClick={() => {handleSelectSource(objectMetadataItem.id);}}diff --git a/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx b/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsxindex 0a3f27f496c..0bff9122e01 100644--- a/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/MultiSelectControl.tsx@@ -9,7 +9,9 @@ import {IconChevronDown,type IconComponent,OverflowingTextWithTooltip,+ TintedIconTile,} from 'twenty-ui/display';+import { type ThemeColor } from 'twenty-ui/theme';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';const StyledIconChevronDownWrapper = styled.div<{@@ -25,6 +27,7 @@ const StyledIconChevronDownWrapper = styled.div<{type MultiSelectOptionType = {label: string;Icon: IconComponent;+ iconThemeColor?: ThemeColor | null;};type MultiSelectControlProps = Omit<SelectControlProps, 'selectedOption'> & {@@ -59,11 +62,22 @@ export const MultiSelectControl = ({stroke: theme.icon.stroke.sm,})) : isDefined(firstSelectedOption?.Icon) ? (- <firstSelectedOption.Icon- color={isDisabled ? theme.font.color.light : theme.font.color.primary}- size={theme.icon.size.md}- stroke={theme.icon.stroke.sm}- />+ isDefined(firstSelectedOption.iconThemeColor) ? (+ <TintedIconTile+ Icon={firstSelectedOption.Icon}+ color={firstSelectedOption.iconThemeColor}+ size={theme.icon.size.md}+ stroke={theme.icon.stroke.sm}+ />+ ) : (+ <firstSelectedOption.Icon+ color={+ isDisabled ? theme.font.color.light : theme.font.color.primary+ }+ size={theme.icon.size.md}+ stroke={theme.icon.stroke.sm}+ />+ )) : null}{isDefined(fixedText) ? (<OverflowingTextWithTooltip text={fixedText} />diff --git a/packages/twenty-front/src/modules/ui/input/components/Select.tsx b/packages/twenty-front/src/modules/ui/input/components/Select.tsxindex 96adf7ed275..2b74537b8f6 100644--- a/packages/twenty-front/src/modules/ui/input/components/Select.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/Select.tsx@@ -226,6 +226,7 @@ export const Select = <Value extends SelectValue>({<DropdownMenuItemsContainer scrollable={false}><MenuItemSelectLeftIcon={pinnedOption.Icon}+ leftIconColor={pinnedOption.iconThemeColor}text={pinnedOption.label}contextualText={pinnedOption.contextualText}selected={@@ -262,6 +263,7 @@ export const Select = <Value extends SelectValue>({><MenuItemSelectLeftIcon={option.Icon}+ leftIconColor={option.iconThemeColor}text={option.label}contextualText={option.contextualText}selected={diff --git a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsxindex 992f52dd360..c8cceffb57c 100644--- a/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx+++ b/packages/twenty-front/src/modules/ui/input/components/SelectControl.tsx@@ -2,7 +2,11 @@ import { type SelectSizeVariant } from '@/ui/input/components/Select';import { styled } from '@linaria/react';import { useContext } from 'react';import { isDefined } from 'twenty-shared/utils';-import { IconChevronDown, OverflowingTextWithTooltip } from 'twenty-ui/display';+import {+ IconChevronDown,+ OverflowingTextWithTooltip,+ TintedIconTile,+} from 'twenty-ui/display';import { type SelectOption } from 'twenty-ui/input';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';@@ -88,11 +92,22 @@ export const SelectControl = ({title={selectedOption.fullLabel}>{isDefined(selectedOption?.Icon) ? (- <selectedOption.Icon- color={isDisabled ? theme.font.color.light : theme.font.color.primary}- size={theme.icon.size.md}- stroke={theme.icon.stroke.sm}- />+ isDefined(selectedOption.iconThemeColor) ? (+ <TintedIconTile+ Icon={selectedOption.Icon}+ color={selectedOption.iconThemeColor}+ size={theme.icon.size.md}+ stroke={theme.icon.stroke.sm}+ />+ ) : (+ <selectedOption.Icon+ color={+ isDisabled ? theme.font.color.light : theme.font.color.primary+ }+ size={theme.icon.size.md}+ stroke={theme.icon.stroke.sm}+ />+ )) : null}<OverflowingTextWithTooltiptext={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 78ef57a89ab..0bc99db50a4 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,4 +1,3 @@-import { NavigationMenuItemStyleIcon } from '@/navigation-menu-item/display/components/NavigationMenuItemStyleIcon';import { useIsSettingsPage } from '@/navigation/hooks/useIsSettingsPage';import { NAVIGATION_DRAWER_COLLAPSED_WIDTH } from '@/ui/layout/resizable-panel/constants/NavigationDrawerCollapsedWidth';import { NavigationDrawerAnimatedCollapseWrapper } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerAnimatedCollapseWrapper';@@ -21,6 +20,7 @@ import {Label,OverflowingTextWithTooltip,type TablerIconsProps,+ TintedIconTile,TooltipDelay,TooltipPosition,} from 'twenty-ui/display';@@ -355,7 +355,7 @@ export const NavigationDrawerItem = ({{Icon &&(isNonEmptyString(iconColor) ? (<StyledIcon>- <NavigationMenuItemStyleIcon Icon={Icon} color={iconColor} />+ <TintedIconTile Icon={Icon} color={iconColor} /></StyledIcon>) : (<StyledIcon>diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsxindex e06e71e16ae..dc932cdea9d 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/components/WorkflowDropdownStepOutputItems.tsx@@ -5,6 +5,7 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMimport { useGetFieldMetadataItemByIdOrThrow } from '@/object-metadata/hooks/useGetFieldMetadataItemById';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { useGetInitialFilterValue } from '@/object-record/object-filter-dropdown/hooks/useGetInitialFilterValue';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';@@ -52,6 +53,8 @@ export const WorkflowDropdownStepOutputItems = ({}: WorkflowDropdownStepOutputItemsProps) => {const { t } = useLingui();const { getIcon } = useIcons();+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const { upsertStepFilterSettings } = useUpsertStepFilterSettings();const { getFieldMetadataItemByIdOrThrow } =@@ -203,6 +206,10 @@ export const WorkflowDropdownStepOutputItems = ({const objectLabel = subStepObjectMetadataItem?.labelSingular;+ const subStepObjectIconProps = isDefined(subStepObjectMetadataItem)+ ? getSelectIconPropsFromObjectMetadataItem(subStepObjectMetadataItem)+ : undefined;+return (<DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}><DropdownMenuHeader@@ -231,11 +238,8 @@ export const WorkflowDropdownStepOutputItems = ({onClick={handleSelectObject}text={objectLabel || ''}hasSubMenu={false}- LeftIcon={- subStepObjectMetadataItem?.icon- ? getIcon(subStepObjectMetadataItem.icon)- : undefined- }+ LeftIcon={subStepObjectIconProps?.Icon}+ leftIconColor={subStepObjectIconProps?.iconThemeColor}contextualText={t`Pick a ${objectLabel} record`}/>)}diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsxindex 9c9ab0cf4c4..3d14eeb09c3 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/filters/components/WorkflowStepFilterFieldSelect.tsx@@ -1,4 +1,5 @@import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetadataItemById';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { SelectControl } from '@/ui/input/components/SelectControl';import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';@@ -33,6 +34,8 @@ export const WorkflowStepFilterFieldSelect = ({const { t } = useLingui();const { closeDropdown } = useCloseDropdown();const { getIcon } = useIcons();+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const availableVariablesInWorkflowStep = useAvailableVariablesInWorkflowStep({shouldDisplayRecordFields: true,@@ -88,12 +91,20 @@ export const WorkflowStepFilterFieldSelect = ({? t`Select a field from a previous step`: variableLabel;+ const fullRecordIconProps = stepFilter.isFullRecord+ ? isDefined(filterObjectMetadataItem)+ ? getSelectIconPropsFromObjectMetadataItem(filterObjectMetadataItem)+ : undefined+ : undefined;+const icon = stepFilter.isFullRecord- ? getIcon(filterObjectMetadataItem?.icon)+ ? fullRecordIconProps?.Icon: filterFieldMetadataItem?.icon? getIcon(filterFieldMetadataItem.icon): undefined;+ const iconThemeColor = fullRecordIconProps?.iconThemeColor;+if (readonly || noAvailableVariables) {const disabledLabel = noAvailableVariables? t`No available fields to select`@@ -109,6 +120,7 @@ export const WorkflowStepFilterFieldSelect = ({label: disabledLabel,fullLabel: variablePathLabel,Icon: icon,+ iconThemeColor,}}isDisabled={true}/>@@ -128,6 +140,7 @@ export const WorkflowStepFilterFieldSelect = ({fullLabel: variablePathLabel,value: stepFilter.stepOutputKey,Icon: icon,+ iconThemeColor,}}textAccent={isSelectedFieldNotFound ? 'placeholder' : 'default'}isDisabled={readonly}diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectRow.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectRow.tsxindex 87a37c122fc..e9b79d8e51a 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectRow.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectRow.tsx@@ -1,12 +1,12 @@-import { useIcons } from 'twenty-ui/display';+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { MenuItem } from 'twenty-ui/navigation';type WorkflowAiAgentPermissionsObjectRowProps = {- objectMetadata: {- id: string;- icon?: string | null;- labelPlural: string;- };+ objectMetadata: Pick<+ EnrichedObjectMetadataItem,+ 'id' | 'icon' | 'labelPlural' | 'nameSingular' | 'color' | 'isSystem'+ >;onClick?: () => void;readonly: boolean;};@@ -16,13 +16,9 @@ export const WorkflowAiAgentPermissionsObjectRow = ({onClick,readonly,}: WorkflowAiAgentPermissionsObjectRowProps) => {- const { getIcon } = useIcons();- const IconComponent = getIcon(objectMetadata.icon);-return (<MenuItem- LeftIcon={IconComponent}- withIconContainer+ LeftComponent={<ObjectMetadataIcon objectMetadataItem={objectMetadata} />}text={objectMetadata.labelPlural}hasSubMenu={!readonly}onClick={!readonly ? onClick : undefined}diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectsList.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectsList.tsxindex 99221abb83c..38c15460413 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectsList.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionsObjectsList.tsx@@ -1,13 +1,15 @@+import { type EnrichedObjectMetadataItem } from '@/object-metadata/types/EnrichedObjectMetadataItem';import { SidePanelGroup } from '@/side-panel/components/SidePanelGroup';import { t } from '@lingui/core/macro';import { WorkflowAiAgentPermissionsObjectRow } from './WorkflowAiAgentPermissionsObjectRow';type WorkflowAiAgentPermissionsObjectsListProps = {- objects: Array<{- id: string;- icon?: string | null;- labelPlural: string;- }>;+ objects: Array<+ Pick<+ EnrichedObjectMetadataItem,+ 'id' | 'icon' | 'labelPlural' | 'nameSingular' | 'color' | 'isSystem'+ >+ >;onObjectClick: (objectId: string) => void;readonly: boolean;};diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord.tsxindex b746e0a64b8..d3236fee176 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord.tsx@@ -1,6 +1,6 @@-import { t } from '@lingui/core/macro';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';import { FormFieldInput } from '@/object-record/record-field/ui/components/FormFieldInput';import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';@@ -12,10 +12,11 @@ import { WorkflowStepBody } from '@/workflow/workflow-steps/components/WorkflowSimport { WorkflowStepFooter } from '@/workflow/workflow-steps/components/WorkflowStepFooter';import { shouldDisplayFormField } from '@/workflow/workflow-steps/workflow-actions/utils/shouldDisplayFormField';import { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';+import { t } from '@lingui/core/macro';import { useEffect, useState } from 'react';import { isDefined } from 'twenty-shared/utils';import { canObjectBeManagedByWorkflow } from 'twenty-shared/workflow';-import { HorizontalSeparator, useIcons } from 'twenty-ui/display';+import { HorizontalSeparator } from 'twenty-ui/display';import { type SelectOption } from 'twenty-ui/input';import { type JsonValue } from 'type-fest';import { useDebouncedCallback } from 'use-debounce';@@ -65,8 +66,8 @@ export const WorkflowEditActionCreateRecord = ({action,actionOptions,}: WorkflowEditActionCreateRecordProps) => {- const { getIcon } = useIcons();-+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const { activeNonSystemObjectMetadataItems } =useFilteredObjectMetadataItems();@@ -79,9 +80,9 @@ export const WorkflowEditActionCreateRecord = ({}),).map((item) => ({- Icon: getIcon(item.icon),label: item.labelPlural,value: item.nameSingular,+ ...getSelectIconPropsFromObjectMetadataItem(item),}));const [formData, setFormData] = useState<CreateRecordFormData>({diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord.tsxindex 8cc097afac8..19badac48c3 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord.tsx@@ -1,8 +1,9 @@-import { t } from '@lingui/core/macro';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { FormSingleRecordPicker } from '@/object-record/record-field/ui/form-types/components/FormSingleRecordPicker';import { Select } from '@/ui/input/components/Select';import { type WorkflowDeleteRecordAction } from '@/workflow/types/Workflow';+import { t } from '@lingui/core/macro';import { useEffect, useState } from 'react';import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';@@ -11,7 +12,7 @@ import { WorkflowStepFooter } from '@/workflow/workflow-steps/components/Workfloimport { WorkflowVariablePicker } from '@/workflow/workflow-variables/components/WorkflowVariablePicker';import { isDefined } from 'twenty-shared/utils';import { canObjectBeManagedByWorkflow } from 'twenty-shared/workflow';-import { HorizontalSeparator, useIcons } from 'twenty-ui/display';+import { HorizontalSeparator } from 'twenty-ui/display';import { type SelectOption } from 'twenty-ui/input';import { type JsonValue } from 'type-fest';import { useDebouncedCallback } from 'use-debounce';@@ -37,8 +38,8 @@ export const WorkflowEditActionDeleteRecord = ({action,actionOptions,}: WorkflowEditActionDeleteRecordProps) => {- const { getIcon } = useIcons();-+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const { activeNonSystemObjectMetadataItems } =useFilteredObjectMetadataItems();@@ -51,9 +52,9 @@ export const WorkflowEditActionDeleteRecord = ({}),).map((item) => ({- Icon: getIcon(item.icon),label: item.labelPlural,value: item.nameSingular,+ ...getSelectIconPropsFromObjectMetadataItem(item),}));const [formData, setFormData] = useState<DeleteRecordFormData>({diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord.tsxindex 1dce72e0a0c..48eea59537b 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord.tsx@@ -1,4 +1,5 @@import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';import { FormFieldInput } from '@/object-record/record-field/ui/components/FormFieldInput';import { FormSingleRecordPicker } from '@/object-record/record-field/ui/form-types/components/FormSingleRecordPicker';@@ -16,7 +17,7 @@ import { t } from '@lingui/core/macro';import { useEffect, useState } from 'react';import { isDefined } from 'twenty-shared/utils';import { canObjectBeManagedByWorkflow } from 'twenty-shared/workflow';-import { HorizontalSeparator, useIcons } from 'twenty-ui/display';+import { HorizontalSeparator } from 'twenty-ui/display';import { type SelectOption } from 'twenty-ui/input';import { type JsonValue } from 'type-fest';import { useDebouncedCallback } from 'use-debounce';@@ -38,8 +39,8 @@ export const WorkflowEditActionUpdateRecord = ({action,actionOptions,}: WorkflowEditActionUpdateRecordProps) => {- const { getIcon } = useIcons();-+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const { activeNonSystemObjectMetadataItems } =useFilteredObjectMetadataItems();@@ -52,9 +53,9 @@ export const WorkflowEditActionUpdateRecord = ({}),).map((item) => ({- Icon: getIcon(item.icon),label: item.labelPlural,value: item.nameSingular,+ ...getSelectIconPropsFromObjectMetadataItem(item),}));const [formData, setFormData] = useState<UpdateRecordFormData>({diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpsertRecord.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpsertRecord.tsxindex 83fb7942b1e..b7f89fec19a 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpsertRecord.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpsertRecord.tsx@@ -1,5 +1,6 @@import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { formatFieldMetadataItemAsFieldDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition';import { FormFieldInput } from '@/object-record/record-field/ui/components/FormFieldInput';import { FormSingleRecordPicker } from '@/object-record/record-field/ui/form-types/components/FormSingleRecordPicker';@@ -17,7 +18,7 @@ import { t } from '@lingui/core/macro';import { useEffect, useState } from 'react';import { isDefined } from 'twenty-shared/utils';import { canObjectBeManagedByWorkflow } from 'twenty-shared/workflow';-import { HorizontalSeparator, useIcons } from 'twenty-ui/display';+import { HorizontalSeparator } from 'twenty-ui/display';import { type SelectOption } from 'twenty-ui/input';import { type JsonValue } from 'type-fest';import { useDebouncedCallback } from 'use-debounce';@@ -75,8 +76,8 @@ export const WorkflowEditActionUpsertRecord = ({action,actionOptions,}: WorkflowEditActionUpsertRecordProps) => {- const { getIcon } = useIcons();-+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const { activeNonSystemObjectMetadataItems } =useFilteredObjectMetadataItems();@@ -89,9 +90,9 @@ export const WorkflowEditActionUpsertRecord = ({}),).map((item) => ({- Icon: getIcon(item.icon),label: item.labelPlural,value: item.nameSingular,+ ...getSelectIconPropsFromObjectMetadataItem(item),}));const [formData, setFormData] = useState<UpsertRecordFormData>({diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsxindex fcb5facd435..9f60b3db27a 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowEditActionFindRecords.tsx@@ -1,16 +1,17 @@import { styled } from '@linaria/react';-import { msg } from '@lingui/core/macro';import { i18n } from '@lingui/core';+import { msg } from '@lingui/core/macro';import { useLingui } from '@lingui/react/macro';import { isNumber } from '@sniptt/guards';import { useEffect, useState } from 'react';import { QUERY_MAX_RECORDS } from 'twenty-shared/constants';import { isDefined } from 'twenty-shared/utils';-import { HorizontalSeparator, useIcons } from 'twenty-ui/display';+import { HorizontalSeparator } from 'twenty-ui/display';import { type JsonValue } from 'type-fest';import { useDebouncedCallback } from 'use-debounce';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';import { FormNumberFieldInput } from '@/object-record/record-field/ui/form-types/components/FormNumberFieldInput';@@ -82,6 +83,8 @@ export const WorkflowEditActionFindRecords = ({actionOptions,}: WorkflowEditActionFindRecordsProps) => {const { t } = useLingui();+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const maxRecordsFormatted = QUERY_MAX_RECORDS.toLocaleString();const dropdownId = 'workflow-edit-action-record-find-records-object-name';@@ -108,13 +111,11 @@ export const WorkflowEditActionFindRecords = ({const selectedObjectMetadataItem = objectMetadataItems.find((item) => item.nameSingular === formData.objectNameSingular,);- const { getIcon } = useIcons();-const selectedOption = selectedObjectMetadataItem? {- Icon: getIcon(selectedObjectMetadataItem?.icon),- label: selectedObjectMetadataItem?.labelPlural,- value: selectedObjectMetadataItem?.nameSingular,+ label: selectedObjectMetadataItem.labelPlural,+ value: selectedObjectMetadataItem.nameSingular,+ ...getSelectIconPropsFromObjectMetadataItem(selectedObjectMetadataItem),}: { label: i18n._(defaultSelectedOptionMessage), value: '' };diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsxindex d80e5e8f2c7..ce6c21bd478 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/find-records-action/components/WorkflowObjectDropdownContent.tsx@@ -1,3 +1,4 @@+import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';@@ -9,7 +10,7 @@ import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/Geneimport { Trans } from '@lingui/react/macro';import { isNonEmptyString } from '@sniptt/guards';import { useState } from 'react';-import { IconChevronLeft, IconSettings, useIcons } from 'twenty-ui/display';+import { IconChevronLeft, IconSettings } from 'twenty-ui/display';import { MenuItem } from 'twenty-ui/navigation';type WorkflowObjectDropdownContentProps = {@@ -21,7 +22,6 @@ export const WorkflowObjectDropdownContent = ({onOptionClick,showAdvancedOption = true,}: WorkflowObjectDropdownContentProps) => {- const { getIcon } = useIcons();const [searchInputValue, setSearchInputValue] = useState('');const [isSystemObjectsOpen, setIsSystemObjectsOpen] = useState(false);@@ -74,12 +74,6 @@ export const WorkflowObjectDropdownContent = ({? filteredSystemObjects: filteredNonSystemObjects;- const filteredOptions = filteredObjects.map((objectMetadataItem) => ({- Icon: getIcon(objectMetadataItem.icon),- label: objectMetadataItem.labelPlural,- value: objectMetadataItem.nameSingular,- }));-const handleSystemObjectsClick = () => {setIsSystemObjectsOpen(true);setSearchInputValue('');@@ -123,12 +117,14 @@ export const WorkflowObjectDropdownContent = ({/><DropdownMenuSeparator /><DropdownMenuItemsContainer hasMaxHeight>- {filteredOptions.map((option) => (+ {filteredObjects.map((objectMetadataItem) => (<MenuItem- key={option.value}- LeftIcon={option.Icon}- text={option.label}- onClick={() => onOptionClick(option.value)}+ key={objectMetadataItem.nameSingular}+ LeftIcon={() => (+ <ObjectMetadataIcon objectMetadataItem={objectMetadataItem} />+ )}+ text={objectMetadataItem.labelPlural}+ onClick={() => onOptionClick(objectMetadataItem.nameSingular)}/>))}{shouldShowAdvanced && (diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsRecordPicker.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsRecordPicker.tsxindex 3c7f89786fe..a0a9c1c81ae 100644--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsRecordPicker.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormFieldSettingsRecordPicker.tsx@@ -1,4 +1,5 @@import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { FormFieldInputContainer } from '@/object-record/record-field/ui/form-types/components/FormFieldInputContainer';import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';import { InputLabel } from '@/ui/input/components/InputLabel';@@ -6,10 +7,9 @@ import { Select } from '@/ui/input/components/Select';import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';import { type WorkflowFormActionField } from '@/workflow/workflow-steps/workflow-actions/form-action/types/WorkflowFormActionField';import { getDefaultFormFieldSettings } from '@/workflow/workflow-steps/workflow-actions/form-action/utils/getDefaultFormFieldSettings';-import { t } from '@lingui/core/macro';import { styled } from '@linaria/react';+import { t } from '@lingui/core/macro';import camelCase from 'lodash.camelcase';-import { useIcons } from 'twenty-ui/display';import { type SelectOption } from 'twenty-ui/input';import { themeCssVariables } from 'twenty-ui/theme-constants';@@ -28,16 +28,16 @@ export const WorkflowFormFieldSettingsRecordPicker = ({field,onChange,}: WorkflowFormFieldSettingsRecordPickerProps) => {- const { getIcon } = useIcons();-+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const { activeNonSystemObjectMetadataItems } =useFilteredObjectMetadataItems();const availableMetadata: Array<SelectOption<string>> =activeNonSystemObjectMetadataItems.map((item) => ({- Icon: getIcon(item.icon),label: item.labelPlural,value: item.nameSingular,+ ...getSelectIconPropsFromObjectMetadataItem(item),}));return (diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsxindex 619ca8155fb..1f349c2436b 100644--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerDatabaseEventForm.tsx@@ -1,4 +1,5 @@import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { type FieldMultiSelectValue } from '@/object-record/record-field/ui/types/FieldMetadata';import { SelectControl } from '@/ui/input/components/SelectControl';import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';@@ -20,7 +21,7 @@ import { Trans, useLingui } from '@lingui/react/macro';import { useCallback, useMemo, useState } from 'react';import { isDefined } from 'twenty-shared/utils';import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';-import { IconChevronLeft, IconSettings, useIcons } from 'twenty-ui/display';+import { IconChevronLeft, IconSettings } from 'twenty-ui/display';import { MenuItem } from 'twenty-ui/navigation';import { themeCssVariables } from 'twenty-ui/theme-constants';@@ -63,8 +64,9 @@ export const WorkflowEditTriggerDatabaseEventForm = ({trigger,triggerOptions,}: WorkflowEditTriggerDatabaseEventFormProps) => {- const { getIcon } = useIcons();const { t } = useLingui();+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const [searchInputValue, setSearchInputValue] = useState('');const [isSystemObjectsOpen, setIsSystemObjectsOpen] = useState(false);const dropdownId = 'workflow-edit-trigger-record-type';@@ -90,7 +92,7 @@ export const WorkflowEditTriggerDatabaseEventForm = ({.map((item) => ({label: item.labelPlural,value: item.nameSingular,- Icon: getIcon(item.icon),+ ...getSelectIconPropsFromObjectMetadataItem(item),}));const systemObjects = objectMetadataItems@@ -98,7 +100,7 @@ export const WorkflowEditTriggerDatabaseEventForm = ({.map((item) => ({label: item.labelPlural,value: item.nameSingular,- Icon: getIcon(item.icon),+ ...getSelectIconPropsFromObjectMetadataItem(item),}));const selectedOption =diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManual.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManual.tsxindex 1f052b00a83..83a73ff185d 100644--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManual.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerManual.tsx@@ -1,5 +1,5 @@-import { isDefined } from 'twenty-shared/utils';import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { IconPicker } from '@/ui/input/components/IconPicker';import { Select } from '@/ui/input/components/Select';import { SelectControl } from '@/ui/input/components/SelectControl';@@ -13,6 +13,7 @@ import { getManualTriggerDefaultSettings } from '@/workflow/workflow-trigger/utiimport { styled } from '@linaria/react';import { useLingui } from '@lingui/react/macro';import { QUERY_MAX_RECORDS } from 'twenty-shared/constants';+import { isDefined } from 'twenty-shared/utils';import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';import { useIcons } from 'twenty-ui/display';import { type SelectOption } from 'twenty-ui/input';@@ -56,6 +57,8 @@ export const WorkflowEditTriggerManual = ({const { t } = useLingui();const { getIcon } = useIcons();+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const maxRecordsFormatted = QUERY_MAX_RECORDS.toLocaleString();const { activeNonSystemObjectMetadataItems } =@@ -65,7 +68,7 @@ export const WorkflowEditTriggerManual = ({activeNonSystemObjectMetadataItems.map((item) => ({label: item.labelPlural,value: item.nameSingular,- Icon: getIcon(item.icon),+ ...getSelectIconPropsFromObjectMetadataItem(item),}));const availability = trigger.settings.availability;diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsxindex b404ac4f173..9f534bf7145 100644--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx@@ -4,9 +4,11 @@ import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/Dropdowimport { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';+import { useObjectMetadataSelectHelpers } from '@/object-metadata/hooks/useObjectMetadataSelectHelpers';import { DropdownContent } from '@/ui/layout/dropdown/components/DropdownContent';import { DropdownMenuHeaderLeftComponent } from '@/ui/layout/dropdown/components/DropdownMenuHeader/internal/DropdownMenuHeaderLeftComponent';import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';+import { useVariableDropdown } from '@/workflow/workflow-variables/hooks/useVariableDropdown';import { isRecordOutputSchemaV2 } from '@/workflow/workflow-variables/types/guards/isRecordOutputSchemaV2';import { type StepOutputSchemaV2 } from '@/workflow/workflow-variables/types/StepOutputSchemaV2';import { getCurrentSubStepFromPath } from '@/workflow/workflow-variables/utils/getCurrentSubStepFromPath';@@ -21,7 +23,6 @@ import {useIcons,} from 'twenty-ui/display';import { MenuItemSelect } from 'twenty-ui/navigation';-import { useVariableDropdown } from '@/workflow/workflow-variables/hooks/useVariableDropdown';type WorkflowVariablesDropdownStepItemsProps = {step: StepOutputSchemaV2;@@ -38,6 +39,8 @@ export const WorkflowVariablesDropdownStepItems = ({}: WorkflowVariablesDropdownStepItemsProps) => {const { t } = useLingui();const { getIcon } = useIcons();+ const { getSelectIconPropsFromObjectMetadataItem } =+ useObjectMetadataSelectHelpers();const {searchInputValue,setSearchInputValue,@@ -97,6 +100,12 @@ export const WorkflowVariablesDropdownStepItems = ({const shouldDisplaySubStepObject =shouldDisplayRecordObjects && isObjectFoundThroughSearch;+ const displayedSubStepObjectIconProps = isDefined(+ displayedSubStepObjectMetadata,+ )+ ? getSelectIconPropsFromObjectMetadataItem(displayedSubStepObjectMetadata)+ : undefined;+return (<DropdownContent widthInPixels={GenericDropdownContentWidth.ExtraLarge}><DropdownMenuHeader@@ -125,11 +134,8 @@ export const WorkflowVariablesDropdownStepItems = ({onClick={handleSelectObject}text={objectLabel || ''}hasSubMenu={false}- LeftIcon={- displayedSubStepObjectMetadata?.icon- ? getIcon(displayedSubStepObjectMetadata.icon)- : undefined- }+ LeftIcon={displayedSubStepObjectIconProps?.Icon}+ leftIconColor={displayedSubStepObjectIconProps?.iconThemeColor}contextualText={t`Pick a ${objectLabel} record`}/>)}diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsxindex 6e01b41000d..37d898b78b9 100644--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsToolIcon.tsx@@ -1,19 +1,19 @@import { styled } from '@linaria/react';import { useContext } from 'react';-import { getNavigationMenuItemIconStyleFromColor } from '@/navigation-menu-item/common/utils/getNavigationMenuItemIconStyleFromColor';import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';import { isDefined } from 'twenty-shared/utils';import {Avatar,- type IconComponent,+ getIconTileColorShades,IconCode,IconEdit,IconPlus,IconSearch,IconTrash,useIcons,+ type IconComponent,} from 'twenty-ui/display';import { ThemeContext, themeCssVariables } from 'twenty-ui/theme-constants';@@ -134,9 +134,7 @@ export const SettingsToolIcon = ({: undefined;const objectStyle = isDefined(objectMetadata)- ? getNavigationMenuItemIconStyleFromColor(- getObjectColorWithFallback(objectMetadata),- )+ ? getIconTileColorShades(getObjectColorWithFallback(objectMetadata)): null;if (isDefined(OperationIcon)) {diff --git a/packages/twenty-ui/src/display/index.ts b/packages/twenty-ui/src/display/index.tsindex 47072ecc53f..1c0adee7ef5 100644--- a/packages/twenty-ui/src/display/index.ts+++ b/packages/twenty-ui/src/display/index.ts@@ -515,6 +515,11 @@ export { Info } from './info/components/Info';export { Status } from './status/components/Status';export { HorizontalSeparator } from './text/components/HorizontalSeparator';export { SeparatorLineText } from './text/components/SeparatorLineText';+export { StyledTintedIconTileContainer } from './tinted-icon-tile/components/StyledTintedIconTileContainer';+export type { TintedIconTileProps } from './tinted-icon-tile/components/TintedIconTile';+export { TintedIconTile } from './tinted-icon-tile/components/TintedIconTile';+export type { IconTileColorShades } from './tinted-icon-tile/utils/getIconTileColorShades';+export { getIconTileColorShades } from './tinted-icon-tile/utils/getIconTileColorShades';export type { AppTooltipProps } from './tooltip/AppTooltip';export {TooltipPosition,diff --git a/packages/twenty-ui/src/display/status/components/Status.tsx b/packages/twenty-ui/src/display/status/components/Status.tsxindex 9cfb3126f3f..23da0127892 100644--- a/packages/twenty-ui/src/display/status/components/Status.tsx+++ b/packages/twenty-ui/src/display/status/components/Status.tsx@@ -1,12 +1,8 @@import { styled } from '@linaria/react';import { Loader } from '@ui/feedback/loader/components/Loader';-import { type ThemeColor, MAIN_COLOR_NAMES } from '@ui/theme';+import { type ThemeColor } from '@ui/theme';import { themeCssVariables } from '@ui/theme-constants';--const parseThemeColor = (color: string): ThemeColor =>- (MAIN_COLOR_NAMES as string[]).includes(color)- ? (color as ThemeColor)- : 'gray';+import { parseThemeColor } from '@ui/utilities';const StyledStatus = styled.h3<{color: ThemeColor;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIconContainer.tsx b/packages/twenty-ui/src/display/tinted-icon-tile/components/StyledTintedIconTileContainer.tsxsimilarity index 58%rename from packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIconContainer.tsxrename to packages/twenty-ui/src/display/tinted-icon-tile/components/StyledTintedIconTileContainer.tsxindex bc917d4023f..e3959a3fa34 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/display/components/NavigationMenuItemIconContainer.tsx+++ b/packages/twenty-ui/src/display/tinted-icon-tile/components/StyledTintedIconTileContainer.tsx@@ -1,9 +1,10 @@import { styled } from '@linaria/react';-import { themeCssVariables } from 'twenty-ui/theme-constants';+import { themeCssVariables } from '@ui/theme-constants';-export const StyledNavigationMenuItemIconContainer = styled.div<{+export const StyledTintedIconTileContainer = styled.div<{$backgroundColor?: string;$borderColor?: string;+ $dimension?: string;}>`align-items: center;background-color: ${({ $backgroundColor }) =>@@ -14,8 +15,8 @@ export const StyledNavigationMenuItemIconContainer = styled.div<{box-sizing: border-box;display: flex;flex-shrink: 0;- height: ${themeCssVariables.spacing[4]};+ height: ${({ $dimension }) => $dimension ?? themeCssVariables.spacing[4]};justify-content: center;- width: ${themeCssVariables.spacing[4]};+ width: ${({ $dimension }) => $dimension ?? themeCssVariables.spacing[4]};`;diff --git a/packages/twenty-ui/src/display/tinted-icon-tile/components/TintedIconTile.tsx b/packages/twenty-ui/src/display/tinted-icon-tile/components/TintedIconTile.tsxnew file mode 100644index 00000000000..eaf4e650bad--- /dev/null+++ b/packages/twenty-ui/src/display/tinted-icon-tile/components/TintedIconTile.tsx@@ -0,0 +1,39 @@+import { type IconComponent } from '@ui/display/icon/types/IconComponent';+import { StyledTintedIconTileContainer } from '@ui/display/tinted-icon-tile/components/StyledTintedIconTileContainer';+import { getIconTileColorShades } from '@ui/display/tinted-icon-tile/utils/getIconTileColorShades';+import { DEFAULT_THEME_COLOR_FALLBACK } from '@ui/theme';+import { ThemeContext } from '@ui/theme-constants';+import { useContext } from 'react';+import { isDefined } from 'twenty-shared/utils';++export type TintedIconTileProps = {+ Icon: IconComponent;+ color?: string | null;+ size?: number;+ stroke?: number;+};++export const TintedIconTile = ({+ Icon,+ color = DEFAULT_THEME_COLOR_FALLBACK,+ size: sizeFromProps,+ stroke: strokeFromProps,+}: TintedIconTileProps) => {+ const { theme } = useContext(ThemeContext);+ const style = getIconTileColorShades(color);+ const iconSize = sizeFromProps ?? theme.icon.size.md;+ const iconStroke = strokeFromProps ?? theme.icon.stroke.md;+ const tileDimension = isDefined(sizeFromProps)+ ? `${sizeFromProps}px`+ : undefined;++ return (+ <StyledTintedIconTileContainer+ $backgroundColor={style.backgroundColor}+ $borderColor={style.borderColor}+ $dimension={tileDimension}+ >+ <Icon size={iconSize} stroke={iconStroke} color={style.iconColor} />+ </StyledTintedIconTileContainer>+ );+};diff --git a/packages/twenty-ui/src/display/tinted-icon-tile/internal/constants/tintedIconTileColorShades.constant.ts b/packages/twenty-ui/src/display/tinted-icon-tile/internal/constants/tintedIconTileColorShades.constant.tsnew file mode 100644index 00000000000..3d2f44f3a6f--- /dev/null+++ b/packages/twenty-ui/src/display/tinted-icon-tile/internal/constants/tintedIconTileColorShades.constant.ts@@ -0,0 +1,5 @@+export const TINTED_ICON_TILE_COLOR_SHADES = {+ background: 5,+ border: 6,+ icon: 11,+} as const;diff --git a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getColorFromTheme.ts b/packages/twenty-ui/src/display/tinted-icon-tile/internal/utils/getColorFromTheme.tssimilarity index 75%rename from packages/twenty-front/src/modules/navigation-menu-item/common/utils/getColorFromTheme.tsrename to packages/twenty-ui/src/display/tinted-icon-tile/internal/utils/getColorFromTheme.tsindex aa30425cb49..6325f91f15d 100644--- a/packages/twenty-front/src/modules/navigation-menu-item/common/utils/getColorFromTheme.ts+++ b/packages/twenty-ui/src/display/tinted-icon-tile/internal/utils/getColorFromTheme.ts@@ -1,5 +1,5 @@-import { themeCssVariables } from 'twenty-ui/theme-constants';-import { type ThemeColor } from 'twenty-ui/theme';+import { type ThemeColor } from '@ui/theme';+import { themeCssVariables } from '@ui/theme-constants';export const getColorFromTheme = (themeColor: ThemeColor,diff --git a/packages/twenty-ui/src/display/tinted-icon-tile/utils/getIconTileColorShades.ts b/packages/twenty-ui/src/display/tinted-icon-tile/utils/getIconTileColorShades.tsnew file mode 100644index 00000000000..0c225e87a6d--- /dev/null+++ b/packages/twenty-ui/src/display/tinted-icon-tile/utils/getIconTileColorShades.ts@@ -0,0 +1,29 @@+import { TINTED_ICON_TILE_COLOR_SHADES } from '@ui/display/tinted-icon-tile/internal/constants/tintedIconTileColorShades.constant';+import { getColorFromTheme } from '@ui/display/tinted-icon-tile/internal/utils/getColorFromTheme';+import { parseThemeColor } from '@ui/utilities';++export type IconTileColorShades = {+ backgroundColor: string;+ iconColor: string;+ borderColor: string;+};++export const getIconTileColorShades = (+ color: string | null | undefined,+): IconTileColorShades => {+ const themeColor = parseThemeColor(color);+ return {+ backgroundColor: getColorFromTheme(+ themeColor,+ TINTED_ICON_TILE_COLOR_SHADES.background,+ ),+ iconColor: getColorFromTheme(+ themeColor,+ TINTED_ICON_TILE_COLOR_SHADES.icon,+ ),+ borderColor: getColorFromTheme(+ themeColor,+ TINTED_ICON_TILE_COLOR_SHADES.border,+ ),+ };+};diff --git a/packages/twenty-ui/src/input/types/SelectOption.ts b/packages/twenty-ui/src/input/types/SelectOption.tsindex 3b3f9d39f2d..e2a5190f185 100644--- a/packages/twenty-ui/src/input/types/SelectOption.ts+++ b/packages/twenty-ui/src/input/types/SelectOption.ts@@ -5,6 +5,7 @@ export type SelectOption<Value extends string | number | boolean | null = string,> = {Icon?: IconComponent | null;+ iconThemeColor?: ThemeColor | null;label: string;fullLabel?: string;value: Value;diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsx b/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsxindex e7530f46cea..d79a2f04a3e 100644--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsx+++ b/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItem.tsx@@ -11,6 +11,7 @@ import {import { styled } from '@linaria/react';import { MenuItemHotKeys } from '@ui/navigation/menu/menu-item/components/MenuItemHotKeys';+import { type ThemeColor } from '@ui/theme';import { ThemeContext } from '@ui/theme-constants';import { motion } from 'framer-motion';import { type Nullable } from 'twenty-shared/types';@@ -39,6 +40,7 @@ export type MenuItemProps = {isIconDisplayedOnHoverOnly?: boolean;isTooltipOpen?: boolean;LeftIcon?: IconComponent | null;+ iconThemeColor?: ThemeColor | null;LeftComponent?: ReactNode;RightIcon?: IconComponent | null;RightComponent?: ReactNode;@@ -71,6 +73,7 @@ export const MenuItem = ({iconButtons,isIconDisplayedOnHoverOnly = true,LeftIcon,+ iconThemeColor,LeftComponent,RightIcon,RightComponent,@@ -113,6 +116,7 @@ export const MenuItem = ({><MenuItemLeftContentLeftIcon={LeftIcon ?? undefined}+ iconThemeColor={iconThemeColor}LeftComponent={LeftComponent}withIconContainer={withIconContainer}withIconContainerBackground={withIconContainerBackground}diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelect.tsx b/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelect.tsxindex 386bab61f57..5915586b2f0 100644--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelect.tsx+++ b/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemMultiSelect.tsx@@ -4,9 +4,9 @@ import { Tag } from '@ui/components';import { type IconComponent } from '@ui/display';import { Checkbox } from '@ui/input/components/Checkbox';import { MenuItemLeftContent } from '@ui/navigation/menu/menu-item/internals/components/MenuItemLeftContent';-import { StyledMenuItemBase } from '../internals/components/StyledMenuItemBase';import { type ThemeColor } from '@ui/theme';import { themeCssVariables } from '@ui/theme-constants';+import { StyledMenuItemBase } from '../internals/components/StyledMenuItemBase';const StyledLeftContentWithCheckboxContainer = styled.div`align-items: center;@@ -20,6 +20,7 @@ const StyledLeftContentWithCheckboxContainer = styled.div`type MenuItemMultiSelectProps = {color?: ThemeColor;LeftIcon?: IconComponent;+ iconThemeColor?: ThemeColor | null;selected: boolean;isKeySelected?: boolean;withIconContainer?: boolean;@@ -31,6 +32,7 @@ type MenuItemMultiSelectProps = {export const MenuItemMultiSelect = ({color,LeftIcon,+ iconThemeColor,withIconContainer = false,text,selected,@@ -55,6 +57,7 @@ export const MenuItemMultiSelect = ({) : (<MenuItemLeftContentLeftIcon={LeftIcon}+ iconThemeColor={iconThemeColor}text={text}withIconContainer={withIconContainer}/>diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelect.tsx b/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelect.tsxindex 08ce106b50d..b15b1a59b77 100644--- a/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelect.tsx+++ b/packages/twenty-ui/src/navigation/menu/menu-item/components/MenuItemSelect.tsx@@ -7,8 +7,9 @@ import {OverflowingTextWithTooltip,type IconComponent,} from '@ui/display';-import { type ReactNode, useContext } from 'react';+import { type ThemeColor } from '@ui/theme';import { ThemeContext, themeCssVariables } from '@ui/theme-constants';+import { useContext, type ReactNode } from 'react';import { MenuItemLeftContent } from '../internals/components/MenuItemLeftContent';import {StyledMenuItemLabel,@@ -60,6 +61,7 @@ export const StyledMenuItemSelect = styled.div<{type MenuItemSelectProps = {LeftIcon?: IconComponent | null | undefined;+ leftIconColor?: ThemeColor | null;withIconContainer?: boolean;selected: boolean;needIconCheck?: boolean;@@ -75,6 +77,7 @@ type MenuItemSelectProps = {export const MenuItemSelect = ({LeftIcon,+ leftIconColor,withIconContainer = false,text,selected,@@ -101,6 +104,7 @@ export const MenuItemSelect = ({><MenuItemLeftContentLeftIcon={LeftIcon}+ iconThemeColor={leftIconColor}text={text}contextualText={contextualTextPosition === 'left' ? contextualText : nulldiff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIcon.tsx b/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIcon.tsxindex 96d499220b1..d4ec40e7e1b 100644--- a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIcon.tsx+++ b/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIcon.tsx@@ -1,16 +1,20 @@-import { type IconComponent } from '@ui/display';+import { type IconComponent, TintedIconTile } from '@ui/display';+import { type ThemeColor } from '@ui/theme';import { ThemeContext } from '@ui/theme-constants';import { useContext } from 'react';+import { isDefined } from 'twenty-shared/utils';import { MenuItemIconBoxContainer } from './MenuItemIconBoxContainer';export type MenuItemIconProps = {Icon: IconComponent | null | undefined;+ iconThemeColor?: ThemeColor | null;withContainer?: boolean;withContainerBackground?: boolean;};export const MenuItemIcon = ({Icon,+ iconThemeColor,withContainer = false,withContainerBackground = true,}: MenuItemIconProps) => {@@ -20,6 +24,17 @@ export const MenuItemIcon = ({return null;}+ if (isDefined(iconThemeColor)) {+ return (+ <TintedIconTile+ Icon={Icon}+ color={iconThemeColor}+ size={theme.icon.size.md}+ stroke={theme.icon.stroke.sm}+ />+ );+ }+const iconElement = (<Icon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />);diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconWithGripSwap.tsx b/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconWithGripSwap.tsxindex df8d0512179..9c81c160c7d 100644--- a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconWithGripSwap.tsx+++ b/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemIconWithGripSwap.tsx@@ -1,7 +1,13 @@import { styled } from '@linaria/react';-import { type IconComponent, IconGripVertical } from '@ui/display';+import {+ type IconComponent,+ IconGripVertical,+ TintedIconTile,+} from '@ui/display';+import { type ThemeColor } from '@ui/theme';import { ThemeContext, themeCssVariables } from '@ui/theme-constants';import { useContext } from 'react';+import { isDefined } from 'twenty-shared/utils';import { MenuItemIconBoxContainer } from './MenuItemIconBoxContainer';const StyledIconSwapContainer = styled.div`@@ -27,12 +33,14 @@ const StyledHoverIcon = styled.div`export type MenuItemIconWithGripSwapProps = {LeftIcon: IconComponent | null | undefined;+ iconThemeColor?: ThemeColor | null;withIconContainer?: boolean;gripIconColor: string;};export const MenuItemIconWithGripSwap = ({LeftIcon,+ iconThemeColor,withIconContainer = false,gripIconColor,}: MenuItemIconWithGripSwapProps) => {@@ -45,7 +53,16 @@ export const MenuItemIconWithGripSwap = ({const iconContent = (<StyledIconSwapContainer><StyledDefaultIcon className="grip-swap-default-icon">- <LeftIcon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />+ {isDefined(iconThemeColor) ? (+ <TintedIconTile+ Icon={LeftIcon}+ color={iconThemeColor}+ size={theme.icon.size.md}+ stroke={theme.icon.stroke.sm}+ />+ ) : (+ <LeftIcon size={theme.icon.size.md} stroke={theme.icon.stroke.sm} />+ )}</StyledDefaultIcon><StyledHoverIcon className="grip-swap-hover-icon"><IconGripVertical@@ -57,7 +74,7 @@ export const MenuItemIconWithGripSwap = ({</StyledIconSwapContainer>);- if (withIconContainer) {+ if (withIconContainer && !isDefined(iconThemeColor)) {return <MenuItemIconBoxContainer>{iconContent}</MenuItemIconBoxContainer>;}diff --git a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.tsx b/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.tsxindex de2273c2a52..bf768f39f5a 100644--- a/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.tsx+++ b/packages/twenty-ui/src/navigation/menu/menu-item/internals/components/MenuItemLeftContent.tsx@@ -7,6 +7,7 @@ import {IconGripVertical,OverflowingTextWithTooltip,} from '@ui/display';+import { type ThemeColor } from '@ui/theme';import { ThemeContext, themeCssVariables } from '@ui/theme-constants';import { type MenuItemDraggableGripMode } from '../../types/MenuItemDraggableGripMode';import { MenuItemIcon } from './MenuItemIcon';@@ -42,6 +43,7 @@ type MenuItemLeftContentProps = {className?: string;LeftComponent?: ReactNode;LeftIcon: IconComponent | null | undefined;+ iconThemeColor?: ThemeColor | null;withIconContainer?: boolean;withIconContainerBackground?: boolean;gripMode?: MenuItemDraggableGripMode;@@ -55,6 +57,7 @@ export const MenuItemLeftContent = ({className,LeftComponent,LeftIcon,+ iconThemeColor,withIconContainer = false,withIconContainerBackground = true,text,@@ -96,12 +99,14 @@ export const MenuItemLeftContent = ({{gripMode === 'onHover' ? (<MenuItemIconWithGripSwapLeftIcon={LeftIcon}+ iconThemeColor={iconThemeColor}withIconContainer={withIconContainer}gripIconColor={gripIconColor}/>) : (<MenuItemIconIcon={LeftIcon}+ iconThemeColor={iconThemeColor}withContainer={withIconContainer}withContainerBackground={withIconContainerBackground}/>diff --git a/packages/twenty-ui/src/theme/constants/DefaultThemeColorFallback.ts b/packages/twenty-ui/src/theme/constants/DefaultThemeColorFallback.tsnew file mode 100644index 00000000000..ee3e470f075--- /dev/null+++ b/packages/twenty-ui/src/theme/constants/DefaultThemeColorFallback.ts@@ -0,0 +1,3 @@+import { type ThemeColor } from './MainColorNames';++export const DEFAULT_THEME_COLOR_FALLBACK: ThemeColor = 'gray';diff --git a/packages/twenty-ui/src/theme/index.ts b/packages/twenty-ui/src/theme/index.tsindex f004e400708..e134b8ccf6e 100644--- a/packages/twenty-ui/src/theme/index.ts+++ b/packages/twenty-ui/src/theme/index.ts@@ -24,6 +24,7 @@ export { CODE_DARK } from './constants/CodeDark';export { CODE_LIGHT } from './constants/CodeLight';export { COLOR_DARK } from './constants/ColorsDark';export { COLOR_LIGHT } from './constants/ColorsLight';+export { DEFAULT_THEME_COLOR_FALLBACK } from './constants/DefaultThemeColorFallback';export { FONT_COMMON } from './constants/FontCommon';export { FONT_DARK } from './constants/FontDark';export { FONT_LIGHT } from './constants/FontLight';diff --git a/packages/twenty-ui/src/utilities/color/utils/parseThemeColor.ts b/packages/twenty-ui/src/utilities/color/utils/parseThemeColor.tsnew file mode 100644index 00000000000..f6a3d656b74--- /dev/null+++ b/packages/twenty-ui/src/utilities/color/utils/parseThemeColor.ts@@ -0,0 +1,10 @@+import { DEFAULT_THEME_COLOR_FALLBACK, type ThemeColor } from '@ui/theme';++import { themeColorSchema } from './themeColorSchema';++export const parseThemeColor = (+ color: string | null | undefined,+): ThemeColor => {+ const result = themeColorSchema.safeParse(color ?? '');+ return result.success ? result.data : DEFAULT_THEME_COLOR_FALLBACK;+};diff --git a/packages/twenty-ui/src/utilities/index.ts b/packages/twenty-ui/src/utilities/index.tsindex 71c09cc407d..f4e12cc18b0 100644--- a/packages/twenty-ui/src/utilities/index.ts+++ b/packages/twenty-ui/src/utilities/index.ts@@ -17,6 +17,7 @@ export { AnimatedRotate } from './animation/components/AnimatedRotate';export { AnimatedTextWord } from './animation/components/AnimatedTextWord';export { AnimatedTranslation } from './animation/components/AnimatedTranslation';export { getMainColorNameFromPaletteColorName } from './color/utils/getMainColorNameFromPaletteColorName';+export { parseThemeColor } from './color/utils/parseThemeColor';export {stringToThemeColor,stringToThemeColorP3String,