Skip to content

Commit 14a38a4

Browse files
committed
Fix: Unreported per diem expense can be added to workspace chat without per diem
1 parent 1f84728 commit 14a38a4

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

src/pages/AddUnreportedExpense.tsx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import useThemeStyles from '@hooks/useThemeStyles';
1616
import {fetchUnreportedExpenses} from '@libs/actions/UnreportedExpenses';
1717
import interceptAnonymousUser from '@libs/interceptAnonymousUser';
1818
import type {AddUnreportedExpensesParamList} from '@libs/Navigation/types';
19-
import {canSubmitPerDiemExpenseFromWorkspace} from '@libs/PolicyUtils';
19+
import {canSubmitPerDiemExpenseFromWorkspace, getPerDiemCustomUnit} from '@libs/PolicyUtils';
2020
import {shouldRestrictUserBillableActions} from '@libs/SubscriptionUtils';
2121
import {createUnreportedExpenseSections, isPerDiemRequest} from '@libs/TransactionUtils';
2222
import Navigation from '@navigation/Navigation';
@@ -57,7 +57,11 @@ function AddUnreportedExpense({route}: AddUnreportedExpensePageType) {
5757
}
5858

5959
if (isPerDiemRequest(item)) {
60-
return canSubmitPerDiemExpenseFromWorkspace(policy);
60+
// Only show per diem expenses if the target workspace has per diem enabled and the per diem expense was created in the same workspace
61+
const workspacePerDiemUnit = getPerDiemCustomUnit(policy);
62+
const perDiemCustomUnitID = item?.comment?.customUnit?.customUnitID;
63+
64+
return canSubmitPerDiemExpenseFromWorkspace(policy) && (!perDiemCustomUnitID || perDiemCustomUnitID === workspacePerDiemUnit?.customUnitID);
6165
}
6266

6367
return true;

0 commit comments

Comments
 (0)