Fix report selection #62977

luacmartins · 2025-05-28T16:23:59Z

Explanation of Change

Only allows editing the report field if there's an alternative available report.
Makes sure that the draft transaction is using the correct reportID so the current report shows up as selected in the list

Fixed Issues

$ #62601
$ #62899
$ #62970
$ #62897

Tests

Precondition:

Log in with Expensifail account
A workspace
Account has no outstanding (un-submitted) expense report

Scenario 1: New expense

+ > Create report
+ > Create expense
Enter amount, tap Show more
Verify that the Report field is not editable
Submit the expense
+ > Create report
+ > Create expense
Enter amount, tap Show more
Verify that the Report field is editable
Select the report field
Verify that you see both reports and the current report is selected
Select the other report
Submit the transaction
Verify that it is added to the selected report

Scenario 2: Editing

Open one of the reports and select one of the transactions created in Scenario 1
Verify that the Report field has the correct report and is editable
Select the Report field.
Change the report
Verify that it works

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Scenario 1: Global create no reports

globalCreate_noReports.mov

Scenario 2: Global create, multiple reports

globalCreate_multipleReports.mov

Scenario 3: Global create, multiple workspaces, multiple reports

globalCreate_multipleWorkspacesAndReports2.mov

Scenario 4: Workspace chat, single report

workspaceChat_singleReport.mov

Scenario 5: Workspace chat, multiple reports

workspaceChat_miltipleReports.mov

Scenario 6: Expense report

expenseReport_multipleReports.mov

Scenario 7: Add expense

addExpense.mov

Scenario 8: Search page

searchPage_multipleWorkspacesAndReports.mov

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…Selection

melvin-bot · 2025-05-30T19:35:56Z

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

luacmartins · 2025-06-02T22:15:57Z

@dominictb let's prioritize reviewing this PR when you're online please!

dominictb · 2025-06-03T21:37:48Z

Oh I'm just about to review this one. Cc @ZhenjaHorbach if you havent started.

ZhenjaHorbach · 2025-06-03T21:41:25Z

Oh I'm just about to review this one. Cc @ZhenjaHorbach if you havent started.

Just finished with web 😅

dominictb · 2025-06-03T21:49:25Z

@ZhenjaHorbach Can you spare this one for me? Sorry I've just finished 1 large PR in a project. This is being on my plate for the last hour. Thanks all for the understanding.

ZhenjaHorbach · 2025-06-03T21:52:56Z

@ZhenjaHorbach Can you spare this one for me? Sorry I've just finished 1 large PR in a project. This is being on my plate for the last hour. Thanks all for the understanding.

No problem
Go ahead then !

And just found
It's not related with current changes
But looks weird (But I'm not sure. Maybe it's normal )
When we move an expense from one report to another

And then press go back
We navigate to the previous report

I suppose we should navigate to the main report screen

2025-06-03.23.48.06.mov

ZhenjaHorbach · 2025-06-03T21:57:23Z

And the last one from my side

When we are creating new expense and during this process select another report
We save an expense in the current report

2025-06-03.23.56.23.mov

luacmartins · 2025-06-03T23:22:07Z

@ZhenjaHorbach the navigation issue is already on main, I think we should address that in a separate PR.

dominictb · 2025-06-10T18:59:14Z

Will add screenshots and checklist in 2-3 hours when I'm online.

dominictb · 2025-06-10T23:52:59Z

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

Screen.Recording.2025-06-11.at.07.26.16-compressed.mov

iOS: HybridApp

Screen.Recording.2025-06-11.at.07.15.08-compressed.mov

iOS: mWeb Safari

Screen.Recording.2025-06-11.at.07.16.41-compressed.mov

MacOS: Chrome / Safari

Screen.Recording.2025-06-11.at.06.57.51-compressed.mov

MacOS: Desktop

Screen.Recording.2025-06-11.at.07.07.26-compressed.mov

dominictb

Looks good and tests well. Just some conflicts.

melvin-bot · 2025-06-11T00:28:46Z

@youssef-lr 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]

luacmartins · 2025-06-11T00:47:39Z

I resolved conflicts, but I wasn't able to test yet. I'll do that tomorrow morning.

luacmartins · 2025-06-11T15:32:26Z

Ok, the PR with the previous conflicts was reverted so we're back to the original changes pre-conflict. @youssef-lr could you please try to review this one today if possible?

youssef-lr

LGTM!

youssef-lr · 2025-06-12T16:26:37Z

You completed 49 out of 59 checklist items with 10 unfinished items

I don't get it, all 59 are checked off

youssef-lr · 2025-06-12T16:27:14Z

ah because there is a previous unfinished checklist

OSBotify · 2025-06-12T16:36:42Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2025-06-12T22:36:56Z

🚀 Deployed to staging by https://github.com/youssef-lr in version: 9.1.66-0 🚀

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

github-actions · 2025-06-16T10:58:16Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.1.66-5 🚀

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

github-actions · 2025-06-16T15:54:00Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.1.66-5 🚀

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

github-actions · 2025-06-16T16:14:41Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.1.66-5 🚀

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

Revert "[CP Staging] Revert "Fix report selection""

65ca668

luacmartins self-assigned this May 28, 2025

luacmartins added 13 commits May 28, 2025 17:21

Merge branch 'main' into revert-62973-revert-62659-cmartins-fixReport…

dafbd44

…Selection

Merge branch 'main' into revert-62973-revert-62659-cmartins-fixReport…

bb5b746

…Selection

update condition

f6f8418

use selectedReportID to filter on policies

c4315a0

fix selection

202b904

fix report name

3704824

revert nav change

68a5b96

revert onyx change

7508167

dismiss with report

8660bed

Merge branch 'main' into revert-62973-revert-62659-cmartins-fixReport…

3211b8c

…Selection

fix lint

6acdc27

Merge branch 'main' into revert-62973-revert-62659-cmartins-fixReport…

de5edf1

…Selection

Merge branch 'main' into revert-62973-revert-62659-cmartins-fixReport…

3515f95

…Selection

luacmartins marked this pull request as ready for review May 30, 2025 19:35

luacmartins requested a review from a team as a code owner May 30, 2025 19:35

melvin-bot bot requested review from dominictb and removed request for a team May 30, 2025 19:35

luacmartins changed the title ~~Fix report selection v2~~ Fix report selection May 30, 2025

luacmartins requested review from ZhenjaHorbach and removed request for dominictb June 3, 2025 21:20

dominictb approved these changes Jun 11, 2025

View reviewed changes

melvin-bot bot requested a review from youssef-lr June 11, 2025 00:28

resolve conflicts

be8b4a9

resolve conflicts

5d5619c

youssef-lr approved these changes Jun 12, 2025

View reviewed changes

Expensify deleted a comment from ZhenjaHorbach Jun 12, 2025

youssef-lr merged commit 188979a into main Jun 12, 2025
21 of 24 checks passed

youssef-lr deleted the revert-62973-revert-62659-cmartins-fixReportSelection branch June 12, 2025 16:28

github-actions bot mentioned this pull request Jun 12, 2025

Deploy Checklist: New Expensify 2025-06-12 #64109

Closed

44 tasks

nkdengineer mentioned this pull request Jun 13, 2025

[Due for payment 2025-06-24] [Due for payment 2025-06-23] [$250] Expense - Report field in track distance expense opens not here page #64130

Closed

8 tasks

This was referenced Jun 13, 2025

[CP Staging] Revert "Fix report selection" #64175

Merged

[Due for payment 2025-09-23] [$250] Expense - The selected report is not highlighted with a checkmark on confirmation page #62601

Closed

dominictb mentioned this pull request Aug 12, 2025

fix: selected report is not highlighted with a checkmark on confirmation page #67711

Merged

51 tasks

Fix report selection #62977

Fix report selection #62977

Uh oh!

Conversation

luacmartins commented May 28, 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 May 30, 2025

Uh oh!

luacmartins commented Jun 2, 2025

Uh oh!

dominictb commented Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ZhenjaHorbach commented Jun 3, 2025

Uh oh!

dominictb commented Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ZhenjaHorbach commented Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ZhenjaHorbach commented Jun 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

luacmartins commented Jun 3, 2025

Uh oh!

dominictb commented Jun 10, 2025

Uh oh!

dominictb commented Jun 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dominictb left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Jun 11, 2025

Uh oh!

luacmartins commented Jun 11, 2025

Uh oh!

luacmartins commented Jun 11, 2025

Uh oh!

youssef-lr left a comment

Choose a reason for hiding this comment

Uh oh!

youssef-lr commented Jun 12, 2025

Uh oh!

youssef-lr commented Jun 12, 2025

Uh oh!

Uh oh!

OSBotify commented Jun 12, 2025

Uh oh!

github-actions bot commented Jun 12, 2025

Uh oh!

github-actions bot commented Jun 16, 2025

Uh oh!

github-actions bot commented Jun 16, 2025

Uh oh!

github-actions bot commented Jun 16, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

luacmartins commented May 28, 2025 •

edited

Loading

dominictb commented Jun 3, 2025 •

edited

Loading

dominictb commented Jun 3, 2025 •

edited

Loading

ZhenjaHorbach commented Jun 3, 2025 •

edited

Loading

ZhenjaHorbach commented Jun 3, 2025 •

edited

Loading

dominictb commented Jun 10, 2025 •

edited

Loading