Merge pull request Expensify#65565 from callstack-internal/VickyStash/bugfix/65252-fix-receipt-delete

[Multi-Scan] Delete the draft transaction when deleting a receipt while creating expenses in bulk with Multi-Scan

Author: cristipaval

src/libs/actions/TransactionEdit.ts

@@ -1,6 +1,6 @@
 import {format} from 'date-fns';
 import Onyx from 'react-native-onyx';
-import type {Connection, OnyxEntry} from 'react-native-onyx';
+import type {Connection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import {formatCurrentUserToAttendee} from '@libs/IOUUtils';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -112,6 +112,10 @@ function removeDraftTransactions(shouldExcludeInitialTransaction = false) {
     return Onyx.multiSet(draftTransactionsSet);
 }
 
+function updateDraftTransactions(transactionsUpdates: OnyxUpdate[]) {
+    Onyx.update(transactionsUpdates);
+}
+
 function removeTransactionReceipt(transactionID: string | undefined) {
     if (!transactionID) {
         return;
@@ -153,5 +157,6 @@ export {
     removeTransactionReceipt,
     removeDraftTransactions,
     removeDraftSplitTransaction,
+    updateDraftTransactions,
     buildOptimisticTransactionAndCreateDraft,
 };

src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx

@@ -1,5 +1,6 @@
 import React, {useCallback, useEffect, useState} from 'react';
 import {InteractionManager} from 'react-native';
+import Onyx from 'react-native-onyx';
 import AttachmentCarouselView from '@components/Attachments/AttachmentCarousel/AttachmentCarouselView';
 import useCarouselArrows from '@components/Attachments/AttachmentCarousel/useCarouselArrows';
 import useAttachmentErrors from '@components/Attachments/AttachmentView/useAttachmentErrors';
@@ -12,8 +13,9 @@ import useLocalize from '@hooks/useLocalize';
 import useOnyx from '@hooks/useOnyx';
 import useThemeStyles from '@hooks/useThemeStyles';
 import Navigation from '@libs/Navigation/Navigation';
+import {getTransactionOrDraftTransaction} from '@libs/TransactionUtils';
 import type {ReceiptFile} from '@pages/iou/request/step/IOURequestStepScan/types';
-import {removeTransactionReceipt} from '@userActions/TransactionEdit';
+import {removeDraftTransaction, removeTransactionReceipt, updateDraftTransactions} from '@userActions/TransactionEdit';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
 import type {Route} from '@src/ROUTES';
@@ -67,11 +69,39 @@ function ReceiptViewModal({route}: ReceiptViewModalProps) {
         }
 
         InteractionManager.runAfterInteractions(() => {
-            removeTransactionReceipt(currentReceipt.transactionID);
+            if (currentReceipt.transactionID === CONST.IOU.OPTIMISTIC_TRANSACTION_ID) {
+                if (receipts.length === 1) {
+                    removeTransactionReceipt(currentReceipt.transactionID);
+                    return;
+                }
+
+                const secondTransactionID = receipts.at(1)?.transactionID;
+                const secondTransaction = secondTransactionID ? getTransactionOrDraftTransaction(secondTransactionID) : undefined;
+
+                if (secondTransaction) {
+                    updateDraftTransactions([
+                        {
+                            onyxMethod: Onyx.METHOD.SET,
+                            key: `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${CONST.IOU.OPTIMISTIC_TRANSACTION_ID}`,
+                            value: {
+                                ...secondTransaction,
+                                transactionID: CONST.IOU.OPTIMISTIC_TRANSACTION_ID,
+                            },
+                        },
+                        {
+                            onyxMethod: Onyx.METHOD.MERGE,
+                            key: `${ONYXKEYS.COLLECTION.TRANSACTION_DRAFT}${secondTransactionID}`,
+                            value: null,
+                        },
+                    ]);
+                }
+                return;
+            }
+            removeDraftTransaction(currentReceipt.transactionID);
         });
 
         Navigation.goBack();
-    }, [currentReceipt]);
+    }, [currentReceipt, receipts]);
 
     const handleCloseConfirmModal = () => {
         setIsDeleteReceiptConfirmModalVisible(false);