updated expense-moving logic to use the default workspace, except when an admin moves a member's report

[jayeshmangwani]

Explanation of Change

The "Create report" button was showing the current expenses's workspace instead of the default workspace when moving an individual expense via the Report field. This PR make sure that the default workspace is always used consistently, matching the behavior of the bulk-move flow.

Note: For the admin case (#80414), when an admin views a member's expense, the "Create report" button shows the expense's workspace (not the admin's default) - this is the expected behavior and remains unchanged.

Fixed Issues

$ #87441
PROPOSAL: #87441 (comment)

Tests

---

Test 1

Preconditions

• Two workspaces exist: Workspace A and Workspace B.
• Workspace A is set as the default workspace.

Steps

1. Navigate to staging.new.expensify.com.
2. Go to the Workspace B chat.
3. Create two expenses.
4. Open the expense report.
5. Select one expense using the checkbox.
6. Click the Dropdown button -> Move to report.
7. Verify that: The Create report button displays Workspace A as the subtitle.
8. Close the RHP.
9. Open any individual expense.
10. Click on the Report field.
11. Verify that: The Create report button also displays Workspace A as the subtitle same Move to report case.

---

Test 2

Preconditions

• The Admin has two workspaces: Workspace A and Workspace B.
• Workspace A is set as the default workspace.
• The Admin invites a Member to Workspace B.

Steps

1. Navigate to staging.new.expensify.com.
2. [Member] Go to the Workspace B chat.
3. [Member] Create an expense.
4. [Admin] Open the member’s expense report.
5. [Admin] Click Report → Create report.
6. Verify that: The Create report button displays Workspace B as the subtitle.

---

Test 3

1. Go to any non-default workspace -> More features, and enable Per diem.
2. Import per diem rates.
3. go to same non-default workspace chat, Create (+) -> Create expense -> Per diem, and create one per diem expense.
4. Open the created per diem expense -> click More -> select Move to report.
5. Verify that the non-default workspace name is shown under Create report, then select it and confirm that a new report is created in that workspace.
6. Go back to the per diem expense and click Report row.
7. Again, verify that the non-default workspace name is shown under Create report, then select it and confirm that a new report is created in the selected non-default workspace.

• 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
• 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 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.mov

Android: mWeb Chrome

mweb-chrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

mweb-safari.mov

MacOS: Chrome / Safari

Individual expense flow

user-ownself.mov

Admin viewing a member's expense

admin-change-report.mov

[codecov]

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
...rc/pages/iou/request/step/IOURequestStepReport.tsx	70.31% <100.00%> (-0.90%)	⬇️
...rc/pages/iou/request/step/IOURequestEditReport.tsx	0.00% <0.00%> (ø)
... and 14 files with indirect coverage changes

[melvin-bot]

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

[jayeshmangwani]

@bernhardoj Sorry for the ping here, but I’m not sure a C+ review is needed here, as this PR simply follows up on the missed case.

[jayeshmangwani]

@deetergp Tagging you to keep you in the loop on this PR.

[chatgpt-codex-connector]

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3dc07dbb78

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

[chatgpt-codex-connector]

Preserve per-diem policy when resolving own expense workspace

This change sets targetExpensePolicyID to undefined for any expense owned by the current user, which makes usePolicyForMovingExpenses fall back to the default workspace even for per-diem expenses. In this flow, createReportForPolicy() still uses perDiemOriginalPolicy, but IOURequestEditReportCommon validates per-diem move compatibility against policyForMovingExpenses; if the default workspace has different or missing per-diem custom units, users get a blocking "cannot move" modal even though the actual destination policy is valid. This regression occurs when moving your own per-diem expense and your default workspace differs from the expense workspace.

Useful? React with 👍 / 👎.

[jayeshmangwani]

@deetergp , I don’t have a strong opinion on this. Should we exclude the logic for per diem expenses? In the current production version, Create report behaves differently for per diem:

1. From 'Move to report' → 'Create report', the expense can’t be moved as it defaults to the default workspace.
2. From Expense Details → Report → 'Create report', the expense can be moved to the workspace that already has a per diem report.

Sharing the video below for both cases:

current-per-diem.mov

[jayeshmangwani]

@MelvinBot, why the React compiler check is failing?

[MelvinBot]

The React Compiler is failing on src/pages/iou/request/step/IOURequestEditReport.tsx line 64 with:

Unexpected terminal kind 'optional' for logical test block

The issue is that the React Compiler doesn't support optional chaining (?.) inside the test (condition) of a ternary expression. Your line:

const targetExpensePolicyID = selectedReport?.ownerAccountID !== session?.accountID || hasPerDiemTransactions ? selectedReport?.policyID : undefined;

has selectedReport?.ownerAccountID and session?.accountID in the ternary condition. To fix it, extract the condition into a separate variable:

const isOtherOwnerOrPerDiem = selectedReport?.ownerAccountID !== session?.accountID || hasPerDiemTransactions;
const targetExpensePolicyID = isOtherOwnerOrPerDiem ? selectedReport?.policyID : undefined;

This avoids optional chaining in the ternary test, which satisfies the React Compiler.

[jayeshmangwani]

@deetergp To address this comment #87962 (comment), I've added hasPerDiemTransactions to the condition for targetExpensePolicyID.

Issue was that, per diem transactions were falling through to the default workspace
because they belong to the current user, which caused this issue (Screenshot below) , when moving them.

With this change 602d0c5, if the selection includes any per diem transactions, we now
explicitly use the policy of the report they were originally created in, ensuring
they stay within the workspace where per diem is enabled rather than falling back
to the default workspace.