Update duplicate RHP screen to be more in line with other flows#89587
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 |
|
@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] |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: ce28060cde
ℹ️ 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".
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Codecov Report✅ Changes either increased or maintained existing code coverage, great job!
|
|
@sobitneupane I’ve addressed the AI feedback. Thanks! Also, the ESLint failure isn’t related to this PR. |
trjExpensify
left a comment
trjExpensify
left a comment
There was a problem hiding this comment.
@nabi-ebrahimi can you make sure your tests and vids cover the dupe flow where they have to pick which expense details to keep in those one-by-one screens to make sure that's QA'd and is working correctly?
CC: @dannymcclain for a looksie on this PR too!
|
Looking good to me so far. |
|
@sobitneupane can you review this today, please? |
|
Yes, I will review it by EOD today. |
|
@sobitneupane, friendly bump. thanks. |
sobitneupane
left a comment
sobitneupane
left a comment
There was a problem hiding this comment.
Screenshots/Videos
Android: HybridApp
Android: mWeb Chrome
Screen.Recording.2026-05-21.at.14.03.46.mov
iOS: HybridApp
Screen.Recording.2026-05-21.at.14.12.00.mov
iOS: mWeb Safari
Screen.Recording.2026-05-21.at.14.15.28.mov
MacOS: Chrome / Safari
Screen.Recording.2026-05-21.at.13.48.49.mov
sobitneupane
left a comment
sobitneupane
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 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 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 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 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
- 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.ts 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 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
Designlabel and/or tagged@Expensify/designso 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. - 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
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.
|
Minor but can we check the gaps and padding on the right side? 
It should be this: |
|
@nabi-ebrahimi It seems the UI doesn't match the expectations above. Could you please take a look and address it. Thanks. |
|
Agree with Shawn 👍 |
@sobitneupane, Addressed. I updated the right-side spacing so the radio now sits with ~12px from the amount/cash side and ~16px from the right edge. Could you please take another look? Thanks. cc @deetergp |
|
Looks better, thank you! |
deetergp
left a comment
deetergp
left a comment
There was a problem hiding this comment.
Code looks good and tests well 👍
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
|
🚧 @deetergp 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/deetergp in version: 9.3.79-1 🚀
Bundle Size Analysis (Sentry): |
|
Yes, help site changes are required. The PR replaces the Keep this one button with Keep selected and changes the duplicate review flow to use selectable expense rows with radio buttons. I've created a draft PR with the necessary updates to
Draft PR: #91358 |
|
Deploy Blocker #91367 was identified to be related to this PR. |
|
Deploy Blocker #91369 was identified to be related to this PR. |
|
@nabi-ebrahimi This PR is failing in step 5 because of a regression issue #91374 
The issue is reproducible in: Web, Android Bug7160138_1779403791252.bandicam_2026-05-22_01-42-25-494.mp4
|
|
Deploy Blocker #91377 was identified to be related to this PR. |
9 participants
Explanation of Change
This PR refreshes the first screen of the “Review duplicates” flow so it matches the newer compact expense review patterns used elsewhere in the app. Duplicate expenses are now shown as concise selectable rows instead of large preview cards, while still letting users open each expense for full details. The screen keeps the existing product behavior: users can either keep all duplicates or select one expense to continue through the current review flow.
Fixed Issues
$ #88342
PROPOSAL: #88342 (comment)
Tests
Create four expenses with the same amount, each using a different merchant category and unique tags.
Open the expense report containing those expenses.
Click “Review duplicates.”
Verify that the RHP panel displays compact duplicate expense cards for all four expenses created in Step 1.
Verify that each duplicate card displays the following details:
Verify that each duplicate card includes a selection control (radio button).
Verify that the bottom of the panel displays the following action buttons:
Select one of the duplicate expenses.
Click “Keep selected.”
Continue through the duplicate resolution flow by selecting which fields to keep (for example: category, tags, and other available attributes).
Verify that the selected expense is retained and the remaining duplicate expenses are resolved according to the chosen options.
Offline tests
Same as test.
QA Steps
Same as test.
// TODO: These must be filled out, or the issue title must include "[No QA]."
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand 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
Recording_20260512_191611.mp4
Android: mWeb Chrome
Recording_20260512_193837.mp4
iOS: Native
Screen.Recording.2026-05-12.at.6.39.27.PM.mov
iOS: mWeb Safari
Screen.Recording.2026-05-12.at.6.43.37.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2026-05-12.at.6.20.35.PM.mov