Repository navigation
feat: implement Merge Reports RHP and action menu - #95658
Conversation
|
Hey, I noticed you changed If you want to automatically generate translations for other locales, an Expensify employee will have to:
Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running: npx ts-node ./scripts/generateTranslations.ts --helpTypically, you'd want to translate only what you changed by running |
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.
|
|
@codex review |
|
Codex Review: Didn't find any major issues. Hooray! Reviewed commit: ℹ️ About Codex in GitHubCodex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
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". |
|
@ShridharGoel When the |
|
@dmkt9 looks like |
|
Web-E deployment is still pending |
|
Web-E changes are on staging, so this can proceed |
|
Thanks @ShridharGoel @garrettmknight |
This comment has been minimized.
This comment has been minimized.
@ShridharGoel What are the expected parameters for
|
|
MergeReports(authToken, reportID, sourceReportIDList, [transactionIDToReportActionAndThreadData]) reportID is the destination report (kept). sourceReportIDList is a comma-separated list of the source reports to merge in and delete. transactionIDToReportActionAndThreadData carries the frontend's optimistic IDs (money request preview action, transaction thread, moved action) keyed by transactionID. The shape of the parameter is as follows (all IDs are optional strings): |
|
Thanks, @ShridharGoel, for the details. However, I think this differs from the original design.
That's fine. I'll update the FE accordingly. |
|
🚧 Gonals has triggered a test Expensify/App build. You can view the workflow run here. |
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
|
🚀 Deployed to staging by https://github.com/Gonals in version: 9.4.73-0 🚀
|
|
🤖 Help site changes are required. Draft PR: #100485 This PR added the Merge reports bulk action in Spend > Reports plus the Merge reports right-hand panel, and nothing under What the docs PR does
Where the documented behavior came from
Applied One thing to double-check: I verified the Spend tab and its Expenses / Reports sub-tabs against the live web UI, but the test account has no expense reports, so I could not open the selection menu or the Merge reports panel. The labels for the green selected button, the Merge reports menu item, the panel description, and the Confirm button come from the merged code rather than from a live screen. @dmkt9, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR view run · no recording available |
|
Deploy Blocker #100493 was identified to be related to this PR. |
|
Deploy Blocker #100497 was identified to be related to this PR. |
|
Deploy Blocker #100499 was identified to be related to this PR. |
|
Deploy Blocker #100502 was identified to be related to this PR. |
|
Deploy Blocker #100512 was identified to be related to this PR. |
|
Deploy Blocker #100599 was identified to be related to this PR. |
|
Deploy Blocker #100600 was identified to be related to this PR. |
|
🚀 Deployed to production by https://github.com/mountiny in version: 9.4.73-3 🚀
Bundle Size Analysis (Sentry): |
| const selectedMergeReports = areAllMatchingItemsSelected | ||
| ? [] | ||
| : selectedReports | ||
| .map(({reportID}) => currentSearchResults?.data[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]) |
There was a problem hiding this comment.
Not having optional chaining here on data let to the following issue / app crashing: #103775.


Explanation of Change
canMergeReportshelper from [NoQA] feat: add canMergeReports eligibility helper for the Merge Reports project #94939 to determine whether the Merge reports option should be displayed in the search bulk action menu.mergeReportsaction from [NoQA] feat: implement mergeReports() action #95182 to complete the report merge flow.Fixed Issues
$ #94873
$ #94874
PROPOSAL:
Tests
Same as QA steps
Offline tests
QA Steps
Prerequisites: The user has multiple workspaces containing reports in different states.
Test 1:
Test 2:
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)Avatar, 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.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
android.hybrid.mp4
Android: mWeb Chrome
android.chrome.mp4
iOS: Native
ios.hybrid.mp4
iOS: mWeb Safari
ios.safari.mp4
MacOS: Chrome / Safari
mac.safari.1.mp4
mac.safari.2.mp4