Skip to content

Fix showing of billable column when policy exists but defaultBillable isn't present #79421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JS00001 merged 3 commits into from
Jan 13, 2026
Merged

Fix showing of billable column when policy exists but defaultBillable isn't present #79421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c45285
Fix showing of billable column when policy exists but disabledFields …
ShridharGoel Jan 13, 2026
82a2c3c
Update to include coroporate policy condition
ShridharGoel Jan 13, 2026
b3e62e2
Update to check paid group policy
ShridharGoel Jan 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/libs/MoneyRequestReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import type {TransactionListItemType} from '@components/SelectionListWithSection
import CONST from '@src/CONST';
import type {OriginalMessageIOU, Policy, Report, ReportAction, ReportMetadata, Transaction} from '@src/types/onyx';
import {convertToDisplayString} from './CurrencyUtils';
import {isPaidGroupPolicy} from './PolicyUtils';
import {getIOUActionForTransactionID, getOriginalMessage, isDeletedAction, isDeletedParentAction, isMoneyRequestAction} from './ReportActionsUtils';
import {
getMoneyRequestSpendBreakdown,
Expand All @@ -19,7 +20,7 @@ import {
import {getReimbursable, isTransactionPendingDelete} from './TransactionUtils';

function isBillableEnabledOnPolicy(policy: Policy | OnyxEntry<Policy> | undefined): boolean {
return !!policy && policy.disabledFields?.defaultBillable !== true;
return !!policy && isPaidGroupPolicy(policy) && policy.disabledFields?.defaultBillable !== true;
}

function hasNonReimbursableTransactions(transactions: Transaction[]): boolean {
Expand Down
18 changes: 14 additions & 4 deletions tests/unit/MoneyRequestReportUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,23 @@ describe('MoneyRequestReportUtils', () => {
expect(isBillableEnabledOnPolicy(undefined)).toBe(false);
});

test('returns true when defaultBillable is not disabled', () => {
const policy = {disabledFields: {defaultBillable: false}} as unknown as Policy;
test('returns true when policy is paid group and defaultBillable is enabled', () => {
const policy = {type: CONST.POLICY.TYPE.TEAM, disabledFields: {defaultBillable: false}} as unknown as Policy;
expect(isBillableEnabledOnPolicy(policy)).toBe(true);
});

test('returns false when defaultBillable is disabled', () => {
const policy = {disabledFields: {defaultBillable: true}} as unknown as Policy;
test('returns true when policy is paid group and defaultBillable is missing', () => {
const policy = {type: CONST.POLICY.TYPE.CORPORATE, disabledFields: {}} as unknown as Policy;
expect(isBillableEnabledOnPolicy(policy)).toBe(true);
});

test('returns false when policy is paid group and defaultBillable is disabled', () => {
const policy = {type: CONST.POLICY.TYPE.TEAM, disabledFields: {defaultBillable: true}} as unknown as Policy;
expect(isBillableEnabledOnPolicy(policy)).toBe(false);
});

test('returns false when policy is non-paid group', () => {
const policy = {type: CONST.POLICY.TYPE.PERSONAL, disabledFields: {defaultBillable: false}} as unknown as Policy;
expect(isBillableEnabledOnPolicy(policy)).toBe(false);
});
});
Expand Down
Loading