Skip to content
Merged
Changes from all commits
Commits
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/ReportActionsUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,8 @@ function isActionableTrackExpense(reportAction: OnyxInputOrEntry<ReportAction>):
*
*/
function isResolvedActionTrackExpense(reportAction: OnyxEntry<ReportAction>): boolean {
const resolution = reportAction && 'resolution' in reportAction ? reportAction?.resolution : null;
const originalMessage = getOriginalMessage(reportAction);
const resolution = originalMessage && 'resolution' in originalMessage ? originalMessage?.resolution : null;

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Before accessing the 'resolution' in originalMessage, we should have checked the typeof originalMessage, and if it's an object, then we should have accessed the 'resolution'. Directly accessing the 'resolution' causes this crash when we get the system message for exporting to CSV.

return isActionableTrackExpense(reportAction) && !!resolution;
}

Expand Down