Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/Dupe detection review fields #42503

Merged

Conversation

kubabutkiewicz
Copy link
Contributor

@kubabutkiewicz kubabutkiewicz commented May 23, 2024

Details

This PR is a continuation of work started here, and the branch was created of branch here so it have changes from that branch so this PR should be merged after merging this.

Fixed Issues

$ #39808

Tests

  1. Create some expanses which are duplicates
  2. Go to one of expenses which are duplicates and click Review duplicates button
  3. Next click on one of the Keep this one button
  4. Now if there are some discrepancies between expenses you should be navigated to screen to review those discrepancies
  5. When there are no discrepancies you wont be navigated further, the confirmation screen will be done in next PR
  • Verify that no errors appear in the JS console

Offline tests

QA Steps

The following steps require you to be in the dupeDetection beta or use a expensifail email.

  1. Create some expanses which are duplicates
  2. Go to one of expenses which are duplicates and click Review duplicates button
  3. Next click on one of the Keep this one button
  4. Now if there are some discrepancies between expenses you should be navigated to screen to review those discrepancies
  5. When there are no discrepancies you wont be navigated further, the confirmation screen will be done in next PR
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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.

Screenshots/Videos

Android: Native
android.mp4
Android: mWeb Chrome
iOS: Native
ios.mp4
iOS: mWeb Safari
MacOS: Chrome / Safari
web.mp4
MacOS: Desktop
desktop.mp4

…are the same across transaction which are different add navigation to screen of fields which we want to review
…cz/expensify-app into feat/dupe-detection-review-fields
…cz/expensify-app into feat/dupe-detection-review-fields
…cz/expensify-app into feat/dupe-detection-review-fields
…cz/expensify-app into feat/dupe-detection-review-fields
…cz/expensify-app into feat/dupe-detection-review-fields
…cz/expensify-app into feat/dupe-detection-review-fields
…cz/expensify-app into feat/dupe-detection-review-fields
…cz/expensify-app into feat/dupe-detection-review-fields
…cz/expensify-app into feat/dupe-detection-review-fields
…cz/expensify-app into feat/dupe-detection-review-fields
…cz/expensify-app into feat/dupe-detection-review-fields
pecanoro
pecanoro previously approved these changes Jul 3, 2024
@pecanoro
Copy link
Contributor

pecanoro commented Jul 3, 2024

For some reason, it is not working for me when clicking on the Keep this one button, it does nothing. I am not sure if it's related to the console error or not 🤔

image

@parasharrajat
Copy link
Member

This is the case where there is no duplicate data. Clicking keep this one should directly do confirm action which is the next PR I guess.

@pecanoro
Copy link
Contributor

pecanoro commented Jul 3, 2024

The merchant name is different though, it should let me choose, right? But yeah, even if everything is the same, it should take you to the confirm page, which I think it's the last PR.

@kubabutkiewicz
Copy link
Contributor Author

Hmm for me it worked, maybe I can login into your account where you have those transactions , so I can debug why its not going to correct screen?

review.mp4

@kubabutkiewicz
Copy link
Contributor Author

ok, I found the issue just pushed a change

@parasharrajat
Copy link
Member

@kubabutkiewicz There is one conflict

Copy link
Member

@parasharrajat parasharrajat left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see that merchant is stored in two keys likewise amount. Tested looks good.

@melvin-bot melvin-bot bot requested a review from pecanoro July 4, 2024 14:39
@kubabutkiewicz
Copy link
Contributor Author

conflict resolved 😄

@parasharrajat
Copy link
Member

@pecanoro Bump for review.

@pecanoro
Copy link
Contributor

pecanoro commented Jul 5, 2024

Sorry, I couldn't take a look yesterday, July 4th is a national holiday in the US so I wasn't working

@pecanoro
Copy link
Contributor

pecanoro commented Jul 5, 2024

@kubabutkiewicz Ah yes, for context, when the transaction is created, the merchant is stored in merchant but then, every time the user modifies it, it gets updated in modifiedMerchant. Same for amount and currency!

@pecanoro
Copy link
Contributor

pecanoro commented Jul 5, 2024

@kubabutkiewicz I am going to merge this but there is a bug that we need to fix in the other PR. If modifiedMerchant is set, we use that one to compare, if not, then we use merchant. Since you are checking for both right now, we end up with options that are not longer valid.

In this case, I modified Hola for Luego:

image

@pecanoro pecanoro merged commit ce5ae73 into Expensify:main Jul 5, 2024
14 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Jul 5, 2024

✋ 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
Copy link
Contributor

OSBotify commented Jul 8, 2024

🚀 Deployed to staging by https://github.com/pecanoro in version: 9.0.5-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jul 8, 2024

🚀 Deployed to staging by https://github.com/pecanoro in version: 9.0.5-2 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.5-13 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.6-8 🚀

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

@akinwale
Copy link
Contributor

This PR caused a regression. An additional duplicate transaction was being added to the list of duplicate transactions being reviewed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants