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.

Sign up for GitHub

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

Don't show RBR for modified date/amount violation if not a policy report #48236

Merged
merged 2 commits into from
Sep 9, 2024
Merged

Don't show RBR for modified date/amount violation if not a policy report #48236

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4fcc84f
don't show rbr if not a policy report
bernhardoj Aug 29, 2024
507701a
Merge branch 'main' into fix/48147-hide-modified-amount-date-if-not-p…
bernhardoj Sep 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/libs/ReportUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5864,7 +5864,7 @@ function doesTransactionThreadHaveViolations(
return (
TransactionUtils.hasViolation(IOUTransactionID, transactionViolations) ||
TransactionUtils.hasWarningTypeViolation(IOUTransactionID, transactionViolations) ||
TransactionUtils.hasModifiedAmountOrDateViolation(IOUTransactionID, transactionViolations)
(isPaidGroupPolicy(report) && TransactionUtils.hasModifiedAmountOrDateViolation(IOUTransactionID, transactionViolations))
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Explanation of #48147:

When we edit the amount to be higher, we don't receive the modifiedAmount violation from the BE, but if we edit the date, then we receive the modifiedDate violation from the BE. We can say that it's a BE issue, but our real issue here is that we have inconsistent conditions.

From what I found, we don't want to show the notice violation (modified date/amount is a type of notice) if it's not a policy report.

App/src/components/ReportActionItem/MoneyRequestView.tsx

Line 226 in b9af3d1

const {getViolationsForField} = useViolations(transactionViolations ?? [], isReceiptBeingScanned || !ReportUtils.isPaidGroupPolicy(report));

App/src/hooks/useViolations.ts

Lines 59 to 67 in b9af3d1

function useViolations(violations: TransactionViolation[], shouldShowOnlyViolations: boolean) {
const violationsByField = useMemo((): ViolationsMap => {
const filteredViolations = violations.filter((violation) => {
if (excludedViolationsName.includes(violation.name)) {
return false;
}
if (shouldShowOnlyViolations) {
return violation.type === CONST.VIOLATION_TYPES.VIOLATION;
}

App/src/components/ReportActionItem/MoneyRequestPreview/MoneyRequestPreviewContent.tsx

Line 113 in b9af3d1

const hasNoticeTypeViolations = TransactionUtils.hasNoticeTypeViolation(transaction?.transactionID ?? '-1', transactionViolations) && ReportUtils.isPaidGroupPolicy(iouReport);

To be honest, the condition to show violation or not is really all over the place and it's really easy to miss it, but I'm gonna make it consistent for what we added for now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Additional video showing the RB still shows for policy report:

web.mp4

);
}

Expand Down
Loading