Skip to content

Conversation

@NJ-2020
Copy link
Contributor

@NJ-2020 NJ-2020 commented Aug 2, 2025

Explanation of Change

  • Report field is editable only if there're other eligible reports:
    • Open (draft or un-submitted); and
    • From the same destination workspace; and
    • If create from global create menu, show all eligible reports from all workspaces
  • The selected report is highlighted with a checkmark in reports list

Fixed Issues

$ #62601
PROPOSAL: #62601 (comment)

Tests

Precondition: Created 1 workspace


  • Global create, no reports
  1. Tap + from global create action and then > Create Expense
  2. Enter amount, tap Show more
  3. Verify that: The Report field is not editable
  • Global create, multiple workspaces | multiple reports
  1. Go to any workspace
  2. Create some reports
  3. Click + from global create action and then > Create Expense
  4. Enter amount, tap Show more
  5. Verify that: Report field is editable + Shows all open (draft or un-submitted) reports + The latest open report from the default workspace is selected by default
  • Workspace chat, single report
  1. Go to any workspace
  2. Click + in the workspace composer chat
  3. Create Expense
  4. Enter amount, tap Show more
  5. Verify that: The Report field is not editable and the single report is being selected
  • Workspace chat, multiple reports
  1. Go to any workspace
  2. Click + in the workspace composer chat
  3. Create Expense
  4. Enter amount, tap Show more
  5. Verify that: Report field is editable + Shows all open (draft or un-submitted) reports from the current workspace + The latest open report from the current workspace is selected by default
  • Expense report
  1. Go to any workspace chat
  2. Open any report
  3. Click + > Create Expense
  4. Enter amount, tap Show more
  5. Verify that: The Report field is not editable and the current report is being selected
  • Transaction report > Report push row
  1. Go to any workspace chat
  2. Open any report
  3. Click the report menu field
  4. Verify that: Report field is editable + Shows all open, draft, submitted, or un-submitted reports from all workspaces + The current report is selected by default
  • Add Expense
  1. Go to any workspace chat
  2. Open report directly or select any report preview
Screenshot 2025-09-06 at 12 54 27
  1. Click the Create Expense option on the dropdown menu
  2. Enter amount, tap Show more
  3. Verify that: The Report field is not editable and the current report is being selected
  • Self DM, no reports
  1. Go to Self DM
  2. Create an Expense
  3. Click Send to someone and select any workspace
  4. Verify that: The report field is not editable
  • Self DM, single report
  1. Go to Self DM
  2. Create an Expense
  3. Click Send to someone and select any workspace
  4. Verify that: The report field is not editable and make sure the single report is being selected
  • Self DM, multiple reports
  1. Go to Self DM
  2. Create an Expense
  3. Click Send to someone and select any workspace
  4. Verify that: Report field is editable + Shows all open (draft or un-submitted) reports from that selected workspace + The latest open report from the default workspace is selected by default
  • Search page
  1. Open search/reports page
  2. Select any Expense
  3. Move Expense
  4. Verify that: The lists shows all open, draft, submitted, or un-submitted reports from all workspaces
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

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
    • MacOS: Desktop
  • 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 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
62601_native_android.mp4
Android: mWeb Chrome
62601_mweb_android.mp4
iOS: Native
Simulator.Screen.Recording.-.iPhone.15.Pro.-.2025-09-06.at.16.01.06.1.1.mp4
iOS: mWeb Safari
Simulator.Screen.Recording.-.iPhone.15.Pro.-.2025-09-06.at.13.17.01.1.1.mp4
MacOS: Chrome / Safari
Screen.Recording.2025-09-06.at.13.09.16.1.mp4
MacOS: Desktop
Screen.Recording.2025-09-06.at.13.34.37.1.mp4

@NJ-2020 NJ-2020 changed the title Fix/62601 1 fix: selected report is not highlighted with a checkmark on confirmation page Aug 2, 2025
@NJ-2020 NJ-2020 marked this pull request as ready for review August 5, 2025 05:22
@NJ-2020 NJ-2020 requested a review from a team as a code owner August 5, 2025 05:22
@melvin-bot melvin-bot bot requested review from dominictb and removed request for a team August 5, 2025 05:22
@melvin-bot
Copy link

melvin-bot bot commented Aug 5, 2025

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

@dominictb
Copy link
Contributor

@NJ-2020 We have unit tests failure that is related to this PR. Can you check?

@NJ-2020
Copy link
Contributor Author

NJ-2020 commented Aug 11, 2025

@dominictb Done, fixed

@dominictb
Copy link
Contributor

dominictb commented Aug 12, 2025

Shows all reports

I think these instances in test steps should be Shows all open (draft or un-submitted) reports

@dominictb
Copy link
Contributor

Expense report > report menu

I don't understand this test case. Can you link a recording here?

@dominictb
Copy link
Contributor

Expense report

I see duplicated test cases for this

Screenshot 2025-08-12 at 21 54 45

Also "expense" and "expense report" are different. I think you meant "Open any expense report" and "Select any expense report". The expense is the transaction itself where it opens the transaction thread report. While expense report is the report grouping one or multiple expenses. Please update accordingly.

@dominictb
Copy link
Contributor

Search page

I think the last step should only be:

4. List shows all reports including the (submitted reports) from all workspaces

Because there's no difference between self DM and workspace chat in this case.

@dominictb
Copy link
Contributor

Add Expense

This should be "Add expense button on report header or report preview". Then we need another test case for the "report preview" case:

Screenshot 2025-08-12 at 22 00 52

@dominictb
Copy link
Contributor

dominictb commented Aug 12, 2025

We also need a test case for editing report.

@dominictb
Copy link
Contributor

BUG: Report field is editable even though there's only 1 eligible report if I create the expense from global create

Screen.Recording.2025-08-12.at.22.09.40.mov

@dominictb
Copy link
Contributor

BUG: Report field is editable when creating expense from chat create button and there are a submitted report and an un-submitted report

Screen.Recording.2025-08-12.at.22.53.51.mov

@dominictb
Copy link
Contributor

BUG: Report name changes from Expense Report 2025-08-12 to Expense Report #REPORT_ID when there is no eligible (open) expense report:

Screen.Recording.2025-08-12.at.22.56.41.mov

@dominictb
Copy link
Contributor

BUG: #62977 (comment)

@NJ-2020
Copy link
Contributor Author

NJ-2020 commented Aug 14, 2025

BUG: #67711 (comment)

@dominictb I am able to reproduce this on main as well

Screen.Recording.2025-08-14.at.08.06.32.mov

@NJ-2020
Copy link
Contributor Author

NJ-2020 commented Aug 14, 2025

BUG: #62977 (comment)

I am not able to reproduce this
Screenshot 2025-08-14 at 08 11 36

@NJ-2020
Copy link
Contributor Author

NJ-2020 commented Aug 14, 2025

Updated test cases

@NJ-2020
Copy link
Contributor Author

NJ-2020 commented Aug 14, 2025

Expense report > report menu
I don't understand this test case. Can you link a recording here?

@dominictb I mean this one:

Screen.Recording.2025-08-14.at.09.15.03.mov

@dominictb
Copy link
Contributor

dominictb commented Sep 9, 2025

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
Screen.Recording.2025-09-10.at.17.55.48-compressed.mov
Android: mWeb Chrome
Screen.Recording.2025-09-10.at.18.06.44-compressed.mov
iOS: HybridApp
Screen.Recording.2025-09-10.at.17.24.10-compressed.mov
iOS: mWeb Safari
Screen.Recording.2025-09-10.at.17.44.27-compressed.mov
MacOS: Chrome / Safari
Screen.Recording.2025-09-09.at.15.55.02-compressed.mov
MacOS: Desktop

@dominictb
Copy link
Contributor

Self DM, multiple reports

Please update the step 4 of this test case to "Shows all open (draft or un-submitted) reports from that selected workspace"

@dominictb
Copy link
Contributor

dominictb commented Sep 9, 2025

BUG: Report push row shows report A but report editor shows report B as selected in self DM:

  1. Create several open reports in a workspace chat
  2. Send an IOU from self DM to that workspace
  3. Observe that Report push row shows report A but report editor shows another report as selected
Screenshot 2025-09-09 at 15 50 39 Screenshot 2025-09-09 at 15 50 41

@NJ-2020
Copy link
Contributor Author

NJ-2020 commented Sep 10, 2025

@dominictb I am not able to reproduce this

BUG: Report push row shows report A but report editor shows report B as selected in self DM:

Screenshot 2025-09-10 at 10 28 45 Screenshot 2025-09-10 at 10 28 18

Could you please re-try again? Thanks

@NJ-2020
Copy link
Contributor Author

NJ-2020 commented Sep 10, 2025

Please update the step 4 of this test case to

Done, updated

@dominictb
Copy link
Contributor

dominictb commented Sep 10, 2025

  1. Please update Tests to highlight the default selected report. For example:

Global create, multiple workspaces | multiple reports
5. Verify that:

The Report field is editable +
Shows all open (draft or un-submitted) reports

Verify that: Report field is editable + Shows all open (draft or un-submitted) reports + The latest open report from the default workspace is selected by default

Workspace chat, multiple reports
5. Verify that:

The Report field is editable
Shows all open (draft or un-submitted) reports from the current workspace

Verify that: Report field is editable + Shows all open (draft or un-submitted) reports from the current workspace + The latest open report from the current workspace is selected by default

Transaction report > Report push row
4. Verify that:

The Report field is editable
Shows all open, draft, submitted, or un-submitted reports from all workspaces

Verify that: Report field is editable + Shows all open, draft, submitted, or un-submitted reports from all workspaces + The current report is selected by default

Self DM, multiple reports
4. Verify that:

The report field is editable
Shows all open (draft or un-submitted) reports from that selected workspace

Verify that: Report field is editable + Shows all open (draft or un-submitted) reports from that selected workspace + The latest open report from the default workspace is selected by default

  1. Whenever you mention reports, they should be open (draft or un-submitted) reports. For example, "Self DM, multiple reports" should be "Self DM, multiple open (draft or un-submitted) reports`.
  2. Please update Explanation of Change like this:
- Report field is editable only if there're other eligible reports:
  - Open (draft or un-submitted); and
  - From the same destination workspace; and
  - If create from global create menu, show all eligible reports from all workspaces
- The selected report is highlighted with a checkmark in reports list

@dominictb
Copy link
Contributor

After the above update, we're good to go. Thanks.

@luacmartins luacmartins self-requested a review September 10, 2025 10:57
@dominictb
Copy link
Contributor

dominictb commented Sep 10, 2025

BUG

For the "Global create, multiple workspaces | multiple reports" case:

  1. When I select a workspace that has many open reports, the report field is editable and it shows all open reports from all workspaces
  2. But if I changed to another workspace that has only 1 open report, the report field is not editable
Screen.Recording.2025-09-10.at.18.02.19.mov

I think for the second case, the report field should be editable since we're showing all reports from all workspaces, not just that single workspace.

@luacmartins
Copy link
Contributor

Cool, @NJ-2020 let's address the comments above.

@NJ-2020
Copy link
Contributor Author

NJ-2020 commented Sep 11, 2025

#67711 (comment)

@dominictb Thank you

@NJ-2020
Copy link
Contributor Author

NJ-2020 commented Sep 11, 2025

BUG "Global create" menu selection, multiple workspaces | multiple reports" case ...:

Done, fixed ✅

@NJ-2020
Copy link
Contributor Author

NJ-2020 commented Sep 11, 2025

Updated test cases

Please re-review

cc: @dominictb @luacmartins

Thanks

dominictb

This comment was marked as off-topic.

Copy link
Contributor

@dominictb dominictb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎀👀🎀 LGTM

Copy link
Contributor

@luacmartins luacmartins left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@luacmartins luacmartins merged commit 3ab8482 into Expensify:main Sep 11, 2025
22 of 24 checks passed
@OSBotify
Copy link
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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/luacmartins in version: 9.2.13-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.13-1 🚀

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

// When creating an expense in an individual report, the report field becomes read-only
// since the destination is already determined and there's no need to show a selectable list.
const shouldReportBeEditable = !!firstOutstandingReport && !isMoneyRequestReport(reportID, allReports);
const shouldReportBeEditable = (isFromGlobalCreate ? allOutstandingReports.length > 1 : availableOutstandingReports.length > 1) && !isMoneyRequestReport(reportID, allReports);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NJ-2020 is there a reason for using allOutstandingReports when isFromGlobalCreate = true?
I think we can always use availableOutstandingReports like this:

const shouldReportBeEditable = availableOutstandingReports.length > 1 && !isMoneyRequestReport(reportID, allReports);

I get all eligible reports properly when create from FAB.

Issue: #73609 (comment)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NJ-2020 bump above question. I see you're active on other PRs

This comment was marked as resolved.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@aimane-chnaif When creating an expense from the global action, we need to check all outstanding reports across workspaces so users can select a different report (from another workspace) if needed.

This was added here to fix this bug where workspaces with only one report, the report field aren't editable.

Thanks!

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