diff --git a/src/libs/actions/OnyxDerived/configs/cardFeedErrors.ts b/src/libs/actions/OnyxDerived/configs/cardFeedErrors.ts index dcc020035351..fba783d4f862 100644 --- a/src/libs/actions/OnyxDerived/configs/cardFeedErrors.ts +++ b/src/libs/actions/OnyxDerived/configs/cardFeedErrors.ts @@ -1,5 +1,5 @@ import {getCombinedCardFeedsFromAllFeeds, getWorkspaceCardFeedsStatus} from '@libs/CardFeedUtils'; -import {filterInactiveCards, getCardFeedWithDomainID, isBrokenConnectionPastDismissThreshold, isCardConnectionBroken, isPersonalCard} from '@libs/CardUtils'; +import {filterAllInactiveCards, forEachAssignedCard, getCardFeedWithDomainID, isBrokenConnectionPastDismissThreshold, isCardConnectionBroken, isPersonalCard} from '@libs/CardUtils'; import createOnyxDerivedValueConfig from '@userActions/OnyxDerived/createOnyxDerivedValueConfig'; @@ -172,7 +172,8 @@ export default createOnyxDerivedValueConfig({ } } - for (const [key, workspaceCardFeedCards] of Object.entries(allWorkspaceCards ?? {})) { + const workspaceCards = allWorkspaceCards ?? {}; + for (const key of Object.keys(workspaceCards)) { const keyParts = key.split(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST); const workspaceCardParamParts = keyParts.at(1)?.split('_'); @@ -180,10 +181,7 @@ export default createOnyxDerivedValueConfig({ continue; } - const {cardList, ...filteredCards} = filterInactiveCards(workspaceCardFeedCards); - for (const card of Object.values(filteredCards)) { - addErrorsForCard(card); - } + forEachAssignedCard(filterAllInactiveCards(workspaceCards[key]), addErrorsForCard); } allFeedsState.shouldShowRBR = getShouldShowRBR(allFeedsState); diff --git a/src/libs/actions/OnyxDerived/configs/reportAttributes.ts b/src/libs/actions/OnyxDerived/configs/reportAttributes.ts index c1c8f9d28268..e57bc4b8d51d 100644 --- a/src/libs/actions/OnyxDerived/configs/reportAttributes.ts +++ b/src/libs/actions/OnyxDerived/configs/reportAttributes.ts @@ -72,8 +72,8 @@ const displayNameSignature = (details: PersonalDetails | null): string => JSON.s const snapshotDisplayNames = (personalDetails: PersonalDetailsList): Record => { const snapshot: Record = {}; - for (const [key, value] of Object.entries(personalDetails)) { - snapshot[key] = displayNameSignature(value); + for (const key of Object.keys(personalDetails)) { + snapshot[key] = displayNameSignature(personalDetails[key]); } return snapshot; }; @@ -112,8 +112,8 @@ const getDisplayNameChanges = (personalDetails: OnyxEntry): const changedAccountIDs = new Set(); // Build the new snapshot and compare it against the old one in the same loop. - for (const [key, value] of Object.entries(personalDetails)) { - const signature = displayNameSignature(value); + for (const key of Object.keys(personalDetails)) { + const signature = displayNameSignature(personalDetails[key]); nextSnapshot[key] = signature; if (hadBaseline && signature !== previousDisplayNames[key]) { changedAccountIDs.add(Number(key)); @@ -269,7 +269,8 @@ export default createOnyxDerivedValueConfig({ } } if (changedPolicyIDs.size > 0) { - for (const [reportKey, report] of Object.entries(reports ?? {})) { + for (const reportKey of Object.keys(reports ?? {})) { + const report = reports?.[reportKey]; if (!report) { continue; } @@ -332,7 +333,8 @@ export default createOnyxDerivedValueConfig({ // locale change); in that case useIncrementalUpdates is false and the full scan below handles it. const personalDetailsChangedReportKeys: string[] = []; if (displayNameChanges instanceof Set && useIncrementalUpdates) { - for (const [reportKey, report] of Object.entries(reports)) { + for (const reportKey of Object.keys(reports)) { + const report = reports[reportKey]; if (report && reportReferencesAccountIDs(report, displayNameChanges)) { personalDetailsChangedReportKeys.push(reportKey); } @@ -417,9 +419,13 @@ export default createOnyxDerivedValueConfig({ } if (policyTagsUpdates) { const changedPolicyIDs = new Set(Object.keys(policyTagsUpdates).map((key) => key.replace(ONYXKEYS.COLLECTION.POLICY_TAGS, ''))); - const affectedReportKeys = Object.values(reports) - .filter((report) => !!report?.policyID && changedPolicyIDs.has(report.policyID)) - .map((report) => `${ONYXKEYS.COLLECTION.REPORT}${report?.reportID}`); + const affectedReportKeys: string[] = []; + for (const report of Object.values(reports)) { + if (!report?.policyID || !changedPolicyIDs.has(report.policyID)) { + continue; + } + affectedReportKeys.push(`${ONYXKEYS.COLLECTION.REPORT}${report.reportID}`); + } dataToIterate.push(...prepareReportKeys(affectedReportKeys)); } } else { diff --git a/src/libs/actions/OnyxDerived/configs/sortedReportActions.ts b/src/libs/actions/OnyxDerived/configs/sortedReportActions.ts index f63ffbaca945..3386d9a8d4a3 100644 --- a/src/libs/actions/OnyxDerived/configs/sortedReportActions.ts +++ b/src/libs/actions/OnyxDerived/configs/sortedReportActions.ts @@ -91,7 +91,8 @@ export default createOnyxDerivedValueConfig({ const lastActions: SortedReportActionsDerivedValue['lastActions'] = {}; const transactionThreadIDs: SortedReportActionsDerivedValue['transactionThreadIDs'] = {}; - for (const [key, actions] of Object.entries(allReportActions)) { + for (const key of Object.keys(allReportActions)) { + const actions = allReportActions[key]; if (!actions) { continue; } diff --git a/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts b/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts index d3512c5415da..420b58fed6e2 100644 --- a/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts +++ b/src/libs/actions/OnyxDerived/configs/visibleReportActions.ts @@ -55,7 +55,8 @@ export default createOnyxDerivedValueConfig({ if (sessionUpdates) { const result: VisibleReportActionsDerivedValue = {}; - for (const [reportActionsKey, reportActions] of Object.entries(allReportActions)) { + for (const reportActionsKey of Object.keys(allReportActions)) { + const reportActions = allReportActions[reportActionsKey]; if (!reportActions) { continue; } @@ -63,7 +64,8 @@ export default createOnyxDerivedValueConfig({ const reportID = reportActionsKey.replace(ONYXKEYS.COLLECTION.REPORT_ACTIONS, ''); const reportVisibility = getOrCreateReportVisibilityRecord(result, reportID, clonedReportIDs); - for (const [actionID, action] of Object.entries(reportActions)) { + for (const actionID of Object.keys(reportActions)) { + const action = reportActions[actionID]; if (action) { if (actionID !== action.reportActionID) { continue;