79170: Reports-After moving expense to new report on 'Top Spenders', menu only shows 'Export' option by abbasifaizan70 · Pull Request #82590 · Expensify/App

abbasifaizan70 · 2026-02-16T19:09:32Z

Explanation of Change

When you leave a grouped search (e.g. Top Spenders) and come back (e.g. after closing the expense view or finishing “Move Expense” → “Create Report”), the app refetches the search from the API and collapses any expanded group rows.

Fixed Issues

$ #79170
PROPOSAL:

Tests

Verify that no errors appear in the JS console

Prerequisite: The account must have at least one workspace.

Open the Expensify app and go to any workspace chat.
Create a manual expense dated last month.
Navigate to Reports → Top Spenders and expand the results.
Long press the created expense, open the dropdown, and select Move Expense → Create Report.
Once back on Top Spenders, select the same expense again and open the dropdown.
Verify that Move Expense, Hold, and Split options are visible.

Offline tests

This is only for online.

QA Steps

Verify that no errors appear in the JS console

same as tests.

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-02-17.at.12.06.41.AM.mov

Android: mWeb Chrome

Screen.Recording.2026-02-17.at.12.08.50.AM.mov

iOS: Native

Screen.Recording.2026-02-17.at.12.02.31.AM.mov

iOS: mWeb Safari

Screen.Recording.2026-02-16.at.11.47.38.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-05.at.1.51.38.AM.mov

…menu only shows 'Export' option

melvin-bot · 2026-02-16T19:09:39Z

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

codecov · 2026-02-16T19:14:59Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
...h/SearchList/ListItem/TransactionGroupListItem.tsx	`70.00% <63.63%> (-0.84%)`	⬇️
... and 183 files with indirect coverage changes

heyjennahay

Bug fix. Product review not required

abbasifaizan70 · 2026-02-20T11:06:50Z

@mananjadhav soft remainder to take a look here.

…to 79170

mananjadhav · 2026-02-24T17:14:52Z

Yes I've started reviewing this.

src/components/Search/SearchList/index.tsx

mananjadhav · 2026-02-24T21:18:06Z

@abbasifaizan70 I've been trying to wrap my head around the proposed fix. I think we're over engineering the solution.

Can we somehow leverage clearSelectedTransactions();?

abbasifaizan70 · 2026-02-25T22:05:01Z

@mananjadhav
The bug is that after “Move Expense” → “Create Report” and returning to Top Spenders, the expense row and its dropdown are built from a stale snapshot. The fix needs to make the list use the new snapshot.

clearSelectedTransactions() would only clear the current selection. The expanded group would still be open and its rows would still be coming from the old snapshot. If the user selects the same expense again without re-expanding, the selection logic still runs on the same stale filteredData/snapshot, so the dropdown would still show only “Export” (or other wrong options). Clearing selection doesn’t refresh the data that feeds the row or the dropdown.
Collapsing the group (with collapseExpandedGroupsTrigger) forces the user to tap the header row again to expand. When they do, the expanded list is built from the updated snapshot (because we also refetch on focus). So the expense row and its dropdown options (Move, Hold, Split, etc.) are correct.

So we need both: refetch on focus (to update the snapshot) and collapse on return (so the next expand uses that updated snapshot). Relying only on clearSelectedTransactions() would not fix the stale dropdown; collapsing (plus refetch) does.

mananjadhav · 2026-03-04T14:43:40Z

You might be right about the shortfalls of just using clearSelectedTransactions. But adding a prop like collapseExpandedGroupsTrigger doesn't seem like the optimal approach.

…ion counts and dropdown actions in sync after moving expenses.

abbasifaizan70 · 2026-03-04T21:06:03Z

I dropped the collapseExpandedGroupsTrigger prop approach and moved to a more local fix.
Now, on return to grouped Search (e.g., Top Spenders) from flows like Move Expense → Create Report, expanded group rows refresh their snapshot on focus return, which keeps counts and dropdown actions in sync without prop threading.
when returning to grouped Search (e.g., Top Spenders) from RHP flows like Move Expense → Create Report, expanded group rows now refresh their snapshot immediately on focus return. This keeps the expanded row count and dropdown actions aligned with the updated grouped total, so users no longer need to collapse/re-expand manually.

@mananjadhav

mananjadhav · 2026-03-12T20:40:32Z

@MelvinBot Please review this PR.

MelvinBot · 2026-03-12T20:43:57Z

PR Review

Summary: This PR fixes stale dropdown options (e.g., only "Export" shown) in grouped search views (Top Spenders) after returning from RHP flows like "Move Expense" → "Create Report". It does so by detecting focus-return transitions and refetching expanded group data.

All CI checks are passing.

What Changed

Single file modified: TransactionGroupListItem.tsx

useIsFocused hook added to detect screen focus state
searchTransactions wrapped in useCallback to stabilize the reference for use in effect dependencies
New focus-return effect (lines 202-213) that refetches expanded group data when the screen regains focus

Analysis

The core logic is sound. The ref-based focus tracking pattern (wasScreenFocusedRef) correctly detects only true focus-return transitions (blur → focus), preventing spurious refetches when the effect re-runs for other reasons (e.g., dependency changes). The guard conditions are appropriate:

!didReturnToScreen — only acts on actual navigation return
!isExpanded — skips collapsed groups (they'll fetch fresh data when expanded)
isExpenseReportType — correctly excluded since expense report transactions come from props, not the snapshot

Suggestions

useCallback dependency array — The deps include transactionsSnapshot?.search?.isLoading and transactionsSnapshot?.search?.offset, which change during every search cycle. This causes unnecessary callback recreations and effect re-evaluations. While the didReturnToScreen guard prevents actual refetches, it's still extra work on each render cycle during search operations.

Since both effects only call searchTransactions(0, true) (the refresh path where offset is hardcoded to 0), consider whether a separate refreshTransactions callback with fewer dependencies would be cleaner:
```
const refreshTransactions = useCallback(() => {
    if (!groupItem.transactionsQueryJSON) {
        return;
    }
    search({
        queryJSON: groupItem.transactionsQueryJSON,
        searchKey: undefined,
        offset: 0,
        shouldCalculateTotals: false,
        isLoading: !!transactionsSnapshot?.search?.isLoading,
        isOffline,
    });
}, [groupItem.transactionsQueryJSON, isOffline, transactionsSnapshot?.search?.isLoading]);
```
This would remove offset from the deps for the refresh-only callers, reducing unnecessary re-creations. The original searchTransactions would remain for pagination use in handleToggle.

That said, this is a minor optimization — the guards prevent any real misbehavior, so this is a non-blocking suggestion.
Multiple expanded groups — If a user has several group rows expanded simultaneously, each will independently fire a search API call on focus return. This is probably fine in practice (users rarely expand many groups), but worth keeping in mind for performance monitoring.

Verdict

The approach is clean and correctly addresses the stale snapshot problem without over-engineering (the earlier collapseExpandedGroupsTrigger prop was rightfully rejected). The focus-return detection is well-guarded against spurious triggers.

The suggestion in point 1 above is non-blocking — the current implementation is functionally correct. Up to the reviewer whether the minor optimization is worth the additional function.

mananjadhav · 2026-03-12T20:51:38Z

@abbasifaizan70 Can you fix this suggestion from the MelvinBot? I think it's best to avoid rerenders. Meanwhile I'll get started on the testing.

…nto 79170

abbasifaizan70 · 2026-03-13T23:24:06Z

@mananjadhav, updated code with Melvin Bot suggestions. Please have a look. Thanks

mananjadhav · 2026-03-29T20:27:40Z

With the new changes I am a little concerned on the rerenders or the number of API calls. I am just trying to test that for now.

aimane-chnaif · 2026-04-02T04:07:49Z

Taking over from here

mananjadhav · 2026-04-02T04:09:18Z

@aimane-chnaif Will review this PR.

abbasifaizan70 · 2026-04-07T15:42:08Z

@aimane-chnaif Can u please review this PR? Thanks

aimane-chnaif · 2026-04-07T15:50:46Z

Please merge main

abbasifaizan70 · 2026-04-07T15:54:10Z

@aimane-chnaif updated with main. Thanks

aimane-chnaif · 2026-04-08T09:00:46Z

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
- MacOS: Desktop
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 there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (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 verified that this PR follows the guidelines as stated in the Review Guidelines
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)
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
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- 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
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- 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 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 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.
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

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

ios.mov

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx

aimane-chnaif · 2026-04-08T15:29:45Z

src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx

+    const wasScreenFocusedRef = useRef(isScreenFocused);
+    useEffect(() => {
+        const didReturnToScreen = wasScreenFocusedRef.current === false && isScreenFocused === true;
+        wasScreenFocusedRef.current = isScreenFocused;
+
+        if (!didReturnToScreen || !isExpanded || isExpenseReportType) {
+            return;
+        }
+
+        // Keep expanded group rows in sync with updated grouped totals after returning from RHP flows.
+        refreshTransactions();


@MelvinBot is this pattern (refresh data on screen focus) used elsewhere in the app?

aimane-chnaif · 2026-04-08T15:33:09Z

@abbasifaizan70 in the future PRs, can you please stop copy & pasting Tests steps from the linked issue? At least, read what you wrote.

Note that only "Export" option is now available for expense.

Open expense and return to "Top Spenders"

Select expense again and tap on dropdown menu.

Note that only "Export" option is available for expense.

11, 14 are bugs we're fixing here.

MelvinBot · 2026-04-08T15:36:41Z

Yes, this pattern is used extensively throughout the app — 147+ files use screen focus to trigger data refreshes.

The three main variants are:

useFocusEffect() (~70+ files) — most common, e.g. WorkspaceInitialPage.tsx, PolicyAccountingPage.tsx, IOURequestStartPage.tsx
useIsFocused() + useEffect (~77+ files) — e.g. ReportFetchHandler.tsx which detects "return to screen" via a prevIsFocused ref, similar to this PR's wasScreenFocusedRef approach
useIsFocusedRef() custom hook (src/hooks/useIsFocusedRef.tsx) — a reusable version of the ref-based pattern

Notable examples closest to this PR's pattern (detecting screen return specifically):

src/pages/inbox/ReportFetchHandler.tsx — refreshes report data on return to screen using prevIsFocused ref
src/pages/workspace/accounting/PolicyAccountingPage.tsx — refreshes accounting integration data via useFocusEffect
src/pages/workspace/perDiem/WorkspacePerDiemPage.tsx — refreshes per diem rates via useFocusEffect

abbasifaizan70 · 2026-04-08T19:31:30Z

@aimane-chnaif removed useCallback from the above-mentioned files.

79170: Reports-After moving expense to new report on 'Top Spenders', …

e6e63ca

…menu only shows 'Export' option

abbasifaizan70 requested review from a team as code owners February 16, 2026 19:09

melvin-bot bot assigned abbasifaizan70 Feb 16, 2026

melvin-bot bot requested review from heyjennahay and mananjadhav and removed request for a team February 16, 2026 19:09

melvin-bot bot removed the request for review from a team February 16, 2026 19:09

Fixed Eslint issues

a85e653

abbasifaizan70 mentioned this pull request Feb 16, 2026

Reports-After moving expense to new report on "Top Spenders", menu only shows "Export" option #79170

Open

7 tasks

heyjennahay reviewed Feb 20, 2026

View reviewed changes

Merge branch 'main' into 79170

0040bae

Merge branch 'main' of https://github.com/abbasifaizan70/Expensify in…

36da7a9

…to 79170

mananjadhav mentioned this pull request Feb 24, 2026

[Insights] [Release 0] Add Top Spenders default report #78309

Closed

mananjadhav reviewed Feb 24, 2026

View reviewed changes

src/components/Search/SearchList/index.tsx Outdated Show resolved Hide resolved

Merge branch 'main' into 79170

6b2c7e8

abbasifaizan70 added 4 commits March 5, 2026 01:36

Merge branch 'main' into 79170

44f8896

Merge branch 'main' into 79170

3efb4df

Refresh expanded grouped search rows on focus return to keep transact…

eead2b9

…ion counts and dropdown actions in sync after moving expenses.

Fixed prettier issue

6b36f54

abbasifaizan70 and others added 4 commits March 13, 2026 04:00

Merge branch 'main' into 79170

9e57095

Merge branch 'Expensify:main' into 79170

8041584

Fixed Melvin Bot feedback

b1e10f5

Merge branch '79170' of https://github.com/abbasifaizan70/Expensify i…

6c00b6d

…nto 79170

Merge branch 'main' into 79170

5c95f8f

Merge branch 'Expensify:main' into 79170

a930efe

aimane-chnaif reviewed Apr 8, 2026

View reviewed changes

src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx Outdated Show resolved Hide resolved

src/components/Search/SearchList/ListItem/TransactionGroupListItem.tsx Outdated Show resolved Hide resolved

aimane-chnaif reviewed Apr 8, 2026

View reviewed changes

removed useMemo, useCallbacks

88031cb

aimane-chnaif approved these changes Apr 8, 2026

View reviewed changes

melvin-bot bot requested a review from puneetlath April 8, 2026 19:35

Conversation

abbasifaizan70 commented Feb 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Feb 16, 2026

Uh oh!

codecov bot commented Feb 16, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

heyjennahay left a comment

Choose a reason for hiding this comment

Uh oh!

abbasifaizan70 commented Feb 20, 2026

Uh oh!

mananjadhav commented Feb 24, 2026

Uh oh!

Uh oh!

mananjadhav commented Feb 24, 2026

Uh oh!

abbasifaizan70 commented Feb 25, 2026

Uh oh!

mananjadhav commented Mar 4, 2026

Uh oh!

abbasifaizan70 commented Mar 4, 2026

Uh oh!

mananjadhav commented Mar 12, 2026

Uh oh!

MelvinBot commented Mar 12, 2026

PR Review

What Changed

Analysis

Suggestions

Verdict

Uh oh!

mananjadhav commented Mar 12, 2026

Uh oh!

abbasifaizan70 commented Mar 13, 2026

Uh oh!

mananjadhav commented Mar 29, 2026

Uh oh!

aimane-chnaif commented Apr 2, 2026

Uh oh!

mananjadhav commented Apr 2, 2026

Uh oh!

abbasifaizan70 commented Apr 7, 2026

Uh oh!

aimane-chnaif commented Apr 7, 2026

Uh oh!

abbasifaizan70 commented Apr 7, 2026

Uh oh!

aimane-chnaif commented Apr 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

aimane-chnaif Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif commented Apr 8, 2026

Uh oh!

MelvinBot commented Apr 8, 2026

Uh oh!

abbasifaizan70 commented Apr 8, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

abbasifaizan70 commented Feb 16, 2026 •

edited

Loading

codecov bot commented Feb 16, 2026 •

edited by github-actions bot

Loading

aimane-chnaif commented Apr 8, 2026 •

edited

Loading