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

Only show receipt-related violations in receipt audit #42661

Merged
merged 4 commits into from
May 30, 2024
+11 −4
Merged

Only show receipt-related violations in receipt audit #42661

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6cca8b
only show receipt-related notice violations fin receipt audit
gijoe0295 May 27, 2024
182fb9f
do not show violation twice
gijoe0295 May 27, 2024
9c42539
remove redundant violation message
gijoe0295 May 28, 2024
0061773
rename variable
gijoe0295 May 29, 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
Next Next commit
Loading
Loading status checks…
only show receipt-related notice violations fin receipt audit
@gijoe0295
gijoe0295 committed May 27, 2024
commit a6cca8b5cdebbce5bb29fe29f0b9396948aaefe0
14 changes: 11 additions & 3 deletions src/components/ReportActionItem/MoneyRequestView.tsx
View file
Original file line number Diff line number Diff line change
@@ -319,7 +319,15 @@ function MoneyRequestView({

const shouldShowMapOrReceipt = showMapAsImage || hasReceipt;
const shouldShowReceiptEmptyState = !hasReceipt && !isInvoice && (canEditReceipt || isAdmin || isApprover);
const noticeTypeViolations = transactionViolations?.filter((violation) => violation.type === 'notice').map((v) => ViolationsUtils.getViolationTranslation(v, translate)) ?? [];
const receiptNoticeNames: OnyxTypes.ViolationName[] = [
CONST.VIOLATIONS.RECEIPT_REQUIRED,
CONST.VIOLATIONS.RECEIPT_NOT_SMART_SCANNED,
CONST.VIOLATIONS.MODIFIED_DATE,
CONST.VIOLATIONS.CASH_EXPENSE_WITH_NO_RECEIPT,
CONST.VIOLATIONS.SMARTSCAN_FAILED,
];
const receiptNoticeViolations =
transactionViolations?.filter((violation) => receiptNoticeNames.includes(violation.name)).map((v) => ViolationsUtils.getViolationTranslation(v, translate)) ?? [];
const shouldShowNotesViolations = !isReceiptBeingScanned && canUseViolations && ReportUtils.isPaidGroupPolicy(report);

return (
@@ -328,7 +336,7 @@ function MoneyRequestView({
<View style={shouldShowAnimatedBackground && [StyleUtils.getReportWelcomeTopMarginStyle(isSmallScreenWidth, true)]}>
{!isInvoice && (
<ReceiptAuditHeader
notes={noticeTypeViolations}
notes={receiptNoticeViolations}
shouldShowAuditMessage={Boolean(shouldShowNotesViolations && didRceiptScanSucceed)}
/>
)}
@@ -383,7 +391,7 @@ function MoneyRequestView({
/>
)}
{!shouldShowReceiptEmptyState && !shouldShowMapOrReceipt && <View style={{marginVertical: 6}} />}
{shouldShowNotesViolations && <ReceiptAuditMessages notes={noticeTypeViolations} />}
{shouldShowNotesViolations && <ReceiptAuditMessages notes={receiptNoticeViolations} />}
{canUseViolations && <ViolationMessages violations={getViolationsForField('receipt')} />}
<OfflineWithFeedback pendingAction={getPendingFieldAction('amount')}>
<MenuItemWithTopDescription