feat: surfacing potential duplicates by gijoe0295 · Pull Request #40153 · Expensify/App

gijoe0295 · 2024-04-11T21:05:32Z

Details

This PR implements UI for duplicated transaction violations.

Fixed Issues

$ #32607
PROPOSAL: #32607 (comment)

Tests

Note

Enable Use Staging Server if testing on dev
The Collect workspace has Expenses >> Expense Violations enabled

Log in with Collect workspace's member account
Create 2 expenses with same AMOUNT, CURRENCY, MERCHANT and DATE (select one in the past) to the Collect workspace
Go to the workspace chat in which the expense report should be included.
Verify in the workspace chat, the report preview has a red dot indicator
Go to the expense report
Verify each expense preview has a red dot indicator and Cash · Duplicate · Hold on top
Go to the transaction report
Verify the HOLD banner is added with the following copy This expense has the same details as another one. Review the duplicates to remove the hold.
Verify a green button Review duplicates is in the request header (pressing it does nothing)

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Note

The Collect workspace has Expenses >> Expense Violations enabled

Log in with Collect workspace's member account
Create 2 expenses with same AMOUNT, CURRENCY, MERCHANT and DATE to the Collect workspace
Go to the transaction report
Go to the policy expense report
Verify in the policy expense report, the report preview has a red dot indicator
Go to the expense report
Verify each expense preview has a red dot indicator and Cash · Duplicate · Hold on top
Go to the transaction report
Verify the HOLD banner is added with the following copy This expense has the same details as another one. Review the duplicates to remove the hold.
Verify a green button Review duplicates is in the request header (pressing it does nothing)

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

<--- add screenshots or videos here -->

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

…at-surface-potential-duplicates

melvin-bot · 2024-04-25T19:44:46Z

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

akinwale · 2024-04-29T23:17:58Z

@gijoe0295 Please type include your test steps as text in the OP instead of using an image.

gijoe0295 · 2024-04-30T03:26:14Z

@akinwale Updated test steps and resolved conflicts.

src/languages/es.ts

src/components/HoldBanner.tsx

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

…hub.com/gijoe0295/App into gijoe/feat-surface-potential-duplicates

pecanoro · 2024-06-04T01:14:43Z

In the logs, I can't find any trace of computing the violations at all or opening the transaction report, that's why I am so confused. @akinwale Can you try again and give me the transactionIDs and the reportID? I am going to check again

src/components/MoneyRequestHeader.tsx

akinwale · 2024-06-04T01:34:53Z

In the logs, I can't find any trace of computing the violations at all or opening the transaction report, that's why I am so confused. @akinwale Can you try again and give me the transactionIDs and the reportID? I am going to check again

@pecanoro Do I have to create completely new transactions or would the existing transactions work?

gijoe0295 · 2024-06-04T10:01:03Z

@akinwale You do need to create new transactions as per my understanding.

pecanoro · 2024-06-04T17:25:11Z

@akinwale I pinged you here so we can resolve it much faster on Slack!

akinwale · 2024-06-05T14:32:46Z

@gijoe0295 Please add a note to your test step that the user needs to open the transaction thread before the violations are actually displayed.

akinwale · 2024-06-05T14:33:25Z

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 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 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 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.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 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.
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

40153-android-native.mp4

Android: mWeb Chrome

40153-android-chrome.mp4

iOS: Native

40153-ios-native.mp4

iOS: mWeb Safari

40153-ios-safari.mp4

MacOS: Chrome / Safari

40153-web.mp4

MacOS: Desktop

40153-desktop.mp4

akinwale

LGTM.

trjExpensify · 2024-06-06T13:35:38Z

Wahoo, progress! @gijoe0295 we have a bunch of conflicts here now. Can you address them?

…at-surface-potential-duplicates

gijoe0295 · 2024-06-06T14:16:35Z

Done!

pecanoro

Looks great! I am going to test it really quick and I will merge

pecanoro · 2024-06-06T19:57:16Z

Seems to be working well, merging!

OSBotify · 2024-06-06T20:05:20Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2024-06-11T23:31:10Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.81-11 🚀

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

chiragsalian · 2024-06-12T21:11:48Z

Just letting you know the PR here had a minor regression. Full details about the regression is posted in the CP PR here.

ahmedGaber93 · 2024-07-21T11:37:40Z

src/libs/TransactionUtils.ts


-    return !!transaction.comment?.hold;
+    return !!transaction.comment?.hold || isDuplicate(transaction.transactionID, true);
 }


add isDuplicate to condition here cause normal "Unhold" option shows for duplicated expense. and we handled it here #44892

sobitneupane · 2024-11-06T14:15:29Z

This case was missed during the feature implementation. For one-expense reports, the Review Duplicate button is not displayed.

ahmedGaber93 · 2025-10-05T02:30:36Z

src/libs/TransactionUtils.ts

+    const didDismissedViolation =
+        allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]?.comment?.dismissedViolations?.duplicatedTransaction?.[currentUserEmail] === `${currentUserAccountID}`;


Coming from #66181,

From the OP "Feature Description" screenshots, BE is returning the duplicatedTransaction value as a [currentUserEmail]: timestamp, but in the PR it was implemented as [currentUserEmail]: currentUserAccountID.

1711660500 below is a timestamp (Thursday, March 28, 2024 9:15:00 PM).

gijoe0295 added 12 commits April 12, 2024 04:04

feat: surfacing potential duplicates

b7cdaf8

revert mistake changes

513909a

Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…

473adaa

…at-surface-potential-duplicates

Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…

9aba989

…at-surface-potential-duplicates

modify copy

369585f

resolve conflicts

3843a61

show RBR on violation preview

20b4048

resolve conflicts

38c9188

show hold message on iou preview

4a6a285

show rbr on report preview

462b3df

resolve conflicts

fd8e18c

fix crash

7e2d605

gijoe0295 marked this pull request as ready for review April 25, 2024 19:44

gijoe0295 requested a review from a team as a code owner April 25, 2024 19:44

melvin-bot bot requested review from akinwale and removed request for a team April 25, 2024 19:44

gijoe0295 mentioned this pull request Apr 25, 2024

[HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] [$500][Dupe Detection] Surfacing Potential Duplicates #32607

Closed

resolve conflicts

870b6ac

gijoe0295 added 2 commits May 3, 2024 00:02

Resolve conflicts

7c3136f

hide unhold expense for duplicate expenses

e68f9f1

gijoe0295 commented May 2, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

revert unneccessary changes

3d844a0

pecanoro requested changes May 3, 2024

View reviewed changes

src/languages/es.ts Outdated Show resolved Hide resolved

src/components/HoldBanner.tsx Outdated Show resolved Hide resolved

gijoe0295 and others added 4 commits May 5, 2024 00:26

Update copy

4947382

Co-authored-by: Rocio Perez-Cano <pecanoro@users.noreply.github.com>

Merge main

bd6693b

Merge branch 'gijoe/feat-surface-potential-duplicates' of https://git…

5e558a8

…hub.com/gijoe0295/App into gijoe/feat-surface-potential-duplicates

revert HoldBanner changes

22b6cd9

pecanoro reviewed Jun 4, 2024

View reviewed changes

src/components/MoneyRequestHeader.tsx Show resolved Hide resolved

akinwale approved these changes Jun 6, 2024

View reviewed changes

melvin-bot bot requested a review from pecanoro June 6, 2024 03:16

Merge branch 'main' of https://github.com/gijoe0295/App into gijoe/fe…

10535a6

…at-surface-potential-duplicates

pecanoro approved these changes Jun 6, 2024

View reviewed changes

pecanoro merged commit 4679122 into Expensify:main Jun 6, 2024

github-actions bot mentioned this pull request Jun 10, 2024

Deploy Checklist: New Expensify 2024-06-10 #43344

Closed

lanitochka17 mentioned this pull request Jun 10, 2024

Cash · Duplicate · Hold doesn't appeared for duplicates expenses #43428

Closed

6 tasks

m-natarajan mentioned this pull request Jun 11, 2024

Duplicates - Edited duplicate show "Review required" when there is no error or violation #43487

Closed

6 tasks

chiragsalian mentioned this pull request Jun 12, 2024

[HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] Hold expense - "Hold" label appears twice on the expense preview #43440

Closed

6 tasks

bernhardoj mentioned this pull request Jun 27, 2024

[HOLD for payment 2024-07-26] [$250] Putting an expense on hold causes the Duplicate message to show in the transaction preview #44509

Closed

6 tasks

ahmedGaber93 reviewed Jul 21, 2024

View reviewed changes

ahmedGaber93 mentioned this pull request Jul 21, 2024

[HOLD for payment 2024-07-24] [$250] Review duplicates - "Unhold" option appears for expenses that are pending duplicate reviews #44892

Closed

6 tasks

bernhardoj mentioned this pull request Jul 25, 2024

[$250] Hold is not displayed in the preview for the expense which is held #46158

Closed

6 tasks

sobitneupane mentioned this pull request Sep 2, 2024

[HOLD for payment 2024-08-29] [$250] Dupe detect-Removing receipt on confirmation page also removes receipt from the actual expense #46373

Closed

6 tasks

sobitneupane mentioned this pull request Nov 6, 2024

[HOLD for payment 2024-10-29] [$250] [Dupe Detection] Unable to resolve duplicates on one-expense reporrts #49793

Closed

6 tasks

ahmedGaber93 reviewed Oct 5, 2025

View reviewed changes

		const didDismissedViolation =
		allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]?.comment?.dismissedViolations?.duplicatedTransaction?.[currentUserEmail] === `${currentUserAccountID}`;

Conversation

gijoe0295 commented Apr 11, 2024 • edited by pecanoro Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Apr 25, 2024

Uh oh!

akinwale commented Apr 29, 2024

Uh oh!

gijoe0295 commented Apr 30, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

pecanoro commented Jun 4, 2024

Uh oh!

Uh oh!

akinwale commented Jun 4, 2024

Uh oh!

gijoe0295 commented Jun 4, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pecanoro commented Jun 4, 2024

Uh oh!

akinwale commented Jun 5, 2024

Uh oh!

akinwale commented Jun 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

akinwale left a comment

Choose a reason for hiding this comment

Uh oh!

trjExpensify commented Jun 6, 2024

Uh oh!

gijoe0295 commented Jun 6, 2024

Uh oh!

pecanoro left a comment

Choose a reason for hiding this comment

Uh oh!

pecanoro commented Jun 6, 2024

Uh oh!

OSBotify commented Jun 6, 2024

Uh oh!

OSBotify commented Jun 11, 2024

Uh oh!

chiragsalian commented Jun 12, 2024

Uh oh!

ahmedGaber93 Jul 21, 2024

Choose a reason for hiding this comment

Uh oh!

sobitneupane commented Nov 6, 2024

Uh oh!

ahmedGaber93 Oct 5, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

gijoe0295 commented Apr 11, 2024 •

edited by pecanoro

Loading

gijoe0295 commented Jun 4, 2024 •

edited

Loading

akinwale commented Jun 5, 2024 •

edited

Loading