fix: The order of selected workspace and selected report are inconsistent by etCoderDysto · Pull Request #65248 · Expensify/App

etCoderDysto · 2025-07-01T11:28:55Z

Explanation of Change

Fixed Issues

$ #64152
PROPOSAL: #64152 (comment)

Tests

Same as QA steps

Verify that no errors appear in the JS console

Offline tests

Same as QA steps

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Go to staging.new.expensify.com
Create a workspace
Go to workspace chat
Create 4 empty reports and name them A, B, C, D.
Go to expense report D.
Submit an expense to expense report D.
Open the expense report detail
Click Report field.
Verify that the selected report (report D) comes at the top of the list and the rest of the list are sorted alphabetically

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

android.chrome.mp4

iOS: Native

Screen.Recording.2025-07-09.at.12.17.31.in.the.afternoon.mp4

iOS: mWeb Safari

ios.safari.mp4

MacOS: Chrome / Safari

web.98.mp4

MacOS: Desktop

desktop.mp4

melvin-bot · 2025-07-03T09:21:29Z

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

etCoderDysto · 2025-07-03T09:23:14Z

@hoangzinh android and ios is crashing when I am opening an expense report. I haven't added evidence for android and ios native. I think there is a known issue here

hoangzinh · 2025-07-03T10:30:15Z

@etCoderDysto can you try with expense with category?

etCoderDysto · 2025-07-03T10:54:41Z

@etCoderDysto can you try with expense with category?

Yes, it is crashing when I am adding category too. Is it working fine for you when you open an expense report?

hoangzinh · 2025-07-03T13:13:41Z

src/libs/ReportUtils.ts

+ * @param report2 Details of the second report to be compared.
+ * @param selectedReportID ID of the selected report which needs to be at the beginning.
+ */
+function sortOutstandingReportsBySelected(report1: OnyxEntry<Report>, report2: OnyxEntry<Report>, selectedReportID: string | undefined): number {


Can you add unit tests for this function?

I have added a unit test.

hoangzinh · 2025-07-03T13:21:33Z

I can view expenses normally

Screen.Recording.2025-07-03.at.20.20.18.mov

hoangzinh · 2025-07-04T14:47:15Z

@etCoderDysto have you created expense successfully?

etCoderDysto · 2025-07-04T14:50:41Z

@etCoderDysto have you created expense successfully?

I can create an expense but it crashes when opening the expense. I cleaned the project and rebuild it as a new. It didn't fix my issue. I think other contributors are also facing similar issue. But it works fine if I opened the expense from reports page. I will by pass the crash by opening the expense from reports page and upload evidence for native devices.

hoangzinh · 2025-07-05T13:11:45Z

It's weird. I tested creating expenses a lot in a day and didn't face your issues. Can you test on latest main app? It could be because of our changes in this PR

etCoderDysto · 2025-07-08T10:34:44Z

It's weird. I tested creating expenses a lot in a day and didn't face your issues. Can you test on latest main app? It could be because of our changes in this PR

Yes, I have tried it on main. And I am facing the same issue on main too.

hoangzinh · 2025-07-08T16:43:48Z

anw, let try to complete the checklist.

etCoderDysto · 2025-07-09T09:42:30Z

anw, let try to complete the checklist.

@hoangzinh I have added evidence for iOS and I have resolved merge conflict. PR is ready for further review.

hoangzinh · 2025-07-10T10:27:36Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-07-10.at.17.31.17.web.mov

MacOS: Desktop

hoangzinh

LGTM

cristipaval · 2025-07-14T07:01:17Z

@etCoderDysto could you please resolve conflicts?

etCoderDysto · 2025-07-14T07:40:37Z

@etCoderDysto could you please resolve conflicts?

@cristipaval I have resolved conflicts🙏.

OSBotify · 2025-07-14T08:19:11Z

✋ 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-07-15T03:21:29Z

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.1.81-0 🚀

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

github-actions · 2025-07-16T19:53:11Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.1.81-7 🚀

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

situchan · 2025-11-03T03:56:08Z

src/libs/ReportUtils.ts

+    if (report2?.reportID === selectedReportID) {
+        return 1;
+    }
+    return report1?.reportName?.localeCompare(report2?.reportName?.toLowerCase() ?? '') ?? 0;


Coming from #72039, we should sort the reports by created date to be consistent with Reports page.

etCoderDysto added 3 commits July 1, 2025 14:15

create a function that sorts outstanding reports by selected id

1238c32

add comment for the sort function

465c0fd

sort the report on EditReportCommon page

9cf25a8

etCoderDysto changed the title ~~fix:~~ fix: The order of selected workspace and selected report are inconsistent Jul 2, 2025

Merge branch 'main' into sort_outstanding_report

e694f27

etCoderDysto marked this pull request as ready for review July 3, 2025 09:21

etCoderDysto requested a review from a team as a code owner July 3, 2025 09:21

melvin-bot bot requested review from hoangzinh and removed request for a team July 3, 2025 09:21

hoangzinh reviewed Jul 3, 2025

View reviewed changes

etCoderDysto added 2 commits July 3, 2025 23:15

add a unit test for sortOutstandingReportsBySelected

e777f71

remove only call used to isolate new test

4a3e541

merge main to feature branch

81f525c

hoangzinh approved these changes Jul 10, 2025

View reviewed changes

melvin-bot bot requested a review from cristipaval July 10, 2025 14:25

cristipaval previously approved these changes Jul 14, 2025

View reviewed changes

merge main to fix branch

9bfea88

etCoderDysto dismissed cristipaval’s stale review via 9bfea88 July 14, 2025 07:27

cristipaval approved these changes Jul 14, 2025

View reviewed changes

cristipaval merged commit c6bec13 into Expensify:main Jul 14, 2025
18 checks passed

github-actions bot mentioned this pull request Jul 15, 2025

Deploy Checklist: New Expensify 2025-07-15 #66099

Closed

95 tasks

hoangzinh mentioned this pull request Jul 28, 2025

[Payment Due] [$250] Expense - The order of selected workspace and selected report are inconsistent #64152

Closed

8 tasks

situchan reviewed Nov 3, 2025

View reviewed changes

Conversation

etCoderDysto commented Jul 1, 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 Jul 3, 2025

Uh oh!

etCoderDysto commented Jul 3, 2025

Uh oh!

hoangzinh commented Jul 3, 2025

Uh oh!

etCoderDysto commented Jul 3, 2025

Uh oh!

hoangzinh Jul 3, 2025

Choose a reason for hiding this comment

Uh oh!

etCoderDysto Jul 4, 2025

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Jul 3, 2025

Uh oh!

hoangzinh commented Jul 4, 2025

Uh oh!

etCoderDysto commented Jul 4, 2025

Uh oh!

hoangzinh commented Jul 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

etCoderDysto commented Jul 8, 2025

Uh oh!

hoangzinh commented Jul 8, 2025

Uh oh!

etCoderDysto commented Jul 9, 2025

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

cristipaval commented Jul 14, 2025

Uh oh!

etCoderDysto commented Jul 14, 2025

Uh oh!

Uh oh!

OSBotify commented Jul 14, 2025

Uh oh!

github-actions bot commented Jul 15, 2025

Uh oh!

github-actions bot commented Jul 16, 2025

Uh oh!

situchan Nov 3, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

etCoderDysto commented Jul 1, 2025 •

edited

Loading

hoangzinh commented Jul 5, 2025 •

edited

Loading

hoangzinh commented Jul 10, 2025 •

edited

Loading