Add loading UI for search page menu + default to approve section for admins by ShridharGoel · Pull Request #72034 · Expensify/App

ShridharGoel · 2025-10-07T20:17:07Z

Explanation of Change

Add loading UI for search page LHN + default to approve section for admins

Fixed Issues

$ #71550
PROPOSAL: #71550 (comment)

Tests

Login as an admin of some workspace.
Go to "Reports".
Observe that LHN should show the new loading UI before the data becomes available (try with a slow connection if needed).
Observe that "Approve" should be the default selection.
Login as an member of a workspace.
Go to "Reports".
Observe that LHN should show the new loading UI before the data becomes available (try with a slow connection if needed).
Observe that "Submit" should be the default selection.

Login as a workspace member (no approve permission) on any platform.
Open the Search menu and note that Submit is the default highlighted entry.
Without reloading, promote this user to an approver from another admin account so the Approve entry becomes available.
The search menu should show the updated "Approve" option, but the selection should stay on "Submit".

On iOS native:

Create a new account
Go reports page
Invite the new account to an existing workspace in any other account
Wait for few seconds state gets updated
Open the menu on reports page
It should show the relevant menu itmes.

Verify that no errors appear in the JS console

Offline tests

Go to the Reports page and select any tab.
Turn offline.
Go to the troubleshoot page and clear the cache.
Go back to the Reports page and select the Expenses tab.
Turn online.

Go to the Reports page → Turn Offline
Go to the Troubleshoot page → Turn Online
Clear cache → Go back to the Reports page
New loading UI should show initially (might need to use a slow connection to test properly).
The search menu and search results should load after that, and there should be no extra auto-refresh of the results.

Turn offline.
Go to the Troubleshoot page.
Clear cache.
Go to the search page.
Search menu should show only "Expenses", "Reports" and "Chats".
Search results should show "You appear to be offline."
Go online.
New loading UI should show in the search menu.
After the loading is complete, the default selection should be selected ("Approve" if it is available or "Submit" if that is available).

QA Steps

Same as tests.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-10-11.at.9.26.26.PM.mov

Android: mWeb Chrome

Screen.Recording.2025-10-11.at.9.21.22.PM.mov

iOS: Native

Simulator.Screen.Recording.-.iPhone.16.Plus.-.2025-10-11.at.21.14.08.mp4

iOS: mWeb Safari

Simulator.Screen.Recording.-.iPhone.16.Plus.-.2025-10-11.at.21.18.15.mp4

MacOS: Chrome / Safari

Screen.Recording.2025-10-10.at.7.35.18.PM.mov

Screen.Recording.2025-10-10.at.7.31.40.PM.mov

MacOS: Desktop

Screen.Recording.2025-10-11.at.9.06.08.PM.mov

Screen.Recording.2025-10-11.at.9.02.47.PM.mov

Screen.Recording.2025-10-11.at.9.02.22.PM.mov

melvin-bot · 2025-10-10T14:24:41Z

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

Krishna2323 · 2025-10-11T02:09:22Z

@ShridharGoel, I see you're actively working on this and the checks are also failing. Could you please move this back to draft and let me know once you've finished? Thanks!

codecov · 2025-10-11T07:45:41Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/hooks/useSearchTypeMenuSections.ts	`87.87% <100.00%> (+2.16%)`	⬆️
src/hooks/useSuggestedSearchDefaultNavigation.ts	`100.00% <100.00%> (ø)`
src/components/Search/index.tsx	`0.00% <0.00%> (ø)`
src/hooks/useSearchTypeMenu.tsx	`0.00% <0.00%> (ø)`
src/pages/Search/SearchTypeMenu.tsx	`0.00% <0.00%> (ø)`
src/pages/Search/SuggestedSearchSkeleton.tsx	`0.00% <0.00%> (ø)`
... and 3 files with indirect coverage changes

ShridharGoel · 2025-10-11T20:09:40Z

@Krishna2323 It's ready for review.

Krishna2323 · 2025-10-13T09:26:27Z

Thanks! Will start reviewing today.

ShridharGoel · 2025-10-14T13:06:00Z

@Krishna2323 Did you get a chance to check this?

Krishna2323 · 2025-10-14T13:11:32Z

@ShridharGoel I didn't get a chance to review this yesterday or today because of some deployment blockers. I'll make it my first priority tomorrow.

ShridharGoel · 2025-10-14T13:13:44Z

Thanks!

Krishna2323 · 2025-10-15T15:08:05Z

Reviewing...

Krishna2323 · 2025-10-15T15:16:04Z

src/components/Navigation/NavigationTabBar/index.tsx

    isTopLevelBar?: boolean;
 };

+function getDefaultTodoSuggestedSearch(typeMenuSections: SearchTypeMenuSection[]) {


Please move this function into SearchUIUtils.

Krishna2323 · 2025-10-15T15:29:20Z

@ShridharGoel the skeleton is misaligned:

Monosnap (18) New Expensify 2025-10-15 20-53-38

Krishna2323 · 2025-10-15T15:34:35Z

Apart from some minor changes, the PR looks good! I'll complete the review tomorrow.

ShridharGoel · 2025-10-16T11:59:33Z

@Krishna2323 Thanks for the review, it's updated.

ShridharGoel · 2025-10-16T13:59:31Z

Note: Lint issue is on main.

trjExpensify · 2025-10-16T23:46:00Z

@Krishna2323 will you be able to re-review today, please?

Krishna2323 · 2025-10-16T23:48:53Z

I will review this within the next 12 hours.

trjExpensify · 2025-10-16T23:55:25Z

Thanks!

Krishna2323 · 2025-10-17T08:56:44Z

src/components/Navigation/NavigationTabBar/index.tsx

+            const defaultSuggestedSearch = suggestedSearchesReady ? getDefaultTodoSuggestedSearch(typeMenuSections) : undefined;
            const savedSearchQuery = Object.values(savedSearches ?? {}).at(0)?.query;
-            Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: nonExploreTypeQuery ?? savedSearchQuery ?? buildCannedSearchQuery()}));
+            Navigation.navigate(ROUTES.SEARCH_ROOT.getRoute({query: defaultSuggestedSearch?.searchQuery ?? savedSearchQuery ?? buildCannedSearchQuery()}));


If Approve/Submit are unavailable, it now selects the first item in the Todo section.

If suggestedSearchesReady is false, it falls back to the first saved search (if any), otherwise to the canned query.

Previously, it always used the first item of the first section.

Could you please explain this? I just want to confirm that the current behavior is correct.
Why don’t we use the first item of the first section when suggestedSearchesReady is false and as the default value for getDefaultTodoSuggestedSearch?

I know it’s the same logic as in getDefaultTodoSuggestedSearch, but here, when navigating, we fall back to a saved search — whereas previously, it was simply the first item of the first section, correct?

If Approve/Submit are unavailable, it now selects the first item in the Todo section.

This is expected, right?

Could you please explain this? I just want to confirm that the current behavior is correct.
Why don’t we use the first item of the first section when suggestedSearchesReady is false and as the default value for getDefaultTodoSuggestedSearch?
I know it’s the same logic as in getDefaultTodoSuggestedSearch, but here, when navigating, we fall back to a saved search — whereas previously, it was simply the first item of the first section, correct?

When suggestions are ready we route to Approve for admins (or Submit/first Todo for others). If suggestions aren’t ready, we prefer the first saved search to avoid surfacing a random canned query, otherwise we fall back to the canned default.

Krishna2323 · 2025-10-17T09:16:26Z

src/hooks/useSearchTypeMenu.tsx

-    }, [similarSearchHash, isSavedSearchActive, typeMenuSections]);
+        const similarSearchIndex = flattenedMenuItems.findIndex((item) => item.similarSearchHash === similarSearchHash);
+
+        if (!shouldFallbackToTodoDefault) {


Add || similarSearchIndex === defaultTodoIndex to avoid additional checks.

Krishna2323 · 2025-10-17T09:34:11Z

src/pages/Search/SearchTypeMenu.tsx

+            return similarSearchIndex;
+        }
+
+        return defaultTodoIndex;


This will be "-1" when Approve/Submit doesn’t exist, I think we can fall back to first Todo item?

Updated, it would return the first Todo entry when Approve/Submit are absent.

Krishna2323 · 2025-10-17T09:43:24Z

tests/unit/components/NavigationTabBarUtilsTest.ts

+
+        expect(result?.key).toBe(CONST.SEARCH.SEARCH_KEYS.PAY);
+    });
+});


Add an edge case where the todo section is empty or missing to assert it returns undefined or expected fallback.

Sorry about that. This test looks completely redundant. Could you please remove it?

@ShridharGoel ^

Krishna2323 · 2025-10-17T09:45:57Z

Left few comments. Will try to complete the checklist today once resolved.

trjExpensify · 2025-10-17T13:22:13Z

Thanks! @ShridharGoel can you jump on that?

ShridharGoel · 2025-10-17T18:31:30Z

Updated.

Krishna2323 · 2025-10-18T01:31:33Z

@ShridharGoel I'm facing an issue on iOS -- after being added to a workspace the submit button is added to the todo options but for some reason the modal isn't opening correctly:

Steps to reproduce:

Create a new account
Go reports page
Invite the new account to an existing workspace in any other account
Wait for few seconds state gets updated
Open the menu on reports page

Monosnap.screencast.2025-10-18.06-55-59.mp4

ShridharGoel · 2025-11-18T13:59:41Z

Updated, should we get another adhoc build?

ShridharGoel · 2025-11-18T14:09:26Z

The test failures are unrelated.

dannymcclain · 2025-11-18T14:09:29Z

Yeah let's do it - I can run one now.

github-actions · 2025-11-18T14:10:23Z

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

github-actions · 2025-11-18T14:25:16Z

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

Android 🤖	iOS 🍎
❌ FAILED ❌	❌ FAILED ❌
The QR code can't be generated, because the Android build failed	The QR code can't be generated, because the iOS build failed

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/72034/NewExpensify.dmg	https://72034.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

ShridharGoel · 2025-11-18T17:32:24Z

@dannymcclain @dubielzyk-expensify Did you get a chance to check the updated build?

dannymcclain · 2025-11-18T18:10:00Z

It's looking pretty good to me, but I'd like @dubielzyk-expensify to have a final look too.

dubielzyk-expensify · 2025-11-19T02:23:30Z

Looks great! Thanks for implementing our feedback, @ShridharGoel ! Great work 👏

dubielzyk-expensify

Approve from a design side 👍

Krishna2323 · 2025-11-19T10:39:08Z

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_chrome.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: HybridApp

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

MacOS: Desktop

desktop_app.mp4

Krishna2323

Looks good to me! 🚀

Krishna2323 · 2025-11-19T10:57:22Z

@JS00001 could you please re-run the reviewer checklist check? I forgot to delete the old one before approving.

OSBotify · 2025-11-19T16:35:54Z

🚀 Deployed to staging by https://github.com/JS00001 in version: 9.2.61-0 🚀

platform	result
🖥 desktop 🖥	failure ❌
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

OSBotify · 2025-11-21T12:04:43Z

🚀 Deployed to production by https://github.com/grgia in version: 9.2.61-5 🚀

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

brunovjk · 2025-12-23T18:40:56Z

src/hooks/useSuggestedSearchDefaultNavigation.ts

+        const defaultMenuItem =
+            flattenedMenuItems.find((item) => item.key === CONST.SEARCH.SEARCH_KEYS.APPROVE) ?? flattenedMenuItems.find((item) => item.key === CONST.SEARCH.SEARCH_KEYS.SUBMIT);
+
+        if (!defaultMenuItem || similarSearchHash === defaultMenuItem.similarSearchHash) {


The PR introduced a bug where the app overrides user-selected search tabs (e.g., Expenses) by auto-navigating to a default tab (e.g., Approve) after skeleton loading. This happens because the condition doesn’t fully account for intentional user navigation. More details and fix proposal.

melvin-bot bot assigned ShridharGoel Oct 7, 2025

ShridharGoel changed the title ~~Add loading UI for search page + default to approve section for admins~~ Add loading UI for search page LHN + default to approve section for admins Oct 10, 2025

ShridharGoel marked this pull request as ready for review October 10, 2025 14:24

ShridharGoel requested a review from a team as a code owner October 10, 2025 14:24

melvin-bot bot requested review from Krishna2323 and removed request for a team October 10, 2025 14:24

ShridharGoel marked this pull request as draft October 11, 2025 07:22

ShridharGoel marked this pull request as ready for review October 11, 2025 20:09

Krishna2323 reviewed Oct 15, 2025

View reviewed changes

Krishna2323 reviewed Oct 17, 2025

View reviewed changes

Update to remove fade-in animation logic

b1ee4a3

dubielzyk-expensify self-requested a review November 19, 2025 02:23

dubielzyk-expensify previously approved these changes Nov 19, 2025

View reviewed changes

ShridharGoel requested a review from Krishna2323 November 19, 2025 04:45

Merge branch 'main' into approveSubmit

18513b5

ShridharGoel dismissed dubielzyk-expensify’s stale review via 18513b5 November 19, 2025 04:46

Krishna2323 approved these changes Nov 19, 2025

View reviewed changes

JS00001 approved these changes Nov 19, 2025

View reviewed changes

JS00001 merged commit bfeb33a into Expensify:main Nov 19, 2025
27 of 30 checks passed

OSBotify mentioned this pull request Nov 19, 2025

Deploy Checklist: New Expensify 2025-11-19 #75561

Closed

57 tasks

vincdargento mentioned this pull request Nov 19, 2025

[RCA #72034] Reports - "Action:approve" still applied on search input after "Approvals" are disabled #75591

Closed

8 tasks

lanitochka17 mentioned this pull request Nov 19, 2025

[$250] Reports - After refreshing, "Submit" section is opened by default again instead of "Approve" #75596

Closed

16 tasks

Beamanator mentioned this pull request Nov 20, 2025

[CP Staging] Revert "Add loading UI for search page menu + default to approve section for admins" #75650

Merged

melvin-bot bot mentioned this pull request Nov 21, 2025

[Due for payment 2025-12-10] [CFI] [$250] Default admins to "To-do: Approve" rather than "To-do: Submit" in the reports tab #71550

Closed

brunovjk reviewed Dec 23, 2025

View reviewed changes

Conversation

ShridharGoel commented Oct 7, 2025 • 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 Oct 10, 2025

Uh oh!

Krishna2323 commented Oct 11, 2025

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

ShridharGoel commented Oct 11, 2025

Uh oh!

Krishna2323 commented Oct 13, 2025

Uh oh!

ShridharGoel commented Oct 14, 2025

Uh oh!

Krishna2323 commented Oct 14, 2025

Uh oh!

ShridharGoel commented Oct 14, 2025

Uh oh!

Krishna2323 commented Oct 15, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Oct 15, 2025

Uh oh!

Krishna2323 commented Oct 15, 2025

Uh oh!

ShridharGoel commented Oct 16, 2025

Uh oh!

ShridharGoel commented Oct 16, 2025

Uh oh!

trjExpensify commented Oct 16, 2025

Uh oh!

Krishna2323 commented Oct 16, 2025

Uh oh!

trjExpensify commented Oct 16, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Krishna2323 commented Oct 17, 2025

Uh oh!

trjExpensify commented Oct 17, 2025

Uh oh!

ShridharGoel commented Oct 17, 2025

Uh oh!

Krishna2323 commented Oct 18, 2025

Steps to reproduce:

Uh oh!

ShridharGoel commented Nov 18, 2025

Uh oh!

ShridharGoel commented Nov 18, 2025

Uh oh!

dannymcclain commented Nov 18, 2025

Uh oh!

ShridharGoel commented Oct 7, 2025 •

edited

Loading

codecov bot commented Oct 11, 2025 •

edited by github-actions bot

Loading

Krishna2323 commented Nov 19, 2025 •

edited

Loading