-
Notifications
You must be signed in to change notification settings - Fork 2.9k
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 confirmation #42571
Feat/dupe detection confirmation #42571
Conversation
…tkiewicz/expensify-app into feat/dupe-detection-confirmation
…tkiewicz/expensify-app into feat/dupe-detection-confirmation
…tkiewicz/expensify-app into feat/dupe-detection-confirmation
…tkiewicz/expensify-app into feat/dupe-detection-confirmation
…tkiewicz/expensify-app into feat/dupe-detection-confirmation
…tkiewicz/expensify-app into feat/dupe-detection-confirmation
…duplicates navigator
…dd api call to merge duplicates, fixes for displaying and aplaying taxes
…tkiewicz/expensify-app into feat/dupe-detection-confirmation
…tkiewicz/expensify-app into feat/dupe-detection-confirmation
…tkiewicz/expensify-app into feat/dupe-detection-confirmation
…tkiewicz/expensify-app into feat/dupe-detection-confirmation
…tkiewicz/expensify-app into feat/dupe-detection-confirmation
…tkiewicz/expensify-app into feat/dupe-detection-confirmation
@kubabutkiewicz when you're back on Monday, please make this PR your top focus. We're aiming to get this final PR for dupe detection merged by early next week! |
I am merging so it goes into the deploy but just a note that I didn't retest the PR after the most recent commits. Hopefully it doesn't cause any issues, I will test on staging later today. |
Reviewer Checklist
Screenshots/VideosAndroid: NativeAndroid: mWeb ChromeiOS: NativeiOS: mWeb SafariMacOS: Chrome / SafariMacOS: Desktop |
Also as a note, due to the urgency, I am copying and pasting the checklist but I didn't go through each item one by one |
@parasharrajat It would have been great to have had that the checklist completed either way even though you found that small bug so it was ready to be merged this morning |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
@pecanoro Thanks. That was the only bug I saw so we are good here. I was just going to add remaining screenshots now. |
🚀 Deployed to staging by https://github.com/pecanoro in version: 9.0.10-2 🚀
|
🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.0.10-3 🚀
@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes. |
🚀 Deployed to production by https://github.com/mountiny in version: 9.0.10-7 🚀
|
🚀 Deployed to production by https://github.com/francoisl in version: 9.0.11-5 🚀
|
Coming from this issue #45814, It seems we missed disabling the ReceiptEmptyState on confirmation screen App/src/components/ReportActionItem/MoneyRequestView.tsx Lines 477 to 478 in 864c69f
|
shouldShowOfflineIndicator | ||
> | ||
<HeaderWithBackButton title={translate('iou.reviewDuplicates')} /> | ||
<ScrollView style={styles.mb3}> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should hide this page when user directly opens it via URL #45832
Another edge case where we should prevent direct access to the page if user tries to open it with invalid params. #45835 |
@@ -257,7 +268,6 @@ function MoneyRequestView({ | |||
if (hasReceipt) { | |||
receiptURIs = ReceiptUtils.getThumbnailAndImageURIs(transaction); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You forgot to change this line to take updatedTransaction. This caused #47774
</View> | ||
{/* We need that provider here becuase MoneyRequestView component require that */} | ||
<ShowContextMenuContext.Provider value={contextValue}> | ||
<MoneyRequestView |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
MoneyRequestView
should have known that the view is displayed for dupe detection as the display of transaction receipt image depends on money request report id but the transaction itself may not belong to the same report. This caused the transaction receipt image to shown a not found image in #50107
...restReviewDuplicateTransaction, | ||
modifiedMerchant: reviewDuplicateTransaction?.merchant, | ||
merchant: reviewDuplicateTransaction?.merchant, | ||
comment: {comment: reviewDuplicateTransaction?.description}, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Omitting other reviewDuplicateTransaction.comment
properties caused an issue where if default tax is selected, Default
label is not shown next to tax name. More info: #47975
Details
Fixed Issues
$ #39810
Tests
Offline tests
QA Steps
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)myBool && <MyComponent />
.src/languages/*
files and using the translation methodSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)Design
label and/or tagged@Expensify/design
so the design team can review the changes.ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop