Adds new RESOLVEDDUPLICATES action by rlinoz · Pull Request #58575 · Expensify/App

rlinoz · 2025-03-17T18:10:23Z

Explanation of Change

Since this Auth PR got deployed https://github.com/Expensify/Auth/pull/14548 we can now revert this PR #58482

Fixed Issues

$ #54516
PROPOSAL:

Tests

Create 2 money requests with the same amount
Verify they get a duplicate violation
Open one of them > Review Duplicates > Keep this one
Verify a new message "resolved the duplicate" is shown in the money request

Verify that no errors appear in the JS console

Offline tests

While online:

Create 2 money requests with the same amount
Verify they get a duplicate violation

Go offline then:
3. Open one of them > Review Duplicates > Keep this one
4. Verify a new message "resolved the duplicate" is shown in the money request

QA Steps

Create 2 money requests with the same amount
Verify they get a duplicate violation
Open one of them > Review Duplicates > Keep this one
Verify a new message "resolved the duplicate" is shown in the money request

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-03-25T14:27:52Z

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

rlinoz · 2025-03-27T10:20:17Z

bump @getusha

getusha · 2025-03-27T13:59:24Z

On it

getusha · 2025-03-28T09:58:24Z

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: 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. 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
- 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 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)
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 this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- 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 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.
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: Native

Android: mWeb Chrome

Screen.Recording.2025-03-28.at.1.38.16.in.the.afternoon.mov

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2025-03-28.at.1.35.37.in.the.afternoon.mov

MacOS: Desktop

getusha · 2025-03-28T10:24:21Z

Confirming #58454 is fixed.

Screen.Recording.2025-03-28.at.1.22.17.in.the.afternoon.mov

getusha · 2025-03-28T10:34:15Z

src/pages/home/report/PureReportActionItem.tsx

            children = <ReportActionItemBasicMessage message={translate('systemMessage.mergedWithCashTransaction')} />;
        } else if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION)) {
            children = <ReportActionItemBasicMessage message={getDismissedViolationMessageText(getOriginalMessage(action))} />;
+        } else if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.RESOLVED_DUPLICATES)) {


We need to add a new condition here as well to update the search results

something like:

if(lastReportAction?.actionName === 'RESOLVEDDUPLICATES') { lastMessageTextFromReport = getResolvedDuplicatesMessage() }

Nice catch, updated!

getusha · 2025-03-28T13:46:13Z

We've got a failing check @rlinoz seems like you missed to add a ; 😆

rlinoz · 2025-03-28T14:03:38Z

Oops 😅

@getusha done!

getusha

LGTM

melvin-bot · 2025-03-28T14:16:16Z

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

MarioExpensify

Awesome!

OSBotify · 2025-03-28T16:47:06Z

✋ 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 · 2025-03-31T10:42:29Z

🚀 Deployed to staging by https://github.com/MarioExpensify in version: 9.1.21-0 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

izarutskaya · 2025-03-31T15:57:44Z

@rlinoz Found issue on Desktop #59346 Pending validation iOS

github-actions · 2025-04-01T15:01:32Z

🚀 Deployed to production by https://github.com/grgia in version: 9.1.21-3 🚀

platform	result
🖥 desktop 🖥	success ✅
🕸 web 🕸	success ✅
🤖 android 🤖	failure ❌
🍎 iOS 🍎	success ✅

re-revert new action changes

d6ec8dd

rlinoz self-assigned this Mar 17, 2025

rlinoz mentioned this pull request Mar 17, 2025

[Due for payment 2025-04-08] [$250] All - Approvers - Resolve Duplicates - No system message after merging duplicate expenses #54516

Closed

8 tasks

rlinoz added 2 commits March 25, 2025 11:10

merge main

4919010

revert version

3d9b8db

rlinoz changed the title ~~re-revert new action changes~~ Adds new RESOLVEDDUPLICATES action Mar 25, 2025

prettier

2170b07

rlinoz marked this pull request as ready for review March 25, 2025 14:27

rlinoz requested a review from a team as a code owner March 25, 2025 14:27

melvin-bot bot requested review from getusha and removed request for a team March 25, 2025 14:27

getusha reviewed Mar 28, 2025

View reviewed changes

rlinoz added 2 commits March 28, 2025 10:10

merge main

efdd508

fixing show resolved duplicates in search router

9795043

rlinoz requested a review from getusha March 28, 2025 13:32

prettier

d223564

getusha approved these changes Mar 28, 2025

View reviewed changes

melvin-bot bot requested a review from MarioExpensify March 28, 2025 14:16

MarioExpensify approved these changes Mar 28, 2025

View reviewed changes

MarioExpensify merged commit 29b1317 into main Mar 28, 2025
17 checks passed

MarioExpensify deleted the rodrigo-dismiss-violation-transaction-merge-2 branch March 28, 2025 16:39

IuliiaHerets mentioned this pull request Mar 31, 2025

[Due for payment 2025-04-16] [$250] Report headers show You for resolve duplicate system message #59346

Closed

8 tasks

Conversation

rlinoz commented Mar 17, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Mar 25, 2025

Uh oh!

rlinoz commented Mar 27, 2025

Uh oh!

getusha commented Mar 27, 2025

Uh oh!

getusha commented Mar 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

getusha commented Mar 28, 2025

Uh oh!

getusha Mar 28, 2025

Choose a reason for hiding this comment

Uh oh!

rlinoz Mar 28, 2025

Choose a reason for hiding this comment

Uh oh!

getusha commented Mar 28, 2025

Uh oh!

rlinoz commented Mar 28, 2025

Uh oh!

getusha left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot bot commented Mar 28, 2025

Uh oh!

MarioExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 28, 2025

Uh oh!

github-actions bot commented Mar 31, 2025

Uh oh!

izarutskaya commented Mar 31, 2025

Uh oh!

github-actions bot commented Apr 1, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

rlinoz commented Mar 17, 2025 •

edited

Loading

getusha commented Mar 28, 2025 •

edited

Loading