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

Fix violation shows optimistically for a partial transaction #39034

Merged
merged 11 commits into from
Apr 1, 2024
Merged

Fix violation shows optimistically for a partial transaction #39034

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d65a8f3
don't optimistically add the violation if it's a partial transaction
bernhardoj Mar 27, 2024
f9fc96d
move the partial transaciton check to getViolationsOnyxData
bernhardoj Mar 27, 2024
bdcdc47
null safety
bernhardoj Mar 27, 2024
39b8c46
add test
bernhardoj Mar 27, 2024
cd2dcc2
Merge branch 'main' into fix/38131-optimsitic-violation-for-partial-t…
bernhardoj Mar 28, 2024
2c9efa0
update partial merchant condition
bernhardoj Mar 28, 2024
3a5827f
fix test case
bernhardoj Mar 28, 2024
0612ffd
return current violation if it's a partial transaction
bernhardoj Mar 29, 2024
3b43ff6
Merge branch 'main' into fix/38131-optimsitic-violation-for-partial-t…
bernhardoj Mar 30, 2024
9e7f5b7
update test
bernhardoj Mar 30, 2024
37a9a6a
prettier
bernhardoj Mar 30, 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
23 changes: 13 additions & 10 deletions src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,16 +807,18 @@ function buildOnyxDataForMoneyRequest(
if (!policy || !PolicyUtils.isPaidGroupPolicy(policy)) {
return [optimisticData, successData, failureData];
}
const isPartialTransaction = TransactionUtils.isMerchantMissing(transaction) && TransactionUtils.isAmountMissing(transaction);
bernhardoj marked this conversation as resolved.
Show resolved Hide resolved
if (!isPartialTransaction) {
const violationsOnyxData = ViolationsUtils.getViolationsOnyxData(transaction, [], !!policy.requiresTag, policyTagList ?? {}, !!policy.requiresCategory, policyCategories ?? {});

const violationsOnyxData = ViolationsUtils.getViolationsOnyxData(transaction, [], !!policy.requiresTag, policyTagList ?? {}, !!policy.requiresCategory, policyCategories ?? {});

if (violationsOnyxData) {
optimisticData.push(violationsOnyxData);
failureData.push({
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`,
value: [],
});
if (violationsOnyxData) {
optimisticData.push(violationsOnyxData);
failureData.push({
onyxMethod: Onyx.METHOD.SET,
key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transaction.transactionID}`,
value: [],
});
}
}

return [optimisticData, successData, failureData];
Expand Down Expand Up @@ -1698,7 +1700,8 @@ function getUpdateMoneyRequestParams(
});
}

if (policy && PolicyUtils.isPaidGroupPolicy(policy) && updatedTransaction) {
const isPartialTransaction = TransactionUtils.isMerchantMissing(updatedTransaction) && TransactionUtils.isAmountMissing(updatedTransaction);
if (policy && PolicyUtils.isPaidGroupPolicy(policy) && updatedTransaction && !isPartialTransaction) {
bernhardoj marked this conversation as resolved.
Show resolved Hide resolved
const currentTransactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`] ?? [];
optimisticData.push(
ViolationsUtils.getViolationsOnyxData(
Expand Down
Loading