fix: IOU report cannot be moved to workspace by nkdengineer · Pull Request #63011 · Expensify/App

nkdengineer · 2025-05-29T04:48:30Z

Explanation of Change

Fixed Issues

$ #61982
PROPOSAL: #61982 (comment)

Tests

Precondition:

Log in with Expensifail account.
User A has at least one workspace.
User B is the payer of this workspace

As user A submits an expense to user B.
As user B go to the expense report
Click More.
Click Change workspace.
Select the workspace above
Verify that: IOU report can be moved to workspace.
As user A submits another expense to user B
As user B also submit another expense to user A
Go to expense report
Click More.
Verify that change workspace options isn't displayed

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

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android-mweb.mov

iOS: Native

Screen_Recording_2025-06-09_at_01.13.46.mov

iOS: mWeb Safari

ios-mweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2025-05-30T09:38:35Z

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

c3024 · 2025-05-30T14:42:35Z

Asked for a clarification here.

c3024 · 2025-05-30T18:05:05Z

@nkdengineer

Please refer to this update for the behaviour required.

c3024 · 2025-05-31T12:15:34Z

@nkdengineer

We need to hide the option for this scenario 2 too using the logic similar to this.

Scenario 2:
[user a] sends 1 request to [user b]
[user b] sends 1 request to [user a]
[user a] and [user b] cannot move the request to any other workspace because the IOU request has requests from multiple users

c3024 · 2025-06-02T13:02:42Z

@nkdengineer

Please check this.

nkdengineer · 2025-06-02T13:03:27Z

On it will give an update today

nkdengineer · 2025-06-03T06:04:32Z

@c3024 Updated.

c3024

Minor suggestions

c3024 · 2025-06-04T08:10:49Z

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

receiverAndroid.mov

Android: mWeb Chrome

receiverAndroidmWeb.mov

iOS: HybridApp

receiveriOS.mov

iOS: mWeb Safari

receiveriOSmWeb.mov

MacOS: Chrome / Safari

senderChrome.mov

receiverChrome.mov

doubleChrome1.mov

MacOS: Desktop

receiverDesktop.mov

c3024

Apart from these minor suggestions, LGTM!

youssef-lr · 2025-06-04T16:12:38Z

+                return isAdmin;
+            }
+
+            // If we are the reimburser and the report is approved or we are the manager then we can pay it.


or we are the manager

I don't see any condition that checks for this?

@youssef-lr Sorry, it's the comment from isPayer function for a special expense report. I updated the comment correctly.

youssef-lr · 2025-06-04T16:14:14Z

@nkdengineer please address @c3024's comments

Co-authored-by: c3024 <102477862+c3024@users.noreply.github.com>

nkdengineer · 2025-06-10T20:51:27Z

friendly bump @youssef-lr to merge

youssef-lr · 2025-06-12T15:53:00Z

@nkdengineer apologies I was OOO. Can you resolve conflicts?

nkdengineer · 2025-06-12T16:58:49Z

@youssef-lr I updated.

OSBotify · 2025-06-12T17:55:05Z

✋ 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:59Z

🚀 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:19Z

🚀 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:03Z

🚀 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:44Z

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

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

luacmartins · 2025-07-16T20:04:21Z

+    const managerLogin = getLoginByAccountID(report?.managerID ?? CONST.DEFAULT_NUMBER_ID);
+    // We can't move the iou report to the workspace if both users from the iou report create the expense
+    if (doesReportContainRequestsFromMultipleUsers(report)) {
+        return false;
+    }
+
+    // We can only move the iou report to the workspace if the manager is the payer of the new policy
+    if (isIOUReport(report)) {
+        return isPaidGroupPolicyPolicyUtils(newPolicy) && isWorkspacePayer(managerLogin ?? '', newPolicy);
+    }


FYI isWorkspaceEligibleForReportChange is supposed to check if the user has access to a paid policy. We have a separate method canEditReportPolicy that I think this logic is better suited for

nkdengineer added 5 commits May 29, 2025 11:48

fix: IOU report cannot be moved to workspace

8132b70

Merge branch 'main' into fix/61982

d7e7be1

fix isAdmin condition

8f9facf

Merge branch 'main' into fix/61982

b7b496f

fix lint

7b3ecad

nkdengineer marked this pull request as ready for review May 30, 2025 09:38

nkdengineer requested a review from a team as a code owner May 30, 2025 09:38

melvin-bot Bot requested review from c3024 and removed request for a team May 30, 2025 09:38

nkdengineer added 4 commits June 3, 2025 12:17

Merge branch 'main' into fix/61982

9ad6385

update multiple expense case

a42a5ae

disable lint rule

56f3526

split iou report case

be1e95c

c3024 suggested changes Jun 4, 2025

View reviewed changes

Comment thread src/libs/ReportUtils.ts Outdated

Comment thread src/libs/ReportUtils.ts Outdated

Comment thread src/libs/ReportUtils.ts Outdated

Comment thread src/libs/ReportUtils.ts Outdated

c3024 approved these changes Jun 4, 2025

View reviewed changes

melvin-bot Bot requested a review from youssef-lr June 4, 2025 08:23

youssef-lr reviewed Jun 4, 2025

View reviewed changes

nkdengineer and others added 4 commits June 4, 2025 23:15

Update src/libs/ReportUtils.ts

a003bb7

Co-authored-by: c3024 <102477862+c3024@users.noreply.github.com>

Update src/libs/ReportUtils.ts

68fa292

Co-authored-by: c3024 <102477862+c3024@users.noreply.github.com>

Update src/libs/ReportUtils.ts

d4093c8

Co-authored-by: c3024 <102477862+c3024@users.noreply.github.com>

Update src/libs/ReportUtils.ts

5bdd048

Co-authored-by: c3024 <102477862+c3024@users.noreply.github.com>

nkdengineer added 2 commits June 4, 2025 23:16

Merge branch 'main' into fix/61982

f059414

edit comment

9cc5de9

c3024 approved these changes Jun 9, 2025

View reviewed changes

melvin-bot Bot requested a review from youssef-lr June 9, 2025 08:53

resolve conflict

cd91e6d

daledah mentioned this pull request Jun 10, 2025

[Due for payment 2025-07-04] [$250] Report - Change workspace option not display in More of paid IOU Receiver #63819

Closed

8 tasks

youssef-lr previously approved these changes Jun 12, 2025

View reviewed changes

merge main

11b5cce

nkdengineer dismissed youssef-lr’s stale review via 11b5cce June 12, 2025 16:48

fix test

1b40357

youssef-lr approved these changes Jun 12, 2025

View reviewed changes

youssef-lr merged commit 06ea630 into Expensify:main Jun 12, 2025
17 checks passed

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

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

Closed

44 tasks

BlameGPT mentioned this pull request Jun 13, 2025

[Due for payment 2025-06-24] [Due for payment 2025-06-23] Report field is clickable for p2p expense when expense is split and report cannot be changed #64125

Closed

8 tasks

marcochavezf 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

melvin-bot Bot mentioned this pull request Jun 16, 2025

[Due for payment 2025-06-23] [$250] Expense - IOU report cannot be moved to workspace #61982

Closed

8 tasks

luacmartins reviewed Jul 16, 2025

View reviewed changes

Conversation

nkdengineer commented May 29, 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!

c3024 commented May 30, 2025

Uh oh!

c3024 commented May 30, 2025

Uh oh!

c3024 commented May 31, 2025

Uh oh!

c3024 commented Jun 2, 2025

Uh oh!

nkdengineer commented Jun 2, 2025

Uh oh!

nkdengineer commented Jun 3, 2025

Uh oh!

c3024 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

c3024 left a comment

Choose a reason for hiding this comment

Uh oh!

youssef-lr Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

nkdengineer Jun 4, 2025

Choose a reason for hiding this comment

Uh oh!

youssef-lr commented Jun 4, 2025

Uh oh!

nkdengineer commented Jun 10, 2025

Uh oh!

youssef-lr commented Jun 12, 2025

Uh oh!

nkdengineer 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!

luacmartins Jul 16, 2025 • 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!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

nkdengineer commented May 29, 2025 •

edited

Loading

c3024 commented Jun 4, 2025 •

edited

Loading

luacmartins Jul 16, 2025 •

edited

Loading