Skip to content

Commit 2d09088

Browse files
committed
avoid creating violations for invoices
1 parent 21fe76d commit 2d09088

3 files changed

Lines changed: 5 additions & 23 deletions

File tree

src/components/MoneyRequestConfirmationList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ function MoneyRequestConfirmationList({
393393
const isMerchantEmpty = useMemo(() => !iouMerchant || isMerchantMissing(transaction), [transaction, iouMerchant]);
394394
const isMerchantRequired = isPolicyExpenseChat && (!isScanRequest || isEditingSplitBill) && shouldShowMerchant;
395395

396-
const isCategoryRequired = !!policy?.requiresCategory;
396+
const isCategoryRequired = !!policy?.requiresCategory && !isTypeInvoice;
397397

398398
useEffect(() => {
399399
if (shouldDisplayFieldError && didConfirmSplit) {

src/libs/ReportUtils.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1842,12 +1842,11 @@ function pushTransactionViolationsOnyxData(
18421842
const hasDependentTags = hasDependentTagsPolicyUtils(optimisticPolicy, policyTagLists);
18431843

18441844
getAllPolicyReports(policyID).forEach((report) => {
1845-
if (!report?.reportID) {
1845+
const isReportAnInvoice = isInvoiceReport(report);
1846+
if (!report?.reportID || isReportAnInvoice) {
18461847
return;
18471848
}
18481849

1849-
const isReportAnInvoice = isInvoiceReport(report);
1850-
18511850
getReportTransactions(report.reportID).forEach((transaction: Transaction) => {
18521851
const transactionViolations = allTransactionViolations?.[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`] ?? [];
18531852

src/libs/actions/IOU.ts

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ import {
155155
isDraftReport,
156156
isExpenseReport,
157157
isIndividualInvoiceRoom,
158+
isInvoiceReport,
158159
isInvoiceReport as isInvoiceReportReportUtils,
159160
isInvoiceRoom,
160161
isMoneyRequestReport as isMoneyRequestReportReportUtils,
@@ -2376,25 +2377,6 @@ function buildOnyxDataForInvoice(invoiceParams: BuildOnyxDataForInvoiceParams):
23762377
return [optimisticData, successData, failureData];
23772378
}
23782379

2379-
const violationsOnyxData = ViolationsUtils.getViolationsOnyxData(
2380-
transactionParams.transaction,
2381-
[],
2382-
policyParams.policy,
2383-
policyParams.policyTagList ?? {},
2384-
policyParams.policyCategories ?? {},
2385-
hasDependentTags(policyParams.policy, policyParams.policyTagList ?? {}),
2386-
true,
2387-
);
2388-
2389-
if (violationsOnyxData) {
2390-
optimisticData.push(violationsOnyxData);
2391-
failureData.push({
2392-
onyxMethod: Onyx.METHOD.SET,
2393-
key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionParams.transaction.transactionID}`,
2394-
value: [],
2395-
});
2396-
}
2397-
23982380
return [optimisticData, successData, failureData];
23992381
}
24002382

@@ -4328,6 +4310,7 @@ function getUpdateMoneyRequestParams(
43284310
if (
43294311
policy &&
43304312
isPaidGroupPolicy(policy) &&
4313+
!isInvoiceReport(iouReport) &&
43314314
updatedTransaction &&
43324315
(hasModifiedTag || hasModifiedCategory || hasModifiedComment || hasModifiedDistanceRate || hasModifiedAmount || hasModifiedCreated)
43334316
) {

0 commit comments

Comments
 (0)