diff --git a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx index 3fbb5960f2de..f2af5ae75803 100644 --- a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx +++ b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx @@ -5,6 +5,7 @@ import { FieldCurrencyValue } from '@/object-record/record-field/types/FieldMeta import { SETTINGS_FIELD_CURRENCY_CODES } from '@/settings/data-model/constants/SettingsFieldCurrencyCodes'; import { formatAmount } from '~/utils/format/formatAmount'; import { isDefined } from '~/utils/isDefined'; +import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull'; type CurrencyDisplayProps = { currencyValue: FieldCurrencyValue | null | undefined; @@ -29,10 +30,9 @@ export const CurrencyDisplay = ({ currencyValue }: CurrencyDisplayProps) => { ? SETTINGS_FIELD_CURRENCY_CODES[currencyValue?.currencyCode]?.Icon : null; - const amountToDisplay = - currencyValue?.amountMicros != null - ? currencyValue?.amountMicros / 1000000 - : null; + const amountToDisplay = isUndefinedOrNull(currencyValue?.amountMicros) + ? null + : currencyValue?.amountMicros / 1000000; if (!shouldDisplayCurrency) { return {0}; diff --git a/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx index a25fe10cacc6..052f47954202 100644 --- a/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx +++ b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx @@ -144,6 +144,7 @@ export const CurrencyInput = ({ placeholder={placeholder} autoFocus={autoFocus} value={value} + unmask /> ); diff --git a/packages/twenty-server/src/engine/utils/should-seed-workspace-favorite.ts b/packages/twenty-server/src/engine/utils/should-seed-workspace-favorite.ts index ae7d9b6ff9f3..9668a7a4eda4 100644 --- a/packages/twenty-server/src/engine/utils/should-seed-workspace-favorite.ts +++ b/packages/twenty-server/src/engine/utils/should-seed-workspace-favorite.ts @@ -5,5 +5,5 @@ export const shouldSeedWorkspaceFavorite = ( objectMetadataMap, ): boolean => objectMetadataId !== - objectMetadataMap[STANDARD_OBJECT_IDS.workflowVersion].id && - objectMetadataId !== objectMetadataMap[STANDARD_OBJECT_IDS.workflowRun].id; + objectMetadataMap[STANDARD_OBJECT_IDS.workflowVersion]?.id && + objectMetadataId !== objectMetadataMap[STANDARD_OBJECT_IDS.workflowRun]?.id;