Polish: Dupe detection #45890

kubabutkiewicz · 2024-07-22T10:36:07Z

Details

Fixed Issues

$ #45815
$ #45831
$ #45865
$ #45864

Tests

Go to report which is dupe transaction
Click Review duplicates
Go through flow
On confirmation screen verify that confirm button is in right size and at docked to bottom

Verify that no errors appear in the JS console

Offline tests

QA Steps

Go to report which is dupe transaction
Click Review duplicates
Go through flow
On confirmation screen verify that confirm button is in right size and at docked to bottom

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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-07-22T10:36:12Z

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

src/pages/TransactionDuplicate/Confirmation.tsx

parasharrajat · 2024-07-22T13:34:03Z

@kubabutkiewicz Could you please add more issues on this PR?

kubabutkiewicz · 2024-07-22T13:49:13Z

Yes, I am on that @parasharrajat

kubabutkiewicz · 2024-07-22T14:40:33Z

@parasharrajat its ready to check

parasharrajat · 2024-07-22T14:41:37Z

Great. Thanks. I will get them tested in sometime.

src/libs/TransactionUtils.ts

src/pages/TransactionDuplicate/Confirmation.tsx

…olish/dupe-detection-confirmation

kubabutkiewicz · 2024-07-23T13:56:34Z

@parasharrajat @pecanoro Comments are resolved 😄

pecanoro · 2024-07-23T15:03:49Z

@parasharrajat I will do a final review when you have a chance to test it and complete the list!!

parasharrajat · 2024-07-23T18:14:16Z

Screenshots

🔲 iOS / native

24.07.2024_17.39.55_REC.mp4

🔲 iOS / Safari

23.07.2024_23.14.37_REC.mp4

🔲 MacOS / Desktop

23.07.2024_23.17.48_REC.mp4

🔲 MacOS / Chrome

23.07.2024_23.12.45_REC.mp4

🔲 Android / Chrome

23.07.2024_23.16.08_REC.mp4

🔲 Android / native

24.07.2024_17.39.00_REC.mp4

parasharrajat · 2024-07-23T18:19:11Z

Looks like there is some difference on how the footer button is placed. Compare the assign task and confirm page.

23.07.2024_23.47.30_REC.mp4

Is this alright @pecanoro?

…olish/dupe-detection-confirmation

kubabutkiewicz · 2024-07-24T08:15:00Z

@parasharrajat But its the same as on Money Request, composer, edit description etc.

parasharrajat · 2024-07-24T10:58:24Z

I am not objecting to this completely. Let's ask @shawnborton about this.

@shawnborton What do you think about the placement of the Footer button on Confirm page? #45890 (comment)

shawnborton · 2024-07-24T11:02:26Z

What you are showing on the confirm page looks correct. We actually have a PR open somewhere to fix all of the bottom-docked buttons that are not using the correct SafeSpace.

parasharrajat

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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.

🎀 👀 🎀 C+ reviewed

pecanoro · 2024-07-24T15:20:12Z

src/libs/TransactionUtils.ts

+        return items.every((item) => keyExtractor(item) === keyExtractor(firstTransaction));
+    }
+
+    // Helper function to process changes


I am not going to block on this, but you could have been a bit more specific, like process changes for what purpose? Explain why we need this since the comment just say the same as the function name

OSBotify · 2024-07-24T15:33:35Z

✋ 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-07-25T03:38:47Z

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

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

OSBotify · 2024-07-26T05:16:28Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.0.12-0 🚀

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

OSBotify · 2024-07-26T05:37:32Z

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

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

fix: button styles and dock confirm button to bottom

b8cd12a

kubabutkiewicz requested a review from a team as a code owner July 22, 2024 10:36

melvin-bot bot requested review from parasharrajat and removed request for a team July 22, 2024 10:36

kubabutkiewicz changed the title ~~fix: button styles and dock confirm button to bottom on dupe detection confirm screen~~ Polish: button styles and dock confirm button to bottom on dupe detection confirm screen Jul 22, 2024

JKobrynski reviewed Jul 22, 2024

View reviewed changes

src/pages/TransactionDuplicate/Confirmation.tsx Outdated Show resolved Hide resolved

fix: typo

7641ccf

fix: refactor a bit code, fix empty merchant field, fix billable field

26b7f14

kubabutkiewicz changed the title ~~Polish: button styles and dock confirm button to bottom on dupe detection confirm screen~~ Polish: Dupe detection Jul 22, 2024

pecanoro requested changes Jul 22, 2024

View reviewed changes

src/libs/TransactionUtils.ts Show resolved Hide resolved

src/libs/TransactionUtils.ts Show resolved Hide resolved

parasharrajat reviewed Jul 22, 2024

View reviewed changes

src/pages/TransactionDuplicate/Confirmation.tsx Outdated Show resolved Hide resolved

parasharrajat reviewed Jul 22, 2024

View reviewed changes

src/pages/TransactionDuplicate/Confirmation.tsx Outdated Show resolved Hide resolved

kubabutkiewicz added 3 commits July 23, 2024 15:11

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into p…

7f9668a

…olish/dupe-detection-confirmation

fix: resolve comments

86b923d

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into p…

bee9265

…olish/dupe-detection-confirmation

Merge branch 'main' of github.com:kubabutkiewicz/expensify-app into p…

dce9b81

…olish/dupe-detection-confirmation

parasharrajat approved these changes Jul 24, 2024

View reviewed changes

melvin-bot bot requested a review from pecanoro July 24, 2024 12:11

pecanoro approved these changes Jul 24, 2024

View reviewed changes

pecanoro merged commit ff770ad into Expensify:main Jul 24, 2024
15 checks passed

github-actions bot mentioned this pull request Jul 25, 2024

Deploy Checklist: New Expensify 2024-07-25 #46161

Closed

64 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Polish: Dupe detection #45890

Polish: Dupe detection #45890

kubabutkiewicz commented Jul 22, 2024 •

edited

Loading

melvin-bot bot commented Jul 22, 2024

parasharrajat commented Jul 22, 2024

kubabutkiewicz commented Jul 22, 2024

kubabutkiewicz commented Jul 22, 2024

parasharrajat commented Jul 22, 2024

kubabutkiewicz commented Jul 23, 2024

pecanoro commented Jul 23, 2024

parasharrajat commented Jul 23, 2024 •

edited

Loading

parasharrajat commented Jul 23, 2024

kubabutkiewicz commented Jul 24, 2024

parasharrajat commented Jul 24, 2024

shawnborton commented Jul 24, 2024

parasharrajat left a comment

pecanoro Jul 24, 2024

OSBotify commented Jul 24, 2024

OSBotify commented Jul 25, 2024

OSBotify commented Jul 26, 2024

OSBotify commented Jul 26, 2024

Polish: Dupe detection #45890

Polish: Dupe detection #45890

Conversation

kubabutkiewicz commented Jul 22, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 22, 2024

parasharrajat commented Jul 22, 2024

kubabutkiewicz commented Jul 22, 2024

kubabutkiewicz commented Jul 22, 2024

parasharrajat commented Jul 22, 2024

kubabutkiewicz commented Jul 23, 2024

pecanoro commented Jul 23, 2024

parasharrajat commented Jul 23, 2024 • edited Loading

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Desktop

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

parasharrajat commented Jul 23, 2024

kubabutkiewicz commented Jul 24, 2024

parasharrajat commented Jul 24, 2024

shawnborton commented Jul 24, 2024

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

pecanoro Jul 24, 2024

Choose a reason for hiding this comment

OSBotify commented Jul 24, 2024

OSBotify commented Jul 25, 2024

OSBotify commented Jul 26, 2024

OSBotify commented Jul 26, 2024

kubabutkiewicz commented Jul 22, 2024 •

edited

Loading

parasharrajat commented Jul 23, 2024 •

edited

Loading