Skip to content

Commit

Permalink
Merge pull request #55867 from Expensify/alberto-cents
Browse files Browse the repository at this point in the history
Pass rates in cents when importing Per diem
  • Loading branch information
MarioExpensify authored Jan 28, 2025
2 parents cf88e09 + 4c1916e commit 3b90d39
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/pages/workspace/perDiem/ImportedPerDiemPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
import useLocalize from '@hooks/useLocalize';
import usePolicy from '@hooks/usePolicy';
import {closeImportPage} from '@libs/actions/ImportSpreadsheet';
import * as PerDiem from '@libs/actions/Policy/PerDiem';
import {generateCustomUnitID, importPerDiemRates} from '@libs/actions/Policy/PerDiem';
import {sanitizeCurrencyCode} from '@libs/CurrencyUtils';
import {findDuplicate, generateColumnNames} from '@libs/importSpreadsheetUtils';
import Navigation from '@libs/Navigation/Navigation';
Expand All @@ -35,9 +35,9 @@ function generatePerDiemUnits(perDiemDestination: string[], perDiemSubRate: stri
subRates: [],
};
perDiemUnits[perDiemDestination[i]].subRates?.push({
id: PerDiem.generateCustomUnitID(),
id: generateCustomUnitID(),
name: perDiemSubRate.at(i) ?? '',
rate: Number(perDiemAmount.at(i)) ?? 0,
rate: (Number(perDiemAmount.at(i)) ?? 0) * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET,
});
}
return Object.values(perDiemUnits);
Expand Down Expand Up @@ -95,7 +95,7 @@ function ImportedPerDiemPage({route}: ImportedPerDiemPageProps) {
return errors;
}, [requiredColumns, spreadsheet?.columns, translate, columnRoles]);

const importPerDiemRates = useCallback(() => {
const importRates = useCallback(() => {
setIsValidationEnabled(true);
const errors = validate();
if (Object.keys(errors).length > 0 || !perDiemCustomUnit?.customUnitID) {
Expand All @@ -122,7 +122,7 @@ function ImportedPerDiemPage({route}: ImportedPerDiemPageProps) {

if (perDiemUnits) {
setIsImportingPerDiemRates(true);
PerDiem.importPerDiemRates(policyID, perDiemCustomUnit.customUnitID, perDiemUnits, rowsLength);
importPerDiemRates(policyID, perDiemCustomUnit.customUnitID, perDiemUnits, rowsLength);
}
}, [validate, spreadsheet?.columns, spreadsheet?.data, containsHeader, policyID, perDiemCustomUnit?.customUnitID]);

Expand All @@ -149,7 +149,7 @@ function ImportedPerDiemPage({route}: ImportedPerDiemPageProps) {
<ImportSpreadsheetColumns
spreadsheetColumns={spreadsheetColumns}
columnNames={columnNames}
importFunction={importPerDiemRates}
importFunction={importRates}
errors={isValidationEnabled ? validate() : undefined}
columnRoles={columnRoles}
isButtonLoading={isImportingPerDiemRates}
Expand Down

0 comments on commit 3b90d39

Please sign in to comment.