Fix home Awaiting approval count to exclude IOU and personal-policy expenses

[mountiny]

Explanation of Change

The Home page "Awaiting approval" widget was counting IOU expenses (DM money requests) and personal-policy expenses in its total/count. Repro:

1. New account, no workspace created yet.
2. Submit an expense to a user in a DM (creates an IOU).
3. Home → "Awaiting approval" not shown (applicability gate is off).
4. Create a workspace.
5. Home → "Awaiting approval" appears, but the total includes the prior IOU.

Root cause: the awaiting-approval query used type:expense, which the Auth backend expands to include IOU reports.

Fix: scope the query to the user's paid group workspaces (Team/Corporate) by adding a policyID:[...] filter, which excludes IOU reports (no policyID) and personal-policy expenses. policyID is the Workspace chip in the Search UI, so tapping the row opens a Search page with that chip pre-filled and a result set that matches the count.

Implementation details:

• getYourSpendApplicability returns the user's paidGroupPolicyIDs alongside the existing approval/payment applicability flags.
• buildAwaitingApprovalQuery takes those IDs and emits the policyID: filter when non-empty.
• The search-firing effect re-fetches the snapshot when the user joins or leaves a paid group workspace, and the cached "Awaiting approval" total is keyed by the query hash so it isn't reused across workspace-set changes.
• The hook also subscribes to the report collection and refires the search when the set of the user's OUTSTANDING reports changes, so approving the last outstanding expense immediately updates (or hides) the row.

The row still only renders when the scoped search returns a non-zero count (READY); zero outstanding workspace expenses keep the row hidden (HIDDEN_EMPTY).

Fixed Issues

$ #91392
PROPOSAL: Internal fix — no external proposal

Tests

1. Sign in to a fresh account; do not create a workspace yet.
2. Open a DM with any other user and submit an expense to them (creates an IOU).
3. Go to Home → confirm "Awaiting approval" is not shown (no paid group workspace yet).
4. Create a workspace (Team or Corporate).
5. Go to Home → confirm "Awaiting approval" is still not shown because there are no outstanding workspace expenses yet (count is 0). The prior IOU must not cause the row to appear.
6. Submit a reimbursable expense in the new workspace that enters the Outstanding (awaiting approval) state.
7. Go to Home → confirm "Awaiting approval" now appears with the correct total/count for that workspace expense only; the IOU must still not be included.
8. Tap the "Awaiting approval" row → confirm Search opens with the Workspace filter chip pre-filled and the result count matches the Home widget.
9. Approve that expense (or otherwise move it out of Outstanding) → return to Home → confirm "Awaiting approval" disappears without requiring a manual refresh.

Automated coverage:

• npx jest tests/unit/Search/yourSpendQueryBuildersTest.ts tests/unit/Search/yourSpendApplicabilityTest.ts tests/unit/HomePage/YourSpendSection/useYourSpendDataTest.ts (77 tests pass, including the new policyID and paidGroupPolicyIDs cases).

• Verify that no errors appear in the JS console

Offline tests

N/A — no offline-specific behavior changed. The widget already short-circuits the search when offline and reuses cached totals (existing behavior unchanged by this PR).

QA Steps

1. On staging, sign in as a user on a paid group workspace (Team/Corporate) who has no outstanding workspace expenses → Home → "Awaiting approval" must not be shown.
2. Same user (or another) with both an outstanding IOU (DM) and at least one outstanding workspace expense on a paid group policy → Home → total/count must include only the workspace expense(s); the IOU must not be counted.
3. Tap "Awaiting approval" → Search must open with the Workspace chip pre-filled; result count must match Home.
4. Approve the user's last outstanding workspace expense → return to Home → "Awaiting approval" must hide (real-time update from report-state refire).
5. User with only a personal workspace → "Awaiting approval" remains hidden (regression).
6. User with multiple paid group workspaces and outstanding expenses on more than one → count must sum across all listed workspaces; row hidden again when all are cleared.

• Verify that no errors appear in the JS console

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 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
  • 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: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

[melvin-bot]

@ZhenjaHorbach 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]

[mountiny]

@codex review

[Copilot]

Pull request overview

This PR fixes the Home “Awaiting approval” widget so its count/total only reflects outstanding reimbursable expenses from workspaces that actually have an approval flow, excluding IOU (DM) expenses and personal-policy expenses. It aligns the widget’s underlying Search query with the same policy applicability predicate already used to decide whether the row should be shown.

Changes:

• Updated buildAwaitingApprovalQuery to optionally scope results by policyID:[...] when approval-flow workspace IDs are available.
• Refactored getYourSpendApplicability to compute a sorted approvalPolicyIDs list (stable hash) alongside approval/payment applicability.
• Added/updated unit tests to cover the new query scoping behavior and the sorted policy ID plumbing through useYourSpendData.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
src/pages/home/YourSpendSection/queries.ts	Adds optional policyID filter to the awaiting-approval Search query.
src/pages/home/YourSpendSection/useYourSpendData.ts	Computes sorted approval-policy IDs and uses them to build the awaiting-approval query + effect dependency key.
tests/unit/Search/yourSpendQueryBuildersTest.ts	Adds coverage for policyID emission/omission and hash changes when scoped.
tests/unit/Search/yourSpendApplicabilityTest.ts	Adds coverage for approvalPolicyIDs derivation/sorting and applicability behavior.
tests/unit/HomePage/YourSpendSection/useYourSpendDataTest.ts	Verifies the hook passes the expected sorted policy IDs into the query builder.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[chatgpt-codex-connector]

Codex Review: Didn't find any major issues. You're on a roll.

ℹ️ 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".

[codecov]

Codecov Report

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

Files with missing lines	Coverage Δ
src/pages/home/YourSpendSection/queries.ts	100.00% <100.00%> (ø)
...rc/pages/home/YourSpendSection/useYourSpendData.ts	97.77% <100.00%> (+0.45%)	⬆️
... and 20 files with indirect coverage changes

[mountiny]

@codex review

[Copilot]

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: de47e2b6f5

ℹ️ 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".

[mountiny]

@MelvinBot Please review the PR

[MelvinBot]

PR Review

The fix is well-motivated and the approach (scoping by policyID) is sound. The cache-keying-by-hash fix and test coverage are solid. Two items to address:

1. paidGroupPolicyIDs is not sorted — PR description says it is

The PR body states "The sort keeps the resulting query hash stable across unrelated Onyx key shuffles", but getYourSpendApplicability never sorts the array — it pushes IDs in Object.values() iteration order. I see the reply to Copilot saying this is intentional, but the PR body still claims otherwise.

Object.values() order for non-integer string keys follows insertion order, which in Onyx depends on merge/set timing. If a background Onyx merge re-writes the collection in a different order (e.g. a push notification updates one policy, causing it to be re-inserted), the IDs array changes → different query string → different hash → cache miss + unnecessary re-fetch. Adding .sort() is a one-liner that eliminates this class of bug:

-    return {
-        isApprovalApplicable: paidGroupPolicyIDs.length > 0,
+    paidGroupPolicyIDs.sort();
+    return {
+        isApprovalApplicable: paidGroupPolicyIDs.length > 0,

At minimum, please align the PR description with the code (remove the sort claim), but I'd recommend just adding the sort.

2. type CachedReady defined inside the render function body (nit)

Line 253 defines type CachedReady inside useYourSpendData. TypeScript erases it at runtime so there's no perf impact, but it's unconventional — types inside function bodies can confuse readers and aren't hoisted. Consider moving it near YourSpendRowTotals at the module level.

Everything else looks good

• The policyID filter in buildAwaitingApprovalQuery correctly excludes IOUs (no policyID) and personal-policy expenses.
• Switching from hasApprovalFlow → isPaidGroupPolicy for the applicability gate makes sense — outstanding reimbursable expenses on paid group workspaces with OPTIONAL approval mode should still appear.
• Cache keyed by approvalQueryJSON.hash prevents stale totals from flashing when the workspace set changes. The regression test validates this.
• Test coverage is comprehensive (67 tests including the new policyID, paidGroupPolicyIDs, and cache-hash cases).

---

Next Steps: Reply with @MelvinBot <your feedback> to discuss further.

[ZhenjaHorbach]

Okay
Overall changes look good
Only in offline mode, we hide Awaiting approval field after any updates
But as I remember, we already have an issue for this

And I suppose we need to update this step Since in this case, we still don't need to show Awaiting payment If I understand correctly 😅

@mountiny
And what about this comment?
Should we show Awaiting approval field with 0 value?
If yes, in this case, we have a bug since we don't show it if we have a workspace but don't have a submitted expense

[mountiny]

Sorry the comment is not loading for me, can you repost?

[ZhenjaHorbach]

[mountiny]

I will update the steps, I think the widget should not be visible when there are no reports pending approval

[ZhenjaHorbach]

I will update the steps, I think the widget should not be visible when there are no reports pending approval

Good choice 😁

[ZhenjaHorbach]

But actually no
Still have the issue that we are displaying Awaiting approval field after approving the last expense

2026-06-01.14.27.55.mov

[mountiny]

@ZhenjaHorbach updated

[ZhenjaHorbach]

But actually no Still have the issue that we are still displaying Awaiting approval field after approving the last expense

2026-06-01.14.27.55.mov

@mountiny
This issue is still reproducible

[mountiny]

@ZhenjaHorbach good catch, this is now fixed in f4fb146.

Root cause: a zero-result awaiting-approval search comes back from Auth with count omitted entirely (undefined), not 0 — Auth only writes count/total/currency when there is at least one result row. The approval-cache bridge treats a missing count the same as the Search-screen count wipe, so after approving the last outstanding expense it kept reusing the previous (stale) READY total and the row never hid.

Fix: gate the cache reuse on the outstandingReportsSignature (the set of OUTSTANDING reports the user owns on a paid group workspace). When that's empty, nothing is awaiting approval, so the cached total is dropped and the row hides immediately from the optimistic approval update — no wait for the backend. The original Search-screen wipe case still works because the report is still OUTSTANDING then. Added two unit tests (hide-after-approve and the cache-bridge regression guard).

[ZhenjaHorbach]

Okay
Now it is much better
Thanks!

[ZhenjaHorbach]

LGTM!

[melvin-bot]

@mjasikowski 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]

[github-actions]

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

[OSBotify]

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

[github-actions]

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #91847.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-218ada33aa0-59644ae-c222e02ab3449eadf64c7ee0b89adabb253c3d29/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-218ada3-59644ae-2a74d5cfef7ea7653d1391c34ec3ff5a2d67abfa/index.html

Web 🕸️
https://91847.pr-testing.expensify.com

---

👀 View the workflow run that generated this build 👀

[OSBotify]

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.3.99-0 🚀

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

Bundle Size Analysis (Sentry):

• Android
• iOS

[MelvinBot]

Help site review: no changes required

I reviewed the changes in this PR against App/docs/articles and no help site updates are required.

Why:

• This is an internal bug fix to the Home Your spend → Awaiting approval widget. It scopes the count to the user's paid group (Team/Corporate) workspaces so it no longer includes IOU (DM) and personal-policy expenses. The diff only touches query logic, code comments, and unit tests — queries.ts and useYourSpendData.ts. There are no user-facing copy, label, tab, or button changes.
• No existing help article documents the Your spend section or its Awaiting approval widget. The Home overview article (Expensify-Home-Overview.md) covers the For you, Spend over time, Time-sensitive, Getting started, Discover, Announcements, and Assigned cards sections — but not Your spend. So there is no documented behavior that this fix contradicts and nothing to correct.
• The corrected behavior (counting only outstanding workspace expenses awaiting approval) matches what a reader would already expect; it doesn't introduce a new concept that needs explaining.

Since no documented behavior changed and the widget itself is undocumented, I did not create a draft docs PR.

[jponikarchuk]

The Deploy Blocker issue #92663 is repro on all PRs. Could you please double check if it's not introduced by #91847 or #87212

[ZhenjaHorbach]

The Deploy Blocker issue #92663 is repro on all PRs. Could you please double check if it's not introduced by #91847 or #87212

This PR applies only to Home screen

[mountiny]

That one is unrelated to this pr

[OSBotify]

🚀 Deployed to production by https://github.com/lakchote in version: 9.3.99-9 🚀

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