Skip to content

fix: result only shows up after reapplying group-by:approver - #106172

Merged
neil-marcellini merged 6 commits into
Expensify:mainfrom
nkdengineer:fix/105557
Nov 12, 2026
Merged

neil-marcellini merged 6 commits into
Expensify:mainfrom
nkdengineer:fix/105557

Conversation

@nkdengineer

@nkdengineer nkdengineer commented Nov 6, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

fix: result only shows up after reapplying group-by:approver

Fixed Issues

$ #105557
PROPOSAL: #105557 (comment)

Tests

  1. Go to workspace chat.
  2. Create an expense.
  3. Go to Spend > Expenses.
  4. Click Display > Group by > Approver > Apply.
  5. Go back to workspace chat.
  6. Click Submit and Approve on the expense.
  7. Go to Spend > Expenses.
  8. Verify the result appears for group-by:approver
  9. Repeat steps 2-8 for other filters has:submitted-violation, -has:submitted-violation, has:approved-violation, -has:approved-violation, approver:, anyApproval:, submitted: / approved:
  10. Verify that the result appears without refreshing
  • Verify that no errors appear in the JS console

Offline tests

  1. After completing steps 1-5
  2. Go offline
  3. Do steps 6-7
  4. Go online
  5. Verify that the result appears

QA Steps

Same as test

  • 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 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 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)
  • 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)
  • 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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
Screen.Recording.2026-11-06.at.11.56.59.mov
Android: mWeb Chrome
Screen.Recording.2026-11-06.at.11.53.09.mov
iOS: Native
Screen.Recording.2026-11-06.at.11.54.40.mov
iOS: mWeb Safari
Screen.Recording.2026-11-06.at.11.50.35.mov
MacOS: Chrome / Safari
Screen.Recording.2026-11-06.at.11.27.26.mov
Screen.Recording.2026-11-11.at.15.43.25.mov
Screen.Recording.2026-11-11.at.15.45.55.mov
Screen.Recording.2026-11-11.at.15.46.52.mov
Screen.Recording.2026-11-11.at.15.47.40.mov
Screen.Recording.2026-11-11.at.15.48.15.mov
Screen.Recording.2026-11-11.at.15.48.36.mov
Screen.Recording.2026-11-11.at.21.06.52.mov

@nkdengineer
nkdengineer marked this pull request as ready for review November 6, 2026 04:59
@nkdengineer
nkdengineer requested review from a team as code owners November 6, 2026 04:59
@melvin-bot
melvin-bot Bot requested review from daledah and removed request for a team November 6, 2026 04:59
@melvin-bot

melvin-bot Bot commented Nov 6, 2026

Copy link
Copy Markdown

@daledah 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 requested review from twisterdotcom and removed request for a team November 6, 2026 04:59
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Nov 6, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-11-06T05:15:28.278856Z 08ef51c Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@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: 08ef51c66e

ℹ️ 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/hooks/useSearchAutoRefetch.ts Resolved
Comment thread src/hooks/useSearchAutoRefetch.ts Resolved
Comment thread src/libs/SearchQueryUtils.ts Resolved
@codecov

codecov Bot commented Nov 6, 2026 •

Copy link
Copy Markdown

Codecov Report

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

Files with missing lines Coverage Δ
src/libs/SearchQueryUtils.ts 91.63% <100.00%> (+0.04%) ⬆️
src/hooks/useSearchAutoRefetch.ts 93.25% <95.83%> (+0.30%) ⬆️
... and 12 files with indirect coverage changes

@daledah

daledah commented Nov 6, 2026 •

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible 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 checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified any copy / text that was added to the app 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)
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

MacOS: Chrome / Safari
Screen.Recording.2026-11-06.at.17.32.29.mov

@daledah daledah 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.

LGTM

@melvin-bot
melvin-bot Bot requested a review from neil-marcellini November 6, 2026 10:34
twisterdotcom
twisterdotcom previously approved these changes Nov 6, 2026

@twisterdotcom twisterdotcom 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.

Looks good from a product perspective.

@neil-marcellini neil-marcellini 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.

(Neil's AI agent, human reviewed)

Requesting changes so this PR also handles has:submitted-violation (see the inline comment). It's the same problem as approved violations, so fixing both here is simpler than a second PR.

Comment thread src/libs/SearchQueryUtils.ts Resolved
Comment thread src/hooks/useSearchAutoRefetch.ts Resolved
Comment thread src/libs/SearchQueryUtils.ts Resolved
@nkdengineer

Copy link
Copy Markdown
Contributor Author

@neil-marcellini I updated.

@neil-marcellini neil-marcellini 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.

(Neil's AI agent, human reviewed)

Thanks for the updates! Requesting changes for two things:

  1. Please include the approver: and anyApproval: filters in shouldRefetchSearchOnReportActionChange, as I asked earlier. Details in the inline comment.

  2. Please add quick manual tests for every filter this PR fixes. For each one, submit or approve from the workspace chat, go back to Spend, and verify the results update without re-running the search:

    • group-by:approver
    • has:submitted-violation and -has:submitted-violation
    • has:approved-violation and -has:approved-violation
    • approver:
    • anyApproval:
    • submitted: / approved:, if you include them

    Please also add an offline step (approve while offline, reconnect, the results update) and a short web video covering these. The current videos predate the has:submitted-violation change.

Comment thread src/libs/SearchQueryUtils.ts Resolved
@nkdengineer

Copy link
Copy Markdown
Contributor Author

@neil-marcellini I updated.

@neil-marcellini
neil-marcellini self-requested a review November 12, 2026 18:58

@neil-marcellini neil-marcellini 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.

Good to go, thank you. I spotted some opportunities to clean up the code a little bit, and they're pretty straightforward. If you could please raise a follow-up PR to do that, it would be great, but it's not a blocker for merging this.

if (previousActions?.[reportActionID]) {
continue;
}
if (isSubmittedAction(reportAction) || isSubmittedAndClosedAction(reportAction) || isApprovedAction(reportAction) || isForwardedAction(reportAction)) {

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.

(Neil's AI agent, human reviewed)

NAB: Hold.ts already keeps a list of workflow action types that matches the backend's WORKFLOW_ACTIONS. Could we move it into CONST (e.g. CONST.REPORT.WORKFLOW_ACTIONS) and use it here instead of the four is*Action checks?

That also catches approver changes. Changing the approver adds a TAKE_CONTROL or REROUTE action and changes the report's approver without changing a transaction. For example, an admin moves a report from Alice to Bob while viewing group-by:approver, and the report stays under Alice until the search is re-run.

It does bring back UNAPPROVED and a few other rare actions I suggested dropping earlier, but one list shared with the backend is worth a few extra refetches.

return (
queryJSON.groupBy === CONST.SEARCH.GROUP_BY.APPROVER ||
queryJSON.flatFilters.some((filter) => WORKFLOW_FILTER_KEYS.has(filter.key)) ||
queryHasHasFilter(queryJSON, [CONST.SEARCH.HAS_VALUES.SUBMITTED_VIOLATION, CONST.SEARCH.HAS_VALUES.APPROVED_VIOLATION], true)

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.

(Neil's AI agent, human reviewed)

NAB: [SUBMITTED_VIOLATION, APPROVED_VIOLATION] now appears three times in this file (queryHasViolationFilter, here, and hasValuesIncludeViolationFilter). Could we pull it into a constant next to WORKFLOW_FILTER_KEYS, like VIOLATION_HAS_VALUES, and use it in all three?

// When a report is approved
rerender(withAddedAction(ungroupedProps, 'APPROVED'));

// Then no search is triggered, because only the approver grouping depends on approval actions

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.

(Neil's AI agent, human reviewed)

NAB: since the approver:, anyApproval:, submitted:, approved: and violation filters were added, "only the approver grouping depends on approval actions" isn't accurate anymore. Could we rename the test to something like should not trigger search when an approval report action is added and the query doesn't depend on workflow state, and update this comment to match?

@neil-marcellini
neil-marcellini merged commit 35ad671 into Expensify:main Nov 12, 2026
41 of 42 checks passed
@OSBotify

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.

@github-actions

Copy link
Copy Markdown
Contributor

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

@github-actions

Copy link
Copy Markdown
Contributor

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.5.38-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

No help site update needed — this PR fixes stale search results after report workflow actions, restoring expected behavior without adding a feature or making existing article instructions incorrect.


view run

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.5.39-2 🚀

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

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