Skip to content

[FIX] Track expense - Concierge message appears in self DM after deleting track expense #55895

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
pecanoro merged 4 commits into from
Jan 29, 2025
Merged

[FIX] Track expense - Concierge message appears in self DM after deleting track expense #55895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a2adaa
fixes the issue
ishpaul777 Jan 28, 2025
a5a3586
add comment for change
ishpaul777 Jan 28, 2025
8a133e1
fix as per suggestion
ishpaul777 Jan 29, 2025
1d83866
remove export
ishpaul777 Jan 29, 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
12 changes: 11 additions & 1 deletion src/libs/ReportActionsUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -671,6 +671,16 @@ function isActionableWhisper(
const {POLICY_CHANGE_LOG: policyChangelogTypes, ROOM_CHANGE_LOG: roomChangeLogTypes, ...otherActionTypes} = CONST.REPORT.ACTIONS.TYPE;
const supportedActionTypes: ReportActionName[] = [...Object.values(otherActionTypes), ...Object.values(policyChangelogTypes), ...Object.values(roomChangeLogTypes)];

/**
* Checks whether an action is actionable track expense and resolved.
*
*/
function isResolvedActionableWhisper(reportAction: OnyxEntry<ReportAction>): boolean {
const originalMessage = getOriginalMessage(reportAction);
const resolution = originalMessage && typeof originalMessage === 'object' && 'resolution' in originalMessage ? originalMessage?.resolution : null;
return !!resolution;
}

/**
* Checks if a reportAction is fit for display, meaning that it's not deprecated, is of a valid
* and supported type, it's not deleted and also not closed.
Expand Down Expand Up @@ -720,7 +730,7 @@ function shouldReportActionBeVisible(reportAction: OnyxEntry<ReportAction>, key:
}

// If action is actionable whisper and resolved by user, then we don't want to render anything
if (isActionableWhisper(reportAction) && getOriginalMessage(reportAction)?.resolution) {
if (isActionableWhisper(reportAction) && isResolvedActionableWhisper(reportAction)) {
return false;
}

Expand Down
1 change: 1 addition & 0 deletions src/pages/home/ReportScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,7 @@ function ReportScreen({route, navigation}: ReportScreenProps) {
const isSingleInvoiceReport = isInvoiceReport(report) && isMostRecentReportIOU && isSingleIOUReportAction;
const shouldShowMostRecentReportAction =
!!mostRecentReportAction &&
shouldReportActionBeVisible(mostRecentReportAction, mostRecentReportAction.reportActionID, canUserPerformWriteAction(report)) &&
!isSingleExpenseReport &&
!isSingleInvoiceReport &&
!isActionOfType(mostRecentReportAction, CONST.REPORT.ACTIONS.TYPE.CREATED) &&
Expand Down