Skip to content

[Hold on #723] Fix/reports old amount and pay button after move#77330

Open
nabi-ebrahimi wants to merge 30 commits intoExpensify:mainfrom
nabi-ebrahimi:fix/reports-old-amount-and-pay-button-after-move
Open

[Hold on #723] Fix/reports old amount and pay button after move#77330
nabi-ebrahimi wants to merge 30 commits intoExpensify:mainfrom
nabi-ebrahimi:fix/reports-old-amount-and-pay-button-after-move

Conversation

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor

@nabi-ebrahimi nabi-ebrahimi commented Dec 11, 2025 •
edited
Loading

Explanation of Change

This PR fixes the issue where the previous report continued to display the old total and a Pay button even after all expenses were moved to a new report. The expected behavior is that once the expenses are moved, the previous report should show a total of 0.00 and display a View button instead.

These conditions should be respected when performing the move:

  1. If a calculation can be handled offline, perform it immediately and display the updated total.
  2. If a calculation requires online data (currency conversion), the report total may be temporarily inaccurate until it can sync and be recalculated by the backend. In these cases, show the row in a greyed-out state to indicate pending backend confirmation.
  3. If a report ends up with no remaining expenses after the move, display its total as 0 regardless of any currency differences.

Fixed Issues

$ #75091
PROPOSAL: #75091 (Comment)

Tests

Flow 1:

  1. Go to staging.new.expensify.com
  2. Go to workspace chat
  3. Create two expenses
  4. Click Submit
  5. Go to Reports > Reports
  6. Go offline
  7. Select the report from Step 3 via the checkbox
  8. Click the dropdown button > Move expenses
  9. Click Create report
  10. Verify that the previous report shows amount 0.00 and the View button after moving expenses to a new report

Flow 2:

a. Go to staging.new.expensify.com
b. Go to workspace chat
b. Create one expense
c. Open the expense details
d. Go offline
e. Click the " More " button > Move to report
f. Click Create report
g. Go to Report > Reports
h. Verify that the previous report shows amount 0.00 and the View button after moving expenses to a new report

Flow 3:

  1. Go to staging.new.expensify.com
  2. Go to workspace chat
  3. Create two expenses
  4. Go to Reports > Expenses
  5. Go offline
  6. Select the expenses from Step 3 via the checkbox
  7. Click move to report > create report
  8. Go to Report > Reports
  9. Verify that the previous report shows amount 0.00 and the View button after moving expenses to a new report

Flow 4:

  • Go to staging.new.expensify.com
  • Go to workspace chat
  • Create two expenses
  • Go to Reports > Reports
  • Select the Expenses report from Step 3 via the checkbox
  • Click move to report > create report
  • Verify that the previous report shows amount 0.00 and the View button after moving expenses to a new report

Flow5:

a. Go to staging.new.expensify.com
b. Go to workspace chat
c. Create two expenses with two different currencies
d. Go to Reports > Reports
e. Go offline
f. Select the expenses from Step 3 via the checkbox
g. Click move to report > create report
i. Verify that the previous report shows amount 0.00 and the View button after moving expenses to a new report

  • Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests.

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

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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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
Screen.Recording.1404-09-20.at.12.08.19.PM.mov
Android: mWeb Chrome
Screen.Recording.1404-09-20.at.12.13.09.PM.mov
iOS: Native
Screen.Recording.1404-09-20.at.12.16.51.PM.mov
iOS: mWeb Safari
Screen.Recording.1404-09-20.at.12.21.00.PM.mov
MacOS: Chrome / Safari
Screen.Recording.1404-09-20.at.11.55.47.AM.mov
create.two.expenses.reports.expenses.move.report.reports.mov
one.expense.open.expense.move.report.go.to.reports.reports.mov
two.expense.various.currencies.reports.reports.move.expense.mov
online.test.mov

@nabi-ebrahimi nabi-ebrahimi requested review from a team as code owners December 11, 2025 08:17
@melvin-bot melvin-bot bot requested review from sobitneupane and trjExpensify and removed request for a team December 11, 2025 08:17
@melvin-bot
Copy link
Copy Markdown

melvin-bot bot commented Dec 11, 2025

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

github-actions[bot]
github-actions bot reviewed Dec 11, 2025
View reviewed changes
@codecov
Copy link
Copy Markdown

codecov bot commented Dec 11, 2025 •
edited by github-actions bot
Loading

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
...stReportView/MoneyRequestReportTransactionList.tsx 0.00% <ø> (ø)
src/libs/ReportUtils.ts 79.89% <100.00%> (+<0.01%) ⬆️
src/libs/SearchUIUtils.ts 66.08% <100.00%> (ø)
...es/iou/request/step/IOURequestEditReportCommon.tsx 88.40% <0.00%> (ø)
src/libs/actions/Transaction.ts 67.87% <74.41%> (+0.09%) ⬆️
... and 8 files with indirect coverage changes

trjExpensify
trjExpensify previously approved these changes Dec 12, 2025
View reviewed changes
Copy link
Copy Markdown
Contributor

@trjExpensify trjExpensify left a comment

Choose a reason for hiding this comment

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

Nice catch 👍

@sobitneupane
Copy link
Copy Markdown
Contributor

sobitneupane commented Dec 16, 2025

@nabi-ebrahimi The report with pending total is not being grayed-out as expected.

Screen.Recording.2025-12-16.at.17.00.52.mov

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Dec 18, 2025

@sobitneupane Thanks for the review. can you please take a look at the following questions when you get a chance.

  1. When moving an expense from a report that contains multiple expenses with different currencies, should the remaining expense be grayed out?
Screenshot 1404-09-27 at 9 58 51 AM
  1. Should we also gray out the report row from which the expense was moved? The total changes, but this isn’t reflected in the report row while offline.
Screenshot 1404-09-27 at 9 58 24 AM

@sobitneupane
Copy link
Copy Markdown
Contributor

sobitneupane commented Dec 19, 2025

  1. When moving an expense from a report that contains multiple expenses with different currencies, should the remaining expense be grayed out?

Not the individual expense. However, if there is a total, we should gray out the total when its value is outdated.

  1. Should we also gray out the report row from which the expense was moved? The total changes, but this isn’t reflected in the report row while offline.

Yes. We should gray out the report row from which the expense was moved, as well as the destination report row, if any value is outdated and waiting for a backend update (e.g., currency conversion).

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Dec 26, 2025

@sobitneupane, thanks for your patience i have covered all cases, the PR is ready for your review.

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Jan 4, 2026

@sobitneupane, kindly bump.

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Feb 22, 2026

@sobitneupane, pr is ready for review. thanks.

@sobitneupane
Copy link
Copy Markdown
Contributor

sobitneupane commented Mar 5, 2026

Sorry for the delay. I will review the PR by EOD tomorrow. In the meantime, could you please merge main.

@sobitneupane
Copy link
Copy Markdown
Contributor

sobitneupane commented Mar 11, 2026

@nabi-ebrahimi Could you please check the following screen recording? I am still able to reproduce the issue.

I created three expenses(two in NPR and one in AED) and then moved two of them (one NPR and one AED). However, the calculation and actual result still seems off.

Screen.Recording.2026-03-11.at.15.44.58.mov

@sobitneupane
Copy link
Copy Markdown
Contributor

sobitneupane commented Mar 11, 2026

Also, please make sure to add test steps and screen recordings covering different possible cases.

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Mar 16, 2026

sorry for the delay, i will check this today.

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Mar 16, 2026

@sobitneupane, currently looking into this to find the root cause and fix it. thanks.

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Mar 23, 2026

Sorry for the delay, i was OOO, i will update this tomorrow. thanks.

@nabi-ebrahimi
Prevent stale report totals from being recalculated during mixed-curr…
53a2c3b 
…ency

partial moves.

- track stale source/destination reports in changeTransactionsReport()
- stop accumulating optimistic totals once a report becomes stale
- preserve convertedAmount behavior for single-currency destination flows
- consolidate report pendingFields merges so Search snapshots keep
  preview/total/nextStep together
- treat pendingFields.total and pendingFields.preview as offline-pending
  in ReportUtils
- add regressions for the mixed-currency partial move and pending helper
@nabi-ebrahimi
Merge branch 'main' into fix/reports-old-amount-and-pay-button-after-…
3e6402a 
…move
@nabi-ebrahimi
fix: resolve mixed-currency move typecheck errors
db6ce40
@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Mar 26, 2026

@sobitneupane, thanks for your patience, the pr is ready for your review. please take another look, when you get a chance. thanks.

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Mar 29, 2026

@sobitneupane, kindly bump. thanks.

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Mar 31, 2026

@sobitneupane, kindly bump.

@sobitneupane
Copy link
Copy Markdown
Contributor

sobitneupane commented Mar 31, 2026

Sorry for the delay @nabi-ebrahimi I would try to get it done by EOD. In the meantime, could you please address this comment?

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Mar 31, 2026

@sobitneupane, I've addressed all your comments, it's all yours. thanks.

@sobitneupane
Copy link
Copy Markdown
Contributor

sobitneupane commented Apr 1, 2026

@nabi-ebrahimi Could you please resolve the merge conflicts?

@sobitneupane
Copy link
Copy Markdown
Contributor

sobitneupane commented Apr 1, 2026

  1. If a calculation can be handled offline, perform it immediately and display the updated total.
  2. If a calculation requires online data (currency conversion), the report total may be temporarily inaccurate until it can sync and be recalculated by the backend. In these cases, show the row in a greyed-out state to indicate pending backend confirmation.
  3. If a report ends up with no remaining expenses after the move, display its total as 0 regardless of any currency differences.

Following doesn't meet the first expectaion.

Screen.Recording.2026-04-01.at.14.28.44.mov

@sobitneupane
Copy link
Copy Markdown
Contributor

sobitneupane commented Apr 1, 2026

@nabi-ebrahimi This is getting a bit large. Do you think we should split it into multiple PRs?

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Apr 1, 2026

  1. If a calculation can be handled offline, perform it immediately and display the updated total.
  2. If a calculation requires online data (currency conversion), the report total may be temporarily inaccurate until it can sync and be recalculated by the backend. In these cases, show the row in a greyed-out state to indicate pending backend confirmation.
  3. If a report ends up with no remaining expenses after the move, display its total as 0 regardless of any currency differences.

Following doesn't meet the first expectaion.

Screen.Recording.2026-04-01.at.14.28.44.mov

@sobitneupane, these are in different currencies. Could you please clarify how this is expected to be handled on the frontend?

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Apr 1, 2026 •
edited
Loading

@nabi-ebrahimi This is getting a bit large. Do you think we should split it into multiple PRs?

@sobitneupane, I agree, but how could we split it?

@sobitneupane
Copy link
Copy Markdown
Contributor

sobitneupane commented Apr 1, 2026

I agree, but how could we split it?

What do you propose? What would be easier for you to implement?

IMO,

  1. Graying out the outdated fields
  2. Calculation:
    a. Zero Sum
    b. Others

@nabi-ebrahimi
Copy link
Copy Markdown
Contributor Author

nabi-ebrahimi commented Apr 1, 2026

@sobitneupane, should i create new pr?

@sobitneupane
Copy link
Copy Markdown
Contributor

sobitneupane commented Apr 2, 2026

should i create new pr?

Sure

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] left review comments

@trjExpensify trjExpensify trjExpensify left review comments

+1 more reviewer

@sobitneupane sobitneupane sobitneupane left review comments

Reviewers whose approvals may not affect merge requirements

At least 1 approving review is required to merge this pull request.

Assignees

@nabi-ebrahimi nabi-ebrahimi

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@nabi-ebrahimi @sobitneupane @trjExpensify