diff --git a/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx b/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx index b1117091d..e483a6fe5 100644 --- a/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx +++ b/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx @@ -123,7 +123,7 @@ export const HooksCompanyBoardEffect = () => { objectNamePlural: 'companies', filter: { id: { - in: opportunities.map((opportuntiy) => opportuntiy.companyId || ''), + in: opportunities.map((opportunity) => opportunity.companyId || ''), }, }, onCompleted: useCallback((data: PaginatedObjectTypeResults) => { diff --git a/front/src/modules/object-record/hooks/useObjectRecordTable.ts b/front/src/modules/object-record/hooks/useObjectRecordTable.ts index 84106e4be..c056f68e4 100644 --- a/front/src/modules/object-record/hooks/useObjectRecordTable.ts +++ b/front/src/modules/object-record/hooks/useObjectRecordTable.ts @@ -35,7 +35,6 @@ export const useObjectRecordTable = () => { tableFilters, foundObjectMetadataItem?.fields ?? [], ); - const orderBy = turnSortsIntoOrderByV2( tableSorts, foundObjectMetadataItem?.fields ?? [], diff --git a/front/src/modules/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderByV2.ts b/front/src/modules/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderByV2.ts index b8a90a95b..1cd5a1c90 100644 --- a/front/src/modules/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderByV2.ts +++ b/front/src/modules/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderByV2.ts @@ -7,6 +7,11 @@ export const turnSortsIntoOrderByV2 = ( fields: Pick[], ) => { const sortsObject: Record = {}; + if (!sorts.length) { + return { + createdAt: 'DescNullsFirst', + }; + } sorts.forEach((sort) => { const correspondingField = fields.find( (field) => field.id === sort.fieldMetadataId, diff --git a/front/src/utils/convert-currency-amount.ts b/front/src/utils/convert-currency-amount.ts index 4cbabb0e3..b29bbae1c 100644 --- a/front/src/utils/convert-currency-amount.ts +++ b/front/src/utils/convert-currency-amount.ts @@ -1,3 +1,5 @@ +import { isUndefined } from '@sniptt/guards'; + export const convertCurrencyToCurrencyMicros = ( currencyAmount: number | undefined, ) => { @@ -18,13 +20,12 @@ export const convertCurrencyToCurrencyMicros = ( export const convertCurrencyMicrosToCurrency = ( currencyAmountMicros: number | undefined, ) => { - if (!currencyAmountMicros) { + if (isUndefined(currencyAmountMicros)) { return undefined; } const currencyAmountMicrosAsNumber = +currencyAmountMicros; if (isNaN(currencyAmountMicrosAsNumber)) { throw new Error(`Cannot convert ${currencyAmountMicros} to currency`); } - const currencyAmount = currencyAmountMicrosAsNumber / 1000000; - return currencyAmount; + return currencyAmountMicrosAsNumber / 1000000; };