Skip to content

Fix - Reports - The "Export" options of an expense report are inconsistent #71188

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
chiragsalian merged 3 commits into from
Sep 30, 2025
Merged

Fix - Reports - The "Export" options of an expense report are inconsistent #71188

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
0f3e679
allow report level export for oneTransactionReports
FitseTLT Sep 23, 2025
4ab9a31
Merge branch 'main' into fix-export-report-level-missing-for-one-tran…
FitseTLT Sep 30, 2025
93fb07b
fix for selectAll case
FitseTLT Sep 30, 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
2 changes: 2 additions & 0 deletions src/components/Search/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ function mapTransactionItemToSelectedEntry(
policyID: item.policyID,
amount: item.modifiedAmount ?? item.amount,
convertedAmount: item.convertedAmount,
isFromOneTransactionReport: item.isFromOneTransactionReport,
convertedCurrency: item.convertedCurrency,
},
];
Expand Down Expand Up @@ -184,6 +185,7 @@ function prepareTransactionsList(
amount: Math.abs(item.modifiedAmount || item.amount),
convertedAmount: item.convertedAmount,
convertedCurrency: item.convertedCurrency,
isFromOneTransactionReport: item.isFromOneTransactionReport,
},
};
}
Expand Down
3 changes: 3 additions & 0 deletions src/components/Search/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ type SelectedTransactionInfo = {

/** The currency that the converted amount is in */
convertedCurrency: string;

/** Whether it is the only expense of the parent expense report */
isFromOneTransactionReport?: boolean;
};

/** Model of selected transactions */
Expand Down
7 changes: 5 additions & 2 deletions src/pages/Search/SearchPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,12 @@ function SearchPage({route}: SearchPageProps) {
const areFullReportsSelected = selectedTransactionReportIDs.length === selectedReportIDs.length && selectedTransactionReportIDs.every((id) => selectedReportIDs.includes(id));
const groupByReports = queryJSON?.groupBy === CONST.SEARCH.GROUP_BY.REPORTS;
const typeInvoice = queryJSON?.type === CONST.REPORT.TYPE.INVOICE;
const typeExpense = queryJSON?.type === CONST.REPORT.TYPE.EXPENSE;
const isAllOneTransactionReport = Object.values(selectedTransactions).every((transaction) => transaction.isFromOneTransactionReport);

// If we're grouping by invoice or report, and all the expenses on the report are selected, include the report level export option
const includeReportLevelExport = (groupByReports || typeInvoice) && areFullReportsSelected;
// If we're grouping by invoice or report, and all the expenses on the report are selected, or if all
// the selected expenses are the only expenses of their parent expense report include the report level export option.
const includeReportLevelExport = ((groupByReports || typeInvoice) && areFullReportsSelected) || (typeExpense && !groupByReports && isAllOneTransactionReport);

// Collate a list of policyIDs from the selected transactions
const selectedPolicyIDs = [
Expand Down
Loading