Skip to content

Commit 6f1fc6d

Browse files
committed
hide categorize whipser message from LHN when category is disabled
1 parent 2e27bf2 commit 6f1fc6d

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/components/LHNOptionsList/LHNOptionsList.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
198198
reportActions,
199199
visibleReportActionsData,
200200
itemOneTransactionThreadReport?.reportID,
201+
itemPolicy,
201202
);
202203

203204
const iouReportIDOfLastAction = getIOUReportIDOfLastAction(item, itemReportNameValuePairs?.private_isArchived, visibleReportActionsData, lastAction);

src/libs/OptionsListUtils/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -619,24 +619,24 @@ function getLastMessageTextForReport({
619619
}): string {
620620
const reportID = report?.reportID;
621621
const canUserPerformWrite = canUserPerformWriteAction(report, isReportArchived);
622-
let lastReportAction = lastAction ?? getLastVisibleAction(reportID, canUserPerformWrite, {}, undefined, visibleReportActionsDataParam);
622+
let lastReportAction = lastAction ?? getLastVisibleAction(reportID, canUserPerformWrite, {}, undefined, visibleReportActionsDataParam, policy);
623623

624624
const transactionThreadReportID = reportID ? cachedOneTransactionThreadReportIDs[reportID] : undefined;
625625

626626
if (reportID && !lastAction && transactionThreadReportID) {
627627
lastReportAction =
628-
getLastVisibleActionIncludingTransactionThread(reportID, canUserPerformWrite, undefined, visibleReportActionsDataParam, transactionThreadReportID) ?? lastReportAction;
628+
getLastVisibleActionIncludingTransactionThread(reportID, canUserPerformWrite, undefined, visibleReportActionsDataParam, transactionThreadReportID, policy) ?? lastReportAction;
629629
}
630630

631631
// Compute lastVisibleMessage before IOU filter — it needs IOU CREATE/TRACK for text extraction.
632-
const lastVisibleMessage = getLastVisibleMessage(report?.reportID, undefined, {}, lastReportAction, visibleReportActionsDataParam);
632+
const lastVisibleMessage = getLastVisibleMessage(report?.reportID, undefined, {}, lastReportAction, visibleReportActionsDataParam, policy);
633633

634634
// For one-transaction reports, filter IOU CREATE/TRACK and fall back to the parent's action (e.g. REPORT_PREVIEW).
635635
if (transactionThreadReportID && lastReportAction && isMoneyRequestAction(lastReportAction)) {
636636
const actionType = getOriginalMessage(lastReportAction)?.type ?? '';
637637
const isSelfDMReport = reportUtilsIsSelfDM(report);
638638
if (actionType === CONST.IOU.REPORT_ACTION_TYPE.CREATE || (!isSelfDMReport && actionType === CONST.IOU.REPORT_ACTION_TYPE.TRACK)) {
639-
const parentLastAction = getLastVisibleAction(reportID, canUserPerformWrite, {}, undefined, visibleReportActionsDataParam);
639+
const parentLastAction = getLastVisibleAction(reportID, canUserPerformWrite, {}, undefined, visibleReportActionsDataParam, policy);
640640
if (parentLastAction && isMoneyRequestAction(parentLastAction)) {
641641
const parentActionType = getOriginalMessage(parentLastAction)?.type ?? '';
642642
if (parentActionType === CONST.IOU.REPORT_ACTION_TYPE.CREATE || (!isSelfDMReport && parentActionType === CONST.IOU.REPORT_ACTION_TYPE.TRACK)) {

0 commit comments

Comments
 (0)