Skip to content

Move ONYXKEYS.DERIVED.FLAGGED_EXPENSES into custom hook#94299

Merged
cristipaval merged 14 commits into
Expensify:mainfrom
callstack-internal:perf/remove-flaggedExpenses
Jul 1, 2026
Merged

Move ONYXKEYS.DERIVED.FLAGGED_EXPENSES into custom hook#94299
cristipaval merged 14 commits into
Expensify:mainfrom
callstack-internal:perf/remove-flaggedExpenses

Conversation

@LukasMod

@LukasMod LukasMod commented Jun 23, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Removes the flaggedExpenses Onyx derived value and moves its logic into useReviewFlaggedExpenses, the only place that used it.

The derived value ran app-wide for the entire session, rescanning all transactions on every change to the report/transaction/violation/policy collections, just to power one row on Home. Now that scan runs only while Home is mounted.

No behavior change - the "Review X expenses" row works exactly as before.


Additionally on Web, the Home tab stays mounted and reactive underneath the Inbox so I guarded flaggedExpenses recalculations with useIsHomeTabFocused

Fixed Issues

$ #94317
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Prerequisites: an employee account on a paid policy that flags expenses (e.g. categories required); access to two workspaces; This is a no-behavior-change refactor, so every result should match current production. I attached web video only as this change is more onyx-react related then platform specific.

Test 1: Review row appears with correct count

Prerequisite: create two expenses on Draft (OPEN) reports across two different workspaces, each with a missing-category violation.

  1. Open Home and look at the For you section.
  2. Confirm a "Review 2 expenses" row is shown.
  3. Confirm it sits above the Submit/Approve/Pay/Export rows.
  4. Confirm it uses the exclamation/receipt icon and a red Begin button.

Test 2: Begin opens the first flagged expense (wide layout)

Prerequisite: at least two flagged expenses on Draft reports; viewing on a wide screen.

  1. On Home, press Begin on the Review row.
  2. Confirm the first flagged expense's transaction thread opens in the RHP.
  3. Confirm the review carousel lets you page through all flagged expenses.
  4. Confirm closing/back returns to Home.

Test 3: Begin opens the first flagged expense (narrow layout)

Prerequisite: at least one flagged expense on a Draft report; viewing on a narrow screen (mWeb or native).

  1. On Home, press Begin on the Review row.
  2. Confirm the first flagged expense opens full screen (not RHP).
  3. Confirm back navigation returns to Home.

Test 4: Count updates live as violations are resolved when screen is focused

Prerequisite: exactly two flagged expenses on Draft reports.

  1. Open Home and confirm "Review 2 expenses".
  2. Resolve the violation on one expense.
  3. Close RHP and return to Home (refocused)
  4. Confirm the row updates to "Review 1 expense" without a manual refresh
  5. Resolve the last violation.
  6. Close RHP and return to Home (refocused)
  7. Confirm the Review row disappears.

Test 5: Row is scoped to the current user's OPEN expense reports

Prerequisite: one flagged expense on your own Draft (OPEN) report; one flagged expense on a Submitted report; one flagged expense on a report you do not own.

  1. Open Home.
  2. Confirm the count includes only the flagged expense on your own Draft report.
  3. Confirm the Submitted-report and non-owned expenses are excluded.

Test 6: No flagged expenses renders no row

Prerequisite: an account with no flagged expenses on any Draft report.

  1. Open Home.
  2. Confirm the Review row is not rendered.
  3. Confirm the rest of the For you section (Submit/Approve/Pay/Export or empty state) is undisturbed.

Test 7: Survives fresh load, reconnect, and offline

Prerequisite: at least one flagged expense on a Draft report.

  1. Hard reload Home and confirm the Review row shows the correct count after data loads (no stuck skeleton).
  2. Background and reopen / trigger a reconnect, then confirm the count is still correct.
  3. Go offline, open Home, and confirm the Review row still reflects the last known flagged expenses.

Offline tests

QA Steps

  • Verify that no errors appear in the JS console

Same as tests

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
android.native.mov
Android: mWeb Chrome
android.web.mov
iOS: Native
ios.native.mov
iOS: mWeb Safari
ios.web.mov
MacOS: Chrome / Safari

Value updates when screen is focused, not when user change report in RHP:

Screen.Recording.2026-06-26.at.14.32.28.mov
Screen.Recording.2026-06-26.at.14.33.58.mov

@codecov

codecov Bot commented Jun 23, 2026

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/ONYXKEYS.ts 100.00% <ø> (ø)
...rc/libs/actions/OnyxDerived/ONYX_DERIVED_VALUES.ts 100.00% <ø> (ø)
...ges/home/ForYouSection/useReviewFlaggedExpenses.ts 92.53% <92.30%> (+5.87%) ⬆️
... and 23 files with indirect coverage changes

@LukasMod

Copy link
Copy Markdown
Contributor Author

Already its working, but Im trying to make it depends on useFocus too so it will not run if have report open and send message

@LukasMod

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0244e18d4e

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/pages/home/ForYouSection/useReviewFlaggedExpenses.ts Outdated
@LukasMod

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b88dcf6bdd

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/pages/home/ForYouSection/ReviewFlaggedExpensesLoader.tsx Outdated
@LukasMod
LukasMod marked this pull request as ready for review June 24, 2026 14:03
@LukasMod
LukasMod requested review from a team as code owners June 24, 2026 14:03
@melvin-bot
melvin-bot Bot requested review from heyjennahay and truph01 and removed request for a team June 24, 2026 14:03
@melvin-bot

melvin-bot Bot commented Jun 24, 2026

Copy link
Copy Markdown

@truph01 Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot
melvin-bot Bot removed the request for review from a team June 24, 2026 14:03
Comment thread src/pages/home/ForYouSection/ReviewFlaggedExpensesLoader.tsx Outdated
@LukasMod

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5ace44f3cd

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

Comment thread src/pages/home/ForYouSection/useReviewFlaggedExpenses.ts
@LukasMod

Copy link
Copy Markdown
Contributor Author

@truph01 I think it's ready enough

@LukasMod

Copy link
Copy Markdown
Contributor Author

@Expensify/design @stephanieelliott No need for review, auto assignment because of merge issue

@truph01

truph01 commented Jun 30, 2026

Copy link
Copy Markdown
Contributor

@codex review

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Delightful!

Reviewed commit: b1603c64d6

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@truph01 truph01 left a comment

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.

Changes look good!
The failed jest unit test isn't related to this PR

@melvin-bot
melvin-bot Bot requested review from cristipaval and mountiny June 30, 2026 08:12
@LukasMod
LukasMod force-pushed the perf/remove-flaggedExpenses branch from b1603c6 to 891ce5a Compare June 30, 2026 13:37
@LukasMod

Copy link
Copy Markdown
Contributor Author

All green here

@mountiny

Copy link
Copy Markdown
Contributor

@LukasMod more conflicts

@LukasMod

Copy link
Copy Markdown
Contributor Author

@mountiny should be resolved

@mountiny mountiny left a comment

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.

Small comment changes

Comment thread src/pages/home/ForYouSection/useReviewFlaggedExpenses.ts Outdated
Comment thread tests/ui/ForYouSectionTest.tsx Outdated
LukasMod added 2 commits July 1, 2026 08:35
…Expenses

# Conflicts:
#	src/ONYXKEYS.ts
#	src/libs/actions/OnyxDerived/ONYX_DERIVED_VALUES.ts
#	src/types/onyx/DerivedValues.ts
#	src/types/onyx/index.ts
@LukasMod
LukasMod requested a review from mountiny July 1, 2026 07:13
@cristipaval
cristipaval merged commit 989d3ea into Expensify:main Jul 1, 2026
35 checks passed
@github-actions

github-actions Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

🚧 cristipaval has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

OSBotify commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify

OSBotify commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.4.26-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 No help site changes required.

I reviewed the changes in this PR and no updates are needed to Expensify's help site files under App/docs/articles, so I have not created a draft PR.

Why: This is a pure performance refactor with no user-facing behavior change. It removes the flaggedExpenses Onyx derived value and moves the identical logic into the useReviewFlaggedExpenses hook (plus a useIsHomeTabFocused guard on Web). As the PR states, the "Review X expenses" row on Home works exactly as before.

The only help article that documents this feature — Understanding-the-For-you-Section.md — describes the Review item's behavior (flagged expenses on draft reports; Begin opens the first flagged expense to resolve the violation). None of that behavior changed, so the article remains accurate.

LukasMod, since this is a no-behavior-change refactor, no help site PR was created. If you believe the current article is inaccurate or missing something, let me know and I'll draft the updates.

marufsharifi pushed a commit to marufsharifi/App that referenced this pull request Jul 3, 2026
Removes the loginToAccountIDMap derived Onyx key and restores the
pre-94784 Attendee type/shape. Resolves conflicts with Expensify#94299 by
keeping the flaggedExpenses hook migration.

Co-authored-by: Cursor <cursoragent@cursor.com>
@OSBotify

OSBotify commented Jul 6, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/grgia in version: 9.4.27-2 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants