Skip to content
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

Hide Split Expense from trip rooms #55735

Merged
merged 5 commits into from
Jan 27, 2025
Merged

Hide Split Expense from trip rooms #55735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fab48a4
Hide Split Expense from trip rooms
blazejkustra Jan 24, 2025
c0fedd1
Update comment
blazejkustra Jan 24, 2025
e376263
Add unit test
blazejkustra Jan 27, 2025
ac17197
Merge branch 'main' into fix/trip-hide-split-expenses
blazejkustra Jan 27, 2025
7d05620
Merge branch 'main' into fix/trip-hide-split-expenses
blazejkustra Jan 27, 2025
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
4 changes: 2 additions & 2 deletions src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7305,8 +7305,8 @@ function isGroupChatAdmin(report: OnyxEntry<Report>, accountID: number) {
* as a participant of the report.
*/
function getMoneyRequestOptions(report: OnyxEntry<Report>, policy: OnyxEntry<Policy>, reportParticipants: number[], filterDeprecatedTypes = false): IOUType[] {
// In any thread or task report, we do not allow any new expenses yet
if (isChatThread(report) || isTaskReport(report) || isInvoiceReport(report) || isSystemChat(report) || isArchivedReportWithID(report?.reportID)) {
// In any thread, task report or trip room, we do not allow any new expenses
if (isChatThread(report) || isTaskReport(report) || isInvoiceReport(report) || isSystemChat(report) || isArchivedReportWithID(report?.reportID) || isTripRoom(report)) {
return [];
}

Expand Down
10 changes: 10 additions & 0 deletions tests/unit/ReportUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,16 @@ describe('ReportUtils', () => {
expect(moneyRequestOptions.length).toBe(0);
});

it('its trip room', () => {
const report = {
...LHNTestUtils.getFakeReport(),
type: CONST.REPORT.TYPE.CHAT,
chatType: CONST.REPORT.CHAT_TYPE.TRIP_ROOM,
};
const moneyRequestOptions = temporary_getMoneyRequestOptions(report, undefined, [currentUserAccountID]);
expect(moneyRequestOptions.length).toBe(0);
});

it('its paid Expense report', () => {
const report = {
...LHNTestUtils.getFakeReport(),
Expand Down
Loading