Skip to content

Fix double-computation of requiresAttentionFromCurrentUser in LHN filter loop #84005

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
NikkiWines merged 7 commits into from
Mar 19, 2026
Merged

Fix double-computation of requiresAttentionFromCurrentUser in LHN filter loop #84005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1d554ee
skip requiresAttentionFromCurrentUser recomputation when pre-computed…
sosek108 Mar 3, 2026
a098f5f
extract requiresAttention to variable to avoid double lookup
sosek108 Mar 3, 2026
209c16e
Merge remote-tracking branch 'refs/remotes/exfy/main' into fix/lhn-re…
sosek108 Mar 6, 2026
771dbc0
Merge remote-tracking branch 'refs/remotes/exfy/main' into fix/lhn-re…
sosek108 Mar 9, 2026
dc41d99
make reportAttributes required parameter
sosek108 Mar 9, 2026
98d7c99
Merge remote-tracking branch 'refs/remotes/exfy/main' into fix/lhn-re…
sosek108 Mar 10, 2026
c23f7ac
prettier fix
sosek108 Mar 10, 2026
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
5 changes: 4 additions & 1 deletion src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,7 @@
};

let conciergeReportIDOnyxConnect: OnyxEntry<string>;
Onyx.connect({

Check warning on line 1024 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.CONCIERGE_REPORT_ID,
callback: (value) => {
conciergeReportIDOnyxConnect = value;
Expand All @@ -1029,7 +1029,7 @@
});

const defaultAvatarBuildingIconTestID = 'SvgDefaultAvatarBuilding Icon';
Onyx.connect({

Check warning on line 1032 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.SESSION,
callback: (value) => {
// When signed out, val is undefined
Expand All @@ -1047,7 +1047,7 @@
let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
let allPersonalDetailLogins: string[];
let currentUserPersonalDetails: OnyxEntry<PersonalDetails>;
Onyx.connect({

Check warning on line 1050 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.PERSONAL_DETAILS_LIST,
callback: (value) => {
if (currentUserAccountID) {
Expand All @@ -1059,7 +1059,7 @@
});

let allReportsDraft: OnyxCollection<Report>;
Onyx.connect({

Check warning on line 1062 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT_DRAFT,
waitForCollectionCallback: true,
callback: (value) => (allReportsDraft = value),
Expand All @@ -1067,7 +1067,7 @@

let allPolicies: OnyxCollection<Policy>;
let policiesArray: Policy[] = [];
Onyx.connect({

Check warning on line 1070 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.POLICY,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -1077,7 +1077,7 @@
});

let allPolicyDrafts: OnyxCollection<Policy>;
Onyx.connect({

Check warning on line 1080 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.POLICY_DRAFTS,
waitForCollectionCallback: true,
callback: (value) => (allPolicyDrafts = value),
Expand All @@ -1085,7 +1085,7 @@

let allReports: OnyxCollection<Report>;
let reportsByPolicyID: ReportByPolicyMap;
Onyx.connect({

Check warning on line 1088 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT,
waitForCollectionCallback: true,
callback: (value) => {
Expand Down Expand Up @@ -1121,14 +1121,14 @@
});

let betaConfiguration: OnyxEntry<BetaConfiguration> = {};
Onyx.connect({

Check warning on line 1124 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.BETA_CONFIGURATION,
callback: (value) => (betaConfiguration = value ?? {}),
});

let allTransactions: OnyxCollection<Transaction> = {};
let reportsTransactions: Record<string, Transaction[]> = {};
Onyx.connect({

Check warning on line 1131 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -1154,7 +1154,7 @@
});

let allReportActions: OnyxCollection<ReportActions>;
Onyx.connect({

Check warning on line 1157 in src/libs/ReportUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
waitForCollectionCallback: true,
callback: (actions) => {
Expand Down Expand Up @@ -9407,6 +9407,8 @@
includeDomainEmail?: boolean;
isReportArchived: boolean | undefined;
draftComment: string | undefined;
/** Pre-computed value from reportAttributes derived value. When provided, skips the expensive requiresAttentionFromCurrentUser recomputation. */
requiresAttention?: boolean;
Copy link
Contributor

@shubham1206agra shubham1206agra Mar 8, 2026

Choose a reason for hiding this comment

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

@sosek108 Can you make this a required parameter? This will help us remove null check from below. NAB but it's good to have.

Copy link
Contributor Author

@sosek108 sosek108 Mar 9, 2026

Choose a reason for hiding this comment

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

we want to have this optional as a fallback. And the check below is important so we know if we need to recompute this value.

};

function reasonForReportToBeInOptionList({
Expand All @@ -9422,6 +9424,7 @@
login,
includeDomainEmail = false,
isReportArchived,
requiresAttention,
}: ShouldReportBeInOptionListParams): ValueOf<typeof CONST.REPORT_IN_LHN_REASONS> | null {
const isInDefaultMode = !isInFocusMode;

Expand Down Expand Up @@ -9502,7 +9505,7 @@
return CONST.REPORT_IN_LHN_REASONS.HAS_DRAFT_COMMENT;
}

if (requiresAttentionFromCurrentUser(report, undefined, isReportArchived)) {
if (requiresAttention ?? requiresAttentionFromCurrentUser(report, undefined, isReportArchived)) {
Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot Mar 6, 2026

Choose a reason for hiding this comment

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

P1 Badge Recompute attention when cached flag can be stale

Using requiresAttention ?? ... makes a cached false value authoritative, but the derived reportAttributes cache is not refreshed for policy-only changes (reportAttributes compute builds updates from report/reportAction/transaction keys and returns early when only POLICY changes). Since requiresAttentionFromCurrentUser() depends on getPolicy(...).reimbursementChoice, a workspace reimbursement setting change can make a report actionable while requiresAttention remains stale false, and this branch will now suppress it from LHN/GSD instead of recalculating.

Useful? React with 👍 / 👎.

Copy link
Contributor Author

@sosek108 sosek108 Mar 6, 2026

Choose a reason for hiding this comment

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

I'm checking this

Copy link
Contributor Author

@sosek108 sosek108 Mar 9, 2026

Choose a reason for hiding this comment

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

Actually the problem is not in this file, but in reportAttributes.ts. The mentioned derived value has policies on their dependency list, but never recompute these values when anything in policy change.

@sobitneupane @shubham1206agra do you think I should modify reportAttributes.ts?

Copy link
Contributor

@shubham1206agra shubham1206agra Mar 9, 2026

Choose a reason for hiding this comment

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

@sosek108 Can you put this in #quality channel with impact so we can discuss this?

return CONST.REPORT_IN_LHN_REASONS.HAS_GBR;
}

Expand Down
4 changes: 3 additions & 1 deletion src/libs/SidebarUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ function shouldDisplayReportInLHN(
}

// Check if report should override hidden status
const requiresAttention = reportAttributes?.[report?.reportID]?.requiresAttention;
const isSystemChat = isSystemChatUtil(report);
const shouldOverrideHidden =
!!draftComment ||
Expand All @@ -257,7 +258,7 @@ function shouldDisplayReportInLHN(
isSystemChat ||
!!report.isPinned ||
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
reportAttributes?.[report?.reportID]?.requiresAttention ||
requiresAttention ||
(report.isOwnPolicyExpenseChat && !isReportArchived);

if (isHidden && !shouldOverrideHidden) {
Expand All @@ -276,6 +277,7 @@ function shouldDisplayReportInLHN(
draftComment,
includeSelfDM: true,
isReportArchived,
requiresAttention,
});

return {shouldDisplay};
Expand Down
Loading