scottk/twenty
1
0
Fork 0
mirror of https://github.com/lingble/twenty.git synced 2025-10-30 12:22:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix currency input (#7469)

Browse Source 
Fix https://github.com/twentyhq/twenty/issues/7458
This commit is contained in:
Thomas Trompette
2024-10-07 15:00:47 +02:00
committed by GitHub
parent ce676f699d
commit b5d1486830
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
View File

@@ -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 { SETTINGS_FIELD_CURRENCY_CODES } from '@/settings/data-model/constants/SettingsFieldCurrencyCodes';
import { formatAmount } from '~/utils/format/formatAmount'; import { formatAmount } from '~/utils/format/formatAmount';
import { isDefined } from '~/utils/isDefined'; import { isDefined } from '~/utils/isDefined';
import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
type CurrencyDisplayProps = { type CurrencyDisplayProps = {
currencyValue: FieldCurrencyValue | null | undefined; currencyValue: FieldCurrencyValue | null | undefined;
@@ -29,10 +30,9 @@ export const CurrencyDisplay = ({ currencyValue }: CurrencyDisplayProps) => {
? SETTINGS_FIELD_CURRENCY_CODES[currencyValue?.currencyCode]?.Icon ? SETTINGS_FIELD_CURRENCY_CODES[currencyValue?.currencyCode]?.Icon
: null; : null;
const amountToDisplay = const amountToDisplay = isUndefinedOrNull(currencyValue?.amountMicros)
currencyValue?.amountMicros != null ? null
? currencyValue?.amountMicros / 1000000 : currencyValue?.amountMicros / 1000000;
: null;
if (!shouldDisplayCurrency) { if (!shouldDisplayCurrency) {
return <StyledEllipsisDisplay>{0}</StyledEllipsisDisplay>; return <StyledEllipsisDisplay>{0}</StyledEllipsisDisplay>;

1
packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
View File

@@ -144,6 +144,7 @@ export const CurrencyInput = ({
placeholder={placeholder} placeholder={placeholder}
autoFocus={autoFocus} autoFocus={autoFocus}
value={value} value={value}
unmask
/> />
</StyledContainer> </StyledContainer>
); );

4
packages/twenty-server/src/engine/utils/should-seed-workspace-favorite.ts
View File

@@ -5,5 +5,5 @@ export const shouldSeedWorkspaceFavorite = (
objectMetadataMap, objectMetadataMap,
): boolean => ): boolean =>
objectMetadataId !== objectMetadataId !==
objectMetadataMap[STANDARD_OBJECT_IDS.workflowVersion].id && objectMetadataMap[STANDARD_OBJECT_IDS.workflowVersion]?.id &&
objectMetadataId !== objectMetadataMap[STANDARD_OBJECT_IDS.workflowRun].id; objectMetadataId !== objectMetadataMap[STANDARD_OBJECT_IDS.workflowRun]?.id;