fix: Use new ResolveDuplicates when approver is resolving duplicates #48522

nkdengineer · 2024-09-04T05:09:07Z

Details

Fixed Issues

$ #48416
PROPOSAL: #48416 (comment)

Tests

Precondition: Create a workspace and invite a user as employee

[Employee] Submit two expenses that are duplicated
[Admin] Go to the transaction thread of a transaction
[Admin] Review the duplicate and chose any transaction to keep
[Admin] Confirm to resolve the duplicate
Verify that the transaction thread of the kept transaction has a dismiss violation action resolved the duplicate
The preview of other duplicate transactions has hold message and the transaction thread has a hold action

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

[Employee] Submit two expenses that are duplicated
[Admin] Go to the transaction thread of a transaction
[Admin] Review the duplicate and choose any transaction to keep
[Admin] Confirm to resolve the duplicate
Verify that the transaction thread of the kept transaction has a dismiss violation action resolved the duplicate
The preview of other duplicate transactions has a hold message and the transaction thread has a hold action

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-09-11.at.22.08.48.mov

Android: mWeb Chrome

Screen.Recording.2024-09-11.at.22.04.11.mov

iOS: Native

Screen.Recording.2024-09-11.at.22.06.30.mov

iOS: mWeb Safari

Screen.Recording.2024-09-11.at.22.01.43.mov

MacOS: Chrome / Safari

Screen.Recording.2024-09-11.at.21.57.44.mp4

MacOS: Desktop

Screen.Recording.2024-09-11.at.22.15.01.mov

melvin-bot · 2024-09-11T15:20:58Z

@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/libs/API/parameters/TransactionResolveParams.ts

src/libs/API/types.ts

src/libs/actions/IOU.ts

parasharrajat · 2024-09-12T10:33:29Z

src/libs/API/parameters/TransactionResolveParams.ts

Rename this file too.

Same as below.

parasharrajat · 2024-09-12T10:35:37Z

src/libs/actions/IOU.ts

+    const transactionThreadReportID = Object.values(allReportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${params.reportID}`] ?? {})?.find(
+        (reportAction): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> => {
+            if (!ReportActionsUtils.isMoneyRequestAction(reportAction)) {
+                return false;
+            }
+            const message = ReportActionsUtils.getOriginalMessage(reportAction);
+            if (!message?.IOUTransactionID) {
+                return false;
+            }
+            return params.transactionID === message.IOUTransactionID;
+        },
+    )?.childReportID;


This can also be replaced with that new function getIOUActionForTransactions

src/libs/API/parameters/ResolveDuplicatesParams.ts

src/pages/TransactionDuplicate/Confirmation.tsx

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

dylanexpensify · 2024-09-13T18:47:57Z

is this ready for re-review, @nkdengineer?

parasharrajat · 2024-09-20T20:24:09Z

BUG: On native, after we resolved a transaction the duplicate tag and RBR is not resolved until I reopen the request report.

parasharrajat · 2024-09-20T20:24:21Z

Rest looks pretty good.

parasharrajat

Bug

pecanoro · 2024-09-23T15:20:42Z

@nkdengineer Can you take a look at the bug that Rajat mentioned?

nkdengineer · 2024-09-24T03:43:12Z

Checking this now.

nkdengineer · 2024-09-24T06:23:25Z

@parasharrajat I fixed this bug above, please help to check again.

parasharrajat · 2024-09-24T12:27:25Z

src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx

+    const [personalDetails] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST);
+    const [chatReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${chatReportID || '-1'}`);
+    const [session] = useOnyx(ONYXKEYS.SESSION);
+    const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${iouReportID || '-1'}`);
+
+    const isMoneyRequestAction = ReportActionsUtils.isMoneyRequestAction(action);
+    const transactionID = isMoneyRequestAction ? ReportActionsUtils.getOriginalMessage(action)?.IOUTransactionID : '-1';
+    const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`);
+    const [walletTerms] = useOnyx(ONYXKEYS.WALLET_TERMS);
+    const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);


Why did we move these here instead of MoneyRequestPreview?

parasharrajat · 2024-09-24T12:27:49Z

@nkdengineer Could you please summarize the root cause of the bug #48522 (comment)?

nkdengineer · 2024-09-24T12:30:12Z

@parasharrajat The problem may come from withOnyx HOC then I remove it and move other data to MoneyRequestPreviewContent with useOnyx.

parasharrajat · 2024-09-24T16:52:09Z

Screenshots

🔲 iOS / native

21.09.2024_01.28.54_REC.mp4

🔲 iOS / Safari

21.09.2024_00.36.46_REC.mp4

🔲 MacOS / Desktop

21.09.2024_00.35.42_REC.mp4

🔲 MacOS / Chrome

21.09.2024_00.32.37_REC.mp4

🔲 Android / Chrome

21.09.2024_00.40.58_REC.mp4

🔲 Android / native

21.09.2024_01.45.55_REC.mp4

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

parasharrajat · 2024-09-24T16:54:05Z

@nkdengineer Looks like tests are failing.

nkdengineer · 2024-09-24T16:57:31Z

@parasharrajat Jest test 2 is failing on the latest main.

nkdengineer · 2024-09-24T16:58:01Z

https://expensify.slack.com/archives/C01GTK53T8Q/p1727166916562259

github-actions · 2024-09-24T18:42:34Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, Desktop, and Web. Happy testing! 🧪🧪

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/48522/index.html	https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/48522/index.html

Desktop 💻	Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/48522/NewExpensify.dmg	https://48522.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

pecanoro

Just a minor request! I tested the PR and it's working well!

src/libs/actions/IOU.ts

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

OSBotify · 2024-09-25T14:34:26Z

✋ 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 · 2024-09-27T17:58:32Z

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

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

github-actions · 2024-09-30T22:40:19Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.41-10 🚀

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

nkdengineer added 8 commits September 4, 2024 12:08

fix: Use new ResolveDuplicates when approver is resolving duplicates

36b7e06

add new api params

2d1d4ca

Merge branch 'main' into fix/48416

6325f73

complete parameter for API

8086b11

Merge branch 'main' into fix/48416

06bdd10

fix the order issue

107be8e

fix lint

c5023dc

Merge branch 'main' into fix/48416

e881a3b

nkdengineer marked this pull request as ready for review September 11, 2024 15:20

nkdengineer requested a review from a team as a code owner September 11, 2024 15:20

melvin-bot bot requested review from parasharrajat and removed request for a team September 11, 2024 15:20

nkdengineer mentioned this pull request Sep 11, 2024

[HOLD for payment 2024-10-14] [$250] [Dupe detection] Use new ResolveDuplicates when approver is resolving duplicates #48416

Closed

pecanoro self-requested a review September 11, 2024 20:08

pecanoro requested changes Sep 11, 2024

View reviewed changes

src/libs/API/parameters/TransactionResolveParams.ts Outdated Show resolved Hide resolved

src/libs/API/parameters/TransactionResolveParams.ts Outdated Show resolved Hide resolved

parasharrajat suggested changes Sep 11, 2024

View reviewed changes

src/libs/API/types.ts Outdated Show resolved Hide resolved

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved

src/libs/actions/IOU.ts Outdated Show resolved Hide resolved

nkdengineer added 4 commits September 12, 2024 17:04

merge main

b549c50

create a util to get iou action

96d0da4

rename variable

754932d

fix lint

b7a27c3

parasharrajat suggested changes Sep 12, 2024

View reviewed changes

use getIOUActionForTransactions

b331032

pecanoro requested changes Sep 12, 2024

View reviewed changes

src/libs/API/parameters/ResolveDuplicatesParams.ts Outdated Show resolved Hide resolved

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

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

nkdengineer and others added 5 commits September 13, 2024 00:10

merge main

85cc2e9

remove unuse variable

5fcf063

Update src/libs/API/parameters/ResolveDuplicatesParams.ts

f56ffab

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

Merge branch 'main' into fix/48416

c076bdc

fix lint

aee9154

parasharrajat suggested changes Sep 21, 2024

View reviewed changes

nkdengineer added 2 commits September 24, 2024 11:48

Merge branch 'main' into fix/48416

e32ed93

fix native bug

98287b6

parasharrajat reviewed Sep 24, 2024

View reviewed changes

parasharrajat approved these changes Sep 24, 2024

View reviewed changes

melvin-bot bot requested a review from pecanoro September 24, 2024 16:52

pecanoro added the Ready To Build label Sep 24, 2024

pecanoro requested changes Sep 24, 2024

View reviewed changes

src/libs/actions/IOU.ts Show resolved Hide resolved

nkdengineer and others added 2 commits September 25, 2024 09:48

Update src/libs/actions/IOU.ts

23e2313

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

Merge branch 'main' into fix/48416

b3cce2d

pecanoro approved these changes Sep 25, 2024

View reviewed changes

pecanoro merged commit a373b27 into Expensify:main Sep 25, 2024
16 checks passed

github-actions bot mentioned this pull request Sep 27, 2024

Deploy Checklist: New Expensify 2024-09-27 #49855

Closed

IuliiaHerets mentioned this pull request Sep 27, 2024

[HOLD for payment 2024-10-30] [$250] [Dupe detection] Report header has "Hold" action when the expense is already in Hold status #49872

Closed

6 tasks

neil-marcellini mentioned this pull request Sep 30, 2024

Revert "fix: Use new ResolveDuplicates when approver is resolving duplicates" #49953

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Use new ResolveDuplicates when approver is resolving duplicates #48522

fix: Use new ResolveDuplicates when approver is resolving duplicates #48522

nkdengineer commented Sep 4, 2024 •

edited

Loading

melvin-bot bot commented Sep 11, 2024

parasharrajat Sep 12, 2024

nkdengineer Sep 12, 2024

parasharrajat Sep 12, 2024

nkdengineer Sep 12, 2024

dylanexpensify commented Sep 13, 2024

parasharrajat commented Sep 20, 2024

parasharrajat commented Sep 20, 2024

parasharrajat left a comment •

edited

Loading

pecanoro commented Sep 23, 2024

nkdengineer commented Sep 24, 2024

nkdengineer commented Sep 24, 2024

parasharrajat Sep 24, 2024

parasharrajat commented Sep 24, 2024 •

edited

Loading

nkdengineer commented Sep 24, 2024

parasharrajat commented Sep 24, 2024

parasharrajat left a comment

parasharrajat commented Sep 24, 2024

nkdengineer commented Sep 24, 2024

nkdengineer commented Sep 24, 2024

github-actions bot commented Sep 24, 2024

pecanoro left a comment

OSBotify commented Sep 25, 2024

github-actions bot commented Sep 27, 2024

github-actions bot commented Sep 30, 2024

fix: Use new ResolveDuplicates when approver is resolving duplicates #48522

fix: Use new ResolveDuplicates when approver is resolving duplicates #48522

Conversation

nkdengineer commented Sep 4, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 11, 2024

parasharrajat Sep 12, 2024

Choose a reason for hiding this comment

nkdengineer Sep 12, 2024

Choose a reason for hiding this comment

parasharrajat Sep 12, 2024

Choose a reason for hiding this comment

nkdengineer Sep 12, 2024

Choose a reason for hiding this comment

dylanexpensify commented Sep 13, 2024

parasharrajat commented Sep 20, 2024

parasharrajat commented Sep 20, 2024

parasharrajat left a comment • edited Loading

Choose a reason for hiding this comment

pecanoro commented Sep 23, 2024

nkdengineer commented Sep 24, 2024

nkdengineer commented Sep 24, 2024

parasharrajat Sep 24, 2024

Choose a reason for hiding this comment

parasharrajat commented Sep 24, 2024 • edited Loading

nkdengineer commented Sep 24, 2024

parasharrajat commented Sep 24, 2024

Screenshots

🔲 iOS / native

🔲 iOS / Safari

🔲 MacOS / Desktop

🔲 MacOS / Chrome

🔲 Android / Chrome

🔲 Android / native

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

parasharrajat commented Sep 24, 2024

nkdengineer commented Sep 24, 2024

nkdengineer commented Sep 24, 2024

github-actions bot commented Sep 24, 2024

pecanoro left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 25, 2024

github-actions bot commented Sep 27, 2024

github-actions bot commented Sep 30, 2024

nkdengineer commented Sep 4, 2024 •

edited

Loading

parasharrajat left a comment •

edited

Loading

parasharrajat commented Sep 24, 2024 •

edited

Loading