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

Invoice report name ND and OD formats #56048

Merged
merged 12 commits into from
Feb 5, 2025
Merged

Invoice report name ND and OD formats #56048

Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c5cdd19
Refactor invoice report name generation to include the current date
rezkiy37 Jan 30, 2025
8a8a835
Merge branch 'main' of https://github.com/rezkiy37/Expensify into fix…
rezkiy37 Jan 30, 2025
bf4bbfc
create isNewDotInvoice
rezkiy37 Jan 30, 2025
0d4ff8e
update isNewDotInvoice function to accept invoiceRoomID as parameter
rezkiy37 Jan 30, 2025
edb48d8
integrate isNewDotInvoice
rezkiy37 Jan 30, 2025
fb1e21b
revert reportName of buildOptimisticInvoiceReport
rezkiy37 Jan 30, 2025
bc93838
clear
rezkiy37 Jan 30, 2025
bd9a846
Merge branch 'main' of https://github.com/rezkiy37/Expensify into fix…
rezkiy37 Jan 31, 2025
1226565
Merge branch 'main' of https://github.com/rezkiy37/Expensify into fix…
rezkiy37 Feb 3, 2025
efd928d
Merge branch 'main' of https://github.com/rezkiy37/Expensify into fix…
rezkiy37 Feb 4, 2025
1dd1ac2
DEV: animated scroll
rezkiy37 Feb 5, 2025
df6d351
rename variable for clarity in report name formatting
rezkiy37 Feb 5, 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
13 changes: 12 additions & 1 deletion src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,6 +1090,14 @@ function isInvoiceReport(report: OnyxInputOrEntry<Report> | SearchReport): boole
return report?.type === CONST.REPORT.TYPE.INVOICE;
}

function isNewDotInvoice(invoiceRoomID: string | undefined): boolean {
if (!invoiceRoomID) {
return false;
}

return isInvoiceRoom(getReport(invoiceRoomID, allReports));
}

/**
* Checks if a report is an Expense report.
*/
Expand Down Expand Up @@ -4487,7 +4495,9 @@ function getReportNameInternal({
}

if (isInvoiceReport(report)) {
formattedName = report?.reportName ?? getMoneyRequestReportName({report, policy, invoiceReceiverPolicy});
const moneyRequestReportName = getMoneyRequestReportName({report, policy, invoiceReceiverPolicy});
const ODInvoiceName = report?.reportName ?? moneyRequestReportName;
formattedName = isNewDotInvoice(report?.chatReportID) ? moneyRequestReportName : ODInvoiceName;
}

if (isInvoiceRoom(report)) {
Expand Down Expand Up @@ -9376,6 +9386,7 @@ export {
isInvoiceRoom,
isInvoiceRoomWithID,
isInvoiceReport,
isNewDotInvoice,
isOpenInvoiceReport,
getDefaultNotificationPreferenceForReport,
canWriteInReport,
Expand Down
Loading