Skip to content

Commit e24235d

Browse files
luacmartinsOSBotify
authored andcommitted
Merge pull request #43226 from Expensify/camrtins-fixCustomunitCrash
[CP Staging] Fix crash when submitting expense on a newly created workspace (cherry picked from commit 69863d5)
1 parent 0459e9f commit e24235d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/libs/DistanceRequestUtils.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function getMileageRates(policy: OnyxEntry<Policy>, includeDisabledRates = false
5252
}
5353

5454
Object.entries(distanceUnit.rates).forEach(([rateID, rate]) => {
55-
if (!includeDisabledRates && !rate.enabled) {
55+
if (!includeDisabledRates && rate.enabled === false) {
5656
return;
5757
}
5858

@@ -89,7 +89,7 @@ function getDefaultMileageRate(policy: OnyxEntry<Policy> | EmptyObject): Mileage
8989
}
9090
const mileageRates = getMileageRates(policy);
9191

92-
const distanceRate = Object.values(mileageRates).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE) ?? Object.values(mileageRates)[0];
92+
const distanceRate = Object.values(mileageRates).find((rate) => rate.name === CONST.CUSTOM_UNITS.DEFAULT_RATE) ?? Object.values(mileageRates)[0] ?? {};
9393

9494
return {
9595
customUnitRateID: distanceRate.customUnitRateID,

src/libs/actions/Policy/Policy.ts

+1
Original file line numberDiff line numberDiff line change
@@ -2000,6 +2000,7 @@ function buildOptimisticCustomUnits(): OptimisticCustomUnits {
20002000
customUnitRateID,
20012001
name: CONST.CUSTOM_UNITS.DEFAULT_RATE,
20022002
rate: CONST.CUSTOM_UNITS.MILEAGE_IRS_RATE * CONST.POLICY.CUSTOM_UNIT_RATE_BASE_OFFSET,
2003+
enabled: true,
20032004
currency,
20042005
},
20052006
},

0 commit comments

Comments
 (0)