Skip to content

Fix legacy unreported expenses missing "Move to report" option in NewDot#95068

Merged
lakchote merged 15 commits into
mainfrom
mollfpr-legacy-unreported-expenses-move-to-report
Jul 9, 2026
Merged

Fix legacy unreported expenses missing "Move to report" option in NewDot#95068
lakchote merged 15 commits into
mainfrom
mollfpr-legacy-unreported-expenses-move-to-report

Conversation

@mollfpr

@mollfpr mollfpr commented Jul 1, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Legacy or imported unreported expenses don't have an IOU report action because they predate the NewDot money-request flow. In canEditFieldOfMoneyRequest, the REPORT field eligibility check bails out early at the isMoneyRequestAction(reportAction) guard before reaching the existing logic that allows unreported expenses to be moved. This caused "Move to report" to never appear in Search's bulk actions for these expenses.

The fix adds an early-return path before that guard: if the field being edited is REPORT, there is no reportAction, and the transaction is unreported, we skip the action guard entirely and return the result of the per-diem policy check — the same check already used for regular unreported expenses. I also extracted that per-diem check into a canUnreportedPerDiemBeMoved helper to avoid duplicating the logic.

Fixed Issues

$ #93799
PROPOSAL:

Tests

Prerequisite:

  1. Account with workspace
  2. Open OldDot and go to Settings → Account → Wallet
  3. Import personal bank/card
  4. Select Discover Bank and use the expensidemo credentials
  5. Select any account
  6. Disable reimbursable and complete the import
  7. Go to the expense page and open the imported expense
  8. Change the expense report to none

  1. Open NewDot and go to Spend → Expenses
  2. Select the unreported legacy expense using the checkbox
  3. Click "1 selected" to open the bulk actions menu
  4. Verify that "Move to report" is visible from the options
  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Prerequisite:

  1. Account with workspace
  2. Open OldDot and go to Settings → Account → Wallet
  3. Import personal bank/card
  4. Select Discover Bank and use the expensidemo credentials
  5. Select any account
  6. Disable reimbursable and complete the import
  7. Go to the expense page and open the imported expense
  8. Change the expense report to none

  1. Open NewDot and go to Spend → Expenses
  2. Select the unreported legacy expense using the checkbox
  3. Click "1 selected" to open the bulk actions menu
  • 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 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)
  • 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)
  • 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.
  • 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

MacOS: Chrome / Safari
Screen.Recording.Jul.2.2026.mp4

@mollfpr mollfpr changed the title Mollfpr legacy unreported expenses move to report Fix legacy unreported expenses missing "Move to report" option in NewDot Jul 2, 2026
@mollfpr

mollfpr commented Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector chatgpt-codex-connector Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: ec65af7229

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

Comment thread src/libs/ReportUtils.ts
@mollfpr mollfpr marked this pull request as ready for review July 2, 2026 15:41
@mollfpr mollfpr requested review from a team as code owners July 2, 2026 15:41
@melvin-bot melvin-bot Bot requested review from bernhardoj and trjExpensify July 2, 2026 15:42
@melvin-bot

melvin-bot Bot commented Jul 2, 2026

Copy link
Copy Markdown

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

@melvin-bot melvin-bot Bot requested review from a team and shubham1206agra and removed request for a team July 2, 2026 15:42
@melvin-bot

melvin-bot Bot commented Jul 2, 2026

Copy link
Copy Markdown

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

@mollfpr

mollfpr commented Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

Ohh no Melvin pulls 2 C+ 😓

Let's go with @bernhardoj since they got assigned first. 🙏

@mollfpr mollfpr removed the request for review from shubham1206agra July 2, 2026 15:47
trjExpensify
trjExpensify previously approved these changes Jul 2, 2026

@trjExpensify trjExpensify left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

👍

Comment thread src/libs/ReportUtils.ts Outdated
return true;
}

function canUnreportedPerDiemBeMoved(transaction: OnyxEntry<Transaction>, policies: OnyxCollection<Policy>): boolean {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I think we should rename this to canUnreportedBeMoved or something similar because the logic inside the function isn't limited to per diem.

The function assumes the transaction is a per diem, but inside it, we check first whether it's per diem or not.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Nice suggestion! Updated!

@bernhardoj

Copy link
Copy Markdown
Contributor

@mollfpr I've imported the Discover Bank card, but I don't see any imported expenses.

image

@mollfpr

mollfpr commented Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

@bernhardoj Could you try again, delete the previous, and add an import by selecting the new account? Also, attach the requestID if it's still not showing the expense.

@bernhardoj

bernhardoj commented Jul 4, 2026

Copy link
Copy Markdown
Contributor

@mollfpr Still not showing. Where do I get the requestID?

Oh, here you go: "a15a5f2c2a42fd95-SJC"

@mollfpr

mollfpr commented Jul 7, 2026

Copy link
Copy Markdown
Contributor Author

@bernhardoj It seems the import is gated by the staging flag. Could you try again against the BE prod?

Also try to use this account Tracey Southgate - 8755.

@bernhardoj

Copy link
Copy Markdown
Contributor

That works.

But I can see the "Move to report" option even without this PR 🤔.

image

@mollfpr

mollfpr commented Jul 9, 2026

Copy link
Copy Markdown
Contributor Author

@bernhardoj I tested on production, and it's still not showing the "Move to report".

Screen.Recording.Jul.9.2026.mp4

You should not open the expense, or it will create an IOU action, and the isUnreportedLegacyTransaction path will be passed.

@bernhardoj

Copy link
Copy Markdown
Contributor

Ok, yeah, I can reproduce it now (I'm pretty sure didn't open the expense on ND, I open it on OD tho to unreport the expense)

@bernhardoj

bernhardoj commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

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
  • 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 proper code patterns were followed (see Reviewing the code)
    • 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 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)
  • 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)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • 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
    • 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 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.
  • 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 image
Android: mWeb Chrome image
iOS: HybridApp image
iOS: mWeb Safari image
MacOS: Chrome / Safari image

@melvin-bot melvin-bot Bot requested a review from lakchote July 9, 2026 10:50
@melvin-bot

melvin-bot Bot commented Jul 9, 2026

Copy link
Copy Markdown

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

@lakchote lakchote left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@lakchote lakchote merged commit 8fa661f into main Jul 9, 2026
43 checks passed
@lakchote lakchote deleted the mollfpr-legacy-unreported-expenses-move-to-report branch July 9, 2026 13:51
@OSBotify

OSBotify commented Jul 9, 2026

Copy link
Copy Markdown
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.

@github-actions

github-actions Bot commented Jul 9, 2026

Copy link
Copy Markdown
Contributor

🚧 lakchote has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/lakchote in version: 9.4.33-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 cancelled 🔪

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 Help site review: no docs changes required.

This PR is a bug fix that restores existing, already-documented behavior. It adds an early-return path in canEditFieldOfMoneyRequest so that legacy/imported unreported expenses (which predate the NewDot money-request flow and have no IOU report action) once again show Move to report in the Spend page bulk actions menu. It introduces no new feature, UI label, tab, or setting.

The help site already describes this behavior correctly:

Because the fix simply makes actual behavior match what the docs already say (rather than changing documented behavior), there is nothing to update under docs/articles. No draft PR was created.

@mollfpr, please confirm you agree that no help site changes are required here. If you feel the docs should be expanded to call out that imported/legacy unreported expenses can also be moved to a report, let me know and I'll open a draft PR.

@mvtglobally

Copy link
Copy Markdown

@bernhardoj @mollfpr @trjExpensify We are unable to use Discover test credentials to QA this PR as no expenses match required criteria. Is there an alternative way?

95068.mp4

@mollfpr

mollfpr commented Jul 13, 2026

Copy link
Copy Markdown
Contributor Author

@mvtglobally it seems the export got gated by staging, could you try setup the expenses in OldDot production?

@IuliiaHerets

Copy link
Copy Markdown

@mollfpr Fail with the original KI in this way.
No "Move to report" option when bulk selecting

95068_prod.mp4

@mollfpr

mollfpr commented Jul 13, 2026

Copy link
Copy Markdown
Contributor Author

@IuliiaHerets okay the import is works, now open the NewDot in staging to test the "Move to report" option with the same account.

@IuliiaHerets

Copy link
Copy Markdown

@mollfpr Pass in Staging with the same account for Web

95068_pass.mp4

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.

8 participants