Merge pull request Expensify#85030 from nkdengineer/fix/83728

fix: Unexpected error when delete cropped receipt

Author: srikarparsi

src/libs/TransactionUtils/index.ts

@@ -646,7 +646,7 @@ function isCreatedMissing(transaction: OnyxEntry<Transaction>) {
 
 function areRequiredFieldsEmpty(transaction: OnyxEntry<Transaction>, transactionReport: OnyxEntry<Report>): boolean {
     const isFromExpenseReport = transactionReport?.type === CONST.REPORT.TYPE.EXPENSE;
-    return (isFromExpenseReport && isMerchantMissing(transaction)) || isCreatedMissing(transaction);
+    return (isFromExpenseReport && isMerchantMissing(transaction)) || isCreatedMissing(transaction) || (!isFromExpenseReport && getAmount(transaction) === 0);
 }
 
 function getClearedPendingFields(transactionChanges: TransactionChanges) {

src/libs/actions/IOU/index.ts

@@ -261,6 +261,7 @@ import type {OnyxData} from '@src/types/onyx/Request';
 import type {Comment, Receipt, ReceiptSource, Routes, SplitShares, TransactionChanges, TransactionCustomUnit, WaypointCollection} from '@src/types/onyx/Transaction';
 import type {FileObject} from '@src/types/utils/Attachment';
 import {isEmptyObject} from '@src/types/utils/EmptyObject';
+import {resolveDetachReceiptConflicts} from '../RequestConflictUtils';
 
 type IOURequestType = ValueOf<typeof CONST.IOU.REQUEST_TYPE>;
 
@@ -11548,7 +11549,14 @@ function detachReceipt(transactionID: string | undefined, transactionPolicy: Ony
 
     const parameters: DetachReceiptParams = {transactionID, reportActionID: updatedReportAction.reportActionID};
 
-    API.write(WRITE_COMMANDS.DETACH_RECEIPT, parameters, {optimisticData, successData, failureData});
+    API.write(
+        WRITE_COMMANDS.DETACH_RECEIPT,
+        parameters,
+        {optimisticData, successData, failureData},
+        {
+            checkAndFixConflictingRequest: (persistedRequests) => resolveDetachReceiptConflicts(persistedRequests, parameters),
+        },
+    );
 }
 
 function replaceReceipt({transactionID, file, source, state, transactionPolicy, transactionPolicyCategories, isSameReceipt}: ReplaceReceipt) {

src/libs/actions/RequestConflictUtils.ts

@@ -1,7 +1,7 @@
 import type {OnyxKey, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {TupleToUnion} from 'type-fest';
-import type {OpenReportParams, UpdateCommentParams} from '@libs/API/parameters';
+import type {DetachReceiptParams, OpenReportParams, UpdateCommentParams} from '@libs/API/parameters';
 import {WRITE_COMMANDS} from '@libs/API/types';
 import type {ApiRequestCommandParameters} from '@libs/API/types';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -227,6 +227,38 @@ function resolveEnableFeatureConflicts<TKey extends OnyxKey>(
     };
 }
 
+function resolveDetachReceiptConflicts<TKey extends OnyxKey>(persistedRequests: Array<OnyxRequest<TKey>>, parameters: DetachReceiptParams): ConflictActionData {
+    const indicesToDelete: number[] = [];
+    for (const [index, request] of persistedRequests.entries()) {
+        if (request.command !== WRITE_COMMANDS.REPLACE_RECEIPT || request.data?.transactionID !== parameters.transactionID) {
+            continue;
+        }
+        indicesToDelete.push(index);
+    }
+
+    // In the case the transaction doesn't have the receipt, remove all the replace receipt requests will make the detach receipt request invalid
+    // So we should keep the last replace receipt request to ensure the detach receipt request is always valid
+    if (indicesToDelete.length >= 1) {
+        indicesToDelete.pop();
+    }
+
+    if (indicesToDelete.length === 0) {
+        return {
+            conflictAction: {
+                type: 'push',
+            },
+        };
+    }
+
+    return {
+        conflictAction: {
+            type: 'delete',
+            indices: indicesToDelete,
+            pushNewRequest: true,
+        },
+    };
+}
+
 export {
     resolveDuplicationConflictAction,
     resolveOpenReportDuplicationConflictAction,
@@ -235,6 +267,7 @@ export {
     createUpdateCommentMatcher,
     resolveEnableFeatureConflicts,
     enablePolicyFeatureCommand,
+    resolveDetachReceiptConflicts,
 };
 
 export type {EnablePolicyFeatureCommand, AnyRequestMatcher};

tests/unit/RequestConflictUtilsTest.ts

@@ -2,10 +2,12 @@ import Onyx from 'react-native-onyx';
 import {
     enablePolicyFeatureCommand,
     resolveCommentDeletionConflicts,
+    resolveDetachReceiptConflicts,
     resolveDuplicationConflictAction,
     resolveEditCommentWithNewAddCommentRequest,
     resolveEnableFeatureConflicts,
 } from '@libs/actions/RequestConflictUtils';
+import {WRITE_COMMANDS} from '@libs/API/types';
 import type {WriteCommand} from '@libs/API/types';
 
 describe('RequestConflictUtils', () => {
@@ -160,4 +162,31 @@ describe('RequestConflictUtils', () => {
             },
         });
     });
+
+    describe('resolveDetachReceiptConflicts', () => {
+        it('returns push when no replace-receipt requests match transactionID', () => {
+            const persistedRequests = [{command: 'OpenReport'}, {command: WRITE_COMMANDS.REPLACE_RECEIPT, data: {transactionID: '2'}}, {command: 'CloseAccount'}];
+            const result = resolveDetachReceiptConflicts(persistedRequests, {transactionID: '1'} as never);
+            expect(result).toEqual({conflictAction: {type: 'push'}});
+        });
+
+        it('returns push when exactly one replace-receipt request matches transactionID', () => {
+            const persistedRequests = [{command: WRITE_COMMANDS.REPLACE_RECEIPT, data: {transactionID: '1'}}];
+            const result = resolveDetachReceiptConflicts(persistedRequests, {transactionID: '1'} as never);
+            expect(result).toEqual({conflictAction: {type: 'push'}});
+        });
+
+        it('deletes all but the last matching replace-receipt request and pushes new request', () => {
+            const persistedRequests = [
+                {command: WRITE_COMMANDS.REPLACE_RECEIPT, data: {transactionID: '1'}},
+                {command: 'OpenReport'},
+                {command: WRITE_COMMANDS.REPLACE_RECEIPT, data: {transactionID: '1'}},
+                {command: WRITE_COMMANDS.REPLACE_RECEIPT, data: {transactionID: '2'}},
+                {command: WRITE_COMMANDS.REPLACE_RECEIPT, data: {transactionID: '1'}},
+            ];
+
+            const result = resolveDetachReceiptConflicts(persistedRequests, {transactionID: '1'} as never);
+            expect(result).toEqual({conflictAction: {type: 'delete', indices: [0, 2], pushNewRequest: true}});
+        });
+    });
 });