Update all reports which have updated totals#71683
Update all reports which have updated totals#71683carlosmiceli merged 40 commits intoExpensify:mainfrom
Conversation
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
melvin-bot
bot
requested review from
parasharrajat
and removed request for
a team
|
@parasharrajat 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] |
|
@parasharrajat Can you review this? |
|
Please update tests to be numbered list. Add offline tests. Update PR author checklist. Please keep an eye on checks on each PR, they should pass. Also can you please merge main? |
|
I will review this as soon as possible |
What needs to be done there?
All checks are passing on this. Am I missing something? |
I was seeing check failures but they are fine now so nothing needed. It might be old cache on my device. |
src/libs/actions/Transaction.ts
Outdated
| }); | ||
|
|
||
| // Only add failure data for the main report to avoid conflicts | ||
| if (affectedReportID === reportID) { |
There was a problem hiding this comment.
Why? What is the conflict?
There was a problem hiding this comment.
IN case of failure, we have to reset all the reports which we set Optimistically.
There was a problem hiding this comment.
Only the primary report has reportNextStep so that can be used in the failure data. For other reports, it seems that we might not have the proper data so setting them via failureData might overwrite the actual content they were going to have.
There was a problem hiding this comment.
Does this make sense or do we need to remove this condition?
There was a problem hiding this comment.
Technically, we should reset because user can take these actions offline.
Only the primary report has reportNextStep so that can be used in the failure data. For other reports, it seems that we might not have the proper data so setting them via failureData might overwrite the actual content they were going to have.
Let's find a solution for this.
tests/unit/TransactionTest.ts
Outdated
| it('correctly handles reportNextStep parameter when moving transactions to unreported report', async () => { | ||
| const mockAPIWrite = jest.spyOn(require('@libs/API'), 'write').mockImplementation(() => Promise.resolve()); | ||
|
|
||
| const oldReport = { |
There was a problem hiding this comment.
Use test utils to create reports, actions, etc. You can make those more configurable if needed. you will have find methods in /tests/util/
|
|
ShridharGoel
force-pushed
the
nextSteps
branch
from
b10565e to
9fd6a0c
Compare
|
Rebased onto the latest upstream/main to drop mistakenly added merge commits and keep the branch history clean |
src/libs/actions/Transaction.ts
Outdated
| let allNextSteps: OnyxCollection<ReportNextStep> = {}; | ||
| Onyx.connect({ | ||
| key: ONYXKEYS.COLLECTION.NEXT_STEP, | ||
| waitForCollectionCallback: true, | ||
| callback: (value) => { | ||
| allNextSteps = value ?? {}; | ||
| }, | ||
| }); | ||
|
|
There was a problem hiding this comment.
This is not allowed anymore. Please pass it from the component.
|
@ShridharGoel Can you please merge main? |
|
@parasharrajat Done |
src/libs/actions/Transaction.ts
Outdated
There was a problem hiding this comment.
rename this to nextStepDestinationReport
src/libs/actions/Transaction.ts
Outdated
| @@ -1309,67 +1310,98 @@ function changeTransactionsReport( | |||
| }; | |||
| const hasViolations = hasViolationsReportUtils(nextStepReport?.reportID, allTransactionViolation, accountID, email ?? ''); | |||
There was a problem hiding this comment.
These look like duplicate logic. Can you DRY this up?
src/libs/actions/Transaction.ts
Outdated
| let predictedNextStatus = updatedReport.statusNum ?? CONST.REPORT.STATUS_NUM.OPEN; | ||
| if (updatedTotal === 0 && updatedReport.statusNum === CONST.REPORT.STATUS_NUM.SUBMITTED) { | ||
| predictedNextStatus = CONST.REPORT.STATUS_NUM.OPEN; | ||
| } |
|
Extend tests to have a test for this this fix where you check for source transaction as well. |
|
Bump @ShridharGoel |
|
Updated |
|
There is a an code error @ShridharGoel |
|
@parasharrajat Updated |
| const destinationTotal = (destinationReportID ? updatedReportTotals[destinationReportID] : undefined) ?? destinationReport?.total ?? newReport?.total; | ||
| const nextStepReport = { | ||
| ...destinationReport, | ||
| reportID: destinationReport?.reportID ?? destinationReportID ?? reportID, | ||
| total: destinationTotal, | ||
| }; |
There was a problem hiding this comment.
This part was a little different. I do not know the exact reason why we have fallbacks for reportID key and destination total. Is there a reason why you changed this?
To be safe, I would like to keep the logic same for destination report unless we have reason that we don't need to fallbacks.
To be clear.
reportID: affectedReport.reportID ?? affectedReportID,
You are not not falling back to reportID as in destinationReport?.reportID ?? destinationReportID ?? reportID,
destinationTotal = (destinationReportID ? updatedReportTotals[destinationReportID] : undefined) ?? destinationReport?.total ?? newReport?.total;
Here we were falling back to newReport?.total but not in new code.
There was a problem hiding this comment.
We already have the real report in hand before we set next steps, so we don’t need extra fallbacks. Bringing them back wouldn’t help, and could point updates to the wrong report (for example, using the outer reportID instead of
the source report ID). The total fallback also seems unnecessary because when the report is the new one, we already have its total.
There was a problem hiding this comment.
Do let me know what you think.
Screenshots🔲 iOS / native08.12.2025_13.27.45_REC.mp4🔲 iOS / Safari08.12.2025_13.34.29_REC.mp4🔲 MacOS / Chrome08.12.2025_12.20.26_REC.mp4🔲 Android / Chrome08.12.2025_12.38.51_REC.mp4🔲 Android / native08.12.2025_12.36.58_REC.mp4 |
parasharrajat
left a comment
parasharrajat
left a comment
There was a problem hiding this comment.
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 Issuessection 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
Testssection - I verified the steps for Staging and/or Production testing are in the
QA stepssection - 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 verified the steps for local testing are in the
- 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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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.
toggleReportand notonIconClick). - I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g.
myBool && <MyComponent />. - 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 approved by marketing by adding the
Waiting for Copylabel for a copy review on the original GH to get the correct copy. - 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
- 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.
- 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 usingAvatarhave 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.js 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
thisproperly so there are no scoping issues (i.e. foronClick={this.submit}the methodthis.submitshould be bound tothisin the constructor) - Any internal methods bound to
thisare necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);ifthis.submitis never passed to a component event handler likeonClick) - 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
Avataris modified, I verified thatAvataris 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added
Designlabel so the design team can review the changes.
- If a new page is added, I verified it's using the
ScrollViewcomponent to make it scrollable when more elements are added to the page. - If the
mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps. - I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.
🎀 👀 🎀 C+ reviewed
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.2.75-0 🚀
|
|
🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.2.75-0 🚀
|
|
🚀 Deployed to staging by https://github.com/carlosmiceli in version: 9.2.77-0 🚀
|
|
🚀 Deployed to production by https://github.com/yuwenmemon in version: 9.2.77-1 🚀
|
5 participants
Explanation of Change
The fix involves modifying the
changeTransactionsReportfunction to update the next step message for all reports that have their totals changed, not just the destination report.Fixed Issues
$ #70926
PROPOSAL: #70926 (comment)
Tests
Offline tests
QA Steps
Same as tests.
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectioncanBeMissingparam foruseOnyxtoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Screen.Recording.2025-10-01.at.8.59.13.PM.mov
Android: mWeb Chrome
Screen.Recording.2025-10-01.at.9.00.49.PM.mov
iOS: Native
Simulator.Screen.Recording.-.iPhone.16.Plus.-.2025-10-01.at.20.43.20.mp4
iOS: mWeb Safari
Simulator.Screen.Recording.-.iPhone.16.Plus.-.2025-10-01.at.20.44.47.mp4
MacOS: Chrome / Safari
NextSteps.mov
MacOS: Desktop
Screen.Recording.2025-10-01.at.8.51.26.PM.mov