From 08cb899bd7e8e4d808ce640a8e21b18d9ce0b38d Mon Sep 17 00:00:00 2001 From: dmkt9 Date: Tue, 18 Nov 2025 16:49:00 +0700 Subject: [PATCH 1/3] Fix - Double violation briefly visible when removing a disabled category from report --- src/libs/actions/IOU.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index ffb21140bf6b..018e9c03ae37 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -4660,10 +4660,15 @@ function getUpdateMoneyRequestParams(params: GetUpdateMoneyRequestParamsType): U ) { const currentTransactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`] ?? []; // If the amount, currency or date have been modified, we remove the duplicate violations since they would be out of date as the transaction has changed - const optimisticViolations = + let optimisticViolations = hasModifiedAmount || hasModifiedDate || hasModifiedCurrency ? currentTransactionViolations.filter((violation) => violation.name !== CONST.VIOLATIONS.DUPLICATED_TRANSACTION) : currentTransactionViolations; + optimisticViolations = + hasModifiedCategory && transactionChanges.category === '' + ? optimisticViolations.filter((violation) => violation.name !== CONST.VIOLATIONS.CATEGORY_OUT_OF_POLICY) + : optimisticViolations; + const violationsOnyxData = ViolationsUtils.getViolationsOnyxData( updatedTransaction, optimisticViolations, From 5ed6a7bd41084df837a5a014e750fc1d927ef503 Mon Sep 17 00:00:00 2001 From: dmkt9 Date: Thu, 4 Dec 2025 16:36:07 +0700 Subject: [PATCH 2/3] Fix - Double violation briefly visible when removing a disabled category from report --- tests/actions/IOUTest.ts | 56 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index e7cce1d11844..30d36679928c 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -86,7 +86,7 @@ import * as API from '@src/libs/API'; import DateUtils from '@src/libs/DateUtils'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; -import type {OriginalMessageIOU, PersonalDetailsList, Policy, PolicyTagLists, Report, ReportNameValuePairs, SearchResults} from '@src/types/onyx'; +import type {OriginalMessageIOU, PersonalDetailsList, Policy, PolicyTagLists, Report, ReportNameValuePairs, SearchResults, TransactionViolations} from '@src/types/onyx'; import type {Accountant, Attendee} from '@src/types/onyx/IOU'; import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails'; import type {Participant, ReportCollectionDataSet} from '@src/types/onyx/Report'; @@ -6299,6 +6299,60 @@ describe('actions/IOU', () => { }); }); }); + + it('should remove all existing category violations when the transaction "Category" is unset', async () => { + const transactionID = '1'; + const policyID = '2'; + const transactionThreadReportID = '3'; + const category = ''; + const fakePolicy: Policy = { + ...createRandomPolicy(Number(policyID)), + requiresCategory: true, + }; + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, { + amount: 100, + transactionID, + }); + await Onyx.merge(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, [ + { + type: CONST.VIOLATION_TYPES.VIOLATION, + name: CONST.VIOLATIONS.CATEGORY_OUT_OF_POLICY, + data: {}, + showInReview: true, + }, + ]); + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, fakePolicy); + await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${transactionThreadReportID}`, {reportID: transactionThreadReportID}); + + // When updating a money request category + updateMoneyRequestCategory({ + transactionID, + transactionThreadReportID, + category, + policy: fakePolicy, + policyTagList: undefined, + policyCategories: undefined, + policyRecentlyUsedCategories: [], + currentUserAccountIDParam: 123, + currentUserEmailParam: 'existing@example.com', + isASAPSubmitBetaEnabled: false, + }); + + await waitForBatchedUpdates(); + + // Any existing category violations will be removed, leaving only the MISSING_CATEGORY violation in the end + await new Promise((resolve) => { + const connection = Onyx.connect({ + key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, + callback: (transactionViolations) => { + Onyx.disconnect(connection); + expect(transactionViolations).toHaveLength(1); + expect((transactionViolations as unknown as TransactionViolations)[0].name).toEqual(CONST.VIOLATIONS.MISSING_CATEGORY); + resolve(); + }, + }); + }); + }); }); describe('setDraftSplitTransaction', () => { From c12b05bb89fd770b95b0533ac7db239f0697ccbc Mon Sep 17 00:00:00 2001 From: dmkt9 Date: Thu, 4 Dec 2025 17:10:33 +0700 Subject: [PATCH 3/3] fix lint --- tests/actions/IOUTest.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index 30d36679928c..874c567f6ce8 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -86,7 +86,7 @@ import * as API from '@src/libs/API'; import DateUtils from '@src/libs/DateUtils'; import ONYXKEYS from '@src/ONYXKEYS'; import ROUTES from '@src/ROUTES'; -import type {OriginalMessageIOU, PersonalDetailsList, Policy, PolicyTagLists, Report, ReportNameValuePairs, SearchResults, TransactionViolations} from '@src/types/onyx'; +import type {OriginalMessageIOU, PersonalDetailsList, Policy, PolicyTagLists, Report, ReportNameValuePairs, SearchResults} from '@src/types/onyx'; import type {Accountant, Attendee} from '@src/types/onyx/IOU'; import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails'; import type {Participant, ReportCollectionDataSet} from '@src/types/onyx/Report'; @@ -6347,7 +6347,7 @@ describe('actions/IOU', () => { callback: (transactionViolations) => { Onyx.disconnect(connection); expect(transactionViolations).toHaveLength(1); - expect((transactionViolations as unknown as TransactionViolations)[0].name).toEqual(CONST.VIOLATIONS.MISSING_CATEGORY); + expect(transactionViolations?.at(0)?.name).toEqual(CONST.VIOLATIONS.MISSING_CATEGORY); resolve(); }, });