Improve create report flow from search page with workspace validation by mukhrr · Pull Request #83975 · Expensify/App

mukhrr · 2026-03-03T02:31:02Z

Explanation of Change

Fixed Issues

$ #83960
#83782
PROPOSAL: #83782 (comment)

Tests

Login with new account
Go to Report/Reports page
Click "Create" button on top right
Verify you "Create Report" option
Click "Create Report"
Verify you see workspace upgrade -> workspace creation modals flow
Click workspace to create a report
Again click "Create Report" and verify it automatically creates report in default workspace

Verify that no errors appear in the JS console

Offline tests

QA Steps

Rhe same as tests

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 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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mp4

… and upgrade handling

melvin-bot · 2026-03-03T02:31:09Z

@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-03-03T02:37:44Z

Codecov Report

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

Files with missing lines	Coverage Δ
.../SearchPageHeader/SearchFiltersBarCreateButton.tsx	`97.61% <95.45%> (+93.27%)`	⬆️
...c/pages/iou/request/step/IOURequestStepUpgrade.tsx	`0.00% <0.00%> (ø)`
... and 13 files with indirect coverage changes

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 5c2a306a27

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

src/components/Search/SearchPageHeader/SearchFiltersBarCreateButton.tsx

mukhrr · 2026-03-03T02:53:02Z

@mananjadhav let's get this merged ASAP, pls, before the PR gets reverted. cc @trjExpensify

mananjadhav · 2026-03-03T17:33:53Z

src/components/Search/SearchPageHeader/SearchFiltersBarCreateButton.tsx

    const [groupPoliciesWithChatEnabled = CONST.EMPTY_ARRAY] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: groupPaidPoliciesWithChatEnabledSelector}, [email]);
-    const [shouldRedirectToExpensifyClassic = false] = useOnyx(ONYXKEYS.COLLECTION.POLICY, {selector: shouldRedirectToExpensifyClassicSelector});
-    const shouldShowCreateReportOption = shouldRedirectToExpensifyClassic || groupPoliciesWithChatEnabled.length > 0;
+    const currentUserPersonalDetails = useCurrentUserPersonalDetails();


@mukhrr I am reviewing this code and I can see most of this is similar/picked from the FloatingActionButtonAndPopver? Is this the correct solution?

@mananjadhav I thought so since they almost do the same behave

I've posted the same question here, primarily about the duplication of the code and moving to another hook.

cc - @puneetlath

trjExpensify

The video in the OP shows the workspace selector when the user has a default group workspace:

Isn't that what the bug linked to this PR was about?

github-actions · 2026-03-03T20:31:39Z

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

puneetlath · 2026-03-03T20:44:12Z

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 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: mWeb Safari

MacOS: Chrome / Safari

puneetlath · 2026-03-03T20:47:20Z

CleanShot.2026-03-03.at.15.45.56.mp4

Improve create report flow from search page with workspace validation (cherry picked from commit dc22562) (cherry-picked to staging by blimpich)

github-actions · 2026-03-03T21:30:46Z

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

github-actions · 2026-03-03T21:36:11Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-dc22562-cd8cd82-32a9bb9aa8ec905ab446bbe24b827cb3aa0d2034/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-dc22562-cd8cd82-db089cd56177c05aa70b7133aaa653ce1ba5fde8/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-03T21:41:51Z

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.3.28-7 🚀

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

m-natarajan · 2026-03-03T22:05:58Z

@mukhrr @puneetlath @trjExpensify
Create button not displayed in native apps, Is this expected?

ScreenRecording_03-03-2026.16-56-13_1.MP4

puneetlath · 2026-03-03T22:08:27Z

Yes, it is only expected to show on wider views.

trjExpensify · 2026-03-04T01:15:26Z

Yep, agreed!

OSBotify · 2026-03-04T03:21:10Z

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.3.30-0 🚀

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

OSBotify · 2026-03-04T18:10:53Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.30-3 🚀

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

OSBotify · 2026-03-04T18:37:32Z

🚀 Cherry-picked to staging by https://github.com/blimpich in version: 9.3.31-0 🚀

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

OSBotify · 2026-03-06T03:50:11Z

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.31-12 🚀

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

Improve create report flow from search page with workspace validation…

5c2a306

… and upgrade handling

mukhrr requested review from a team as code owners March 3, 2026 02:31

melvin-bot bot assigned mukhrr Mar 3, 2026

melvin-bot bot requested review from mananjadhav and removed request for a team March 3, 2026 02:31

melvin-bot bot requested review from trjExpensify and removed request for a team March 3, 2026 02:31

chatgpt-codex-connector bot reviewed Mar 3, 2026

View reviewed changes

src/components/Search/SearchPageHeader/SearchFiltersBarCreateButton.tsx Outdated Show resolved Hide resolved

mukhrr added 2 commits March 3, 2026 07:41

Add empty report confirmation modal to search page create report flow

6f56618

Add unit tests for SearchFiltersBarCreateButton component

e1df428

mukhrr mentioned this pull request Mar 3, 2026

[Due for payment 2026-03-13] [$250] Reports - Workspace selector opens when there is a default workspace #83960

Open

7 tasks

mananjadhav reviewed Mar 3, 2026

View reviewed changes

trjExpensify reviewed Mar 3, 2026

View reviewed changes

This comment has been minimized.

Sign in to view

puneetlath approved these changes Mar 3, 2026

View reviewed changes

puneetlath merged commit dc22562 into Expensify:main Mar 3, 2026
29 of 34 checks passed

OSBotify pushed a commit that referenced this pull request Mar 3, 2026

Merge pull request #83975 from mukhrr/fix/create-reports

83bb043

Improve create report flow from search page with workspace validation (cherry picked from commit dc22562) (cherry-picked to staging by blimpich)

OSBotify added the CP Staging marks PRs that have been CP'd to staging label Mar 3, 2026

OSBotify mentioned this pull request Mar 3, 2026

Deploy Checklist: New Expensify 2026-03-02 #83947

Closed

github-actions bot mentioned this pull request Mar 3, 2026

Investigate workflow job failing on main: test / test (job 8) #84083

Closed

jponikarchuk mentioned this pull request Mar 4, 2026

Reports - Workspace does not become default workspace after selecting it from Create button #84139

Open

7 tasks

Conversation

mukhrr commented Mar 3, 2026

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 3, 2026

Uh oh!

codecov bot commented Mar 3, 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!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

mukhrr commented Mar 3, 2026

Uh oh!

mananjadhav Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

mukhrr Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

mananjadhav Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

trjExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Mar 3, 2026

Uh oh!

This comment has been minimized.

puneetlath commented Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

puneetlath commented Mar 3, 2026

Uh oh!

Uh oh!

github-actions bot commented Mar 3, 2026

Uh oh!

github-actions bot commented Mar 3, 2026

Uh oh!

OSBotify commented Mar 3, 2026

Uh oh!

m-natarajan commented Mar 3, 2026

Uh oh!

puneetlath commented Mar 3, 2026

Uh oh!

trjExpensify commented Mar 4, 2026

Uh oh!

OSBotify commented Mar 4, 2026

Uh oh!

OSBotify commented Mar 4, 2026

Uh oh!

OSBotify commented Mar 4, 2026

Uh oh!

OSBotify commented Mar 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

codecov bot commented Mar 3, 2026 •

edited by github-actions bot

Loading

mananjadhav Mar 3, 2026 •

edited

Loading

puneetlath commented Mar 3, 2026 •

edited

Loading