Skip to content

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

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

Merged
cristipaval merged 2 commits into from
Jul 9, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a8c088
Fix receipt removal
VickyStash Jul 7, 2025
8d43bc7
Fix the transactions update
VickyStash Jul 8, 2025
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
7 changes: 6 additions & 1 deletion src/libs/actions/TransactionEdit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -153,5 +157,6 @@ export {
removeTransactionReceipt,
removeDraftTransactions,
removeDraftSplitTransaction,
updateDraftTransactions,
buildOptimisticTransactionAndCreateDraft,
};
36 changes: 33 additions & 3 deletions src/pages/iou/request/step/IOURequestStepScan/ReceiptViewModal/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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';
Expand Down Expand Up @@ -66,11 +68,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);
Expand Down