Skip to content

Refactor Receipts function to remove Onyx report access #95896

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

Open
parasharrajat wants to merge 11 commits into
base: main
Choose a base branch
from
Open

Refactor Receipts function to remove Onyx report access #95896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f041836
Refactor ReplaceReceipt function to remove Onyx report access
parasharrajat Jul 11, 2026
94f6c57
Refactor Receipt functions
parasharrajat Jul 11, 2026
2e8a681
Merge branch 'onyx/report-6' into onyx/report-5
parasharrajat Jul 11, 2026
8d0dff3
Merge branch 'main' of github.com:Expensify/App into onyx/report-5
parasharrajat Jul 15, 2026
38102a4
fix
parasharrajat Jul 16, 2026
eeb63fd
fix tests
parasharrajat Jul 16, 2026
d780cbd
fixes
parasharrajat Jul 25, 2026
e7e0148
cleanup
parasharrajat Jul 25, 2026
671cf28
Merge branch 'main' of github.com:Expensify/App into onyx/report-5
parasharrajat Jul 25, 2026
209584c
Merge branch 'Expensify:main' into onyx/report-5
parasharrajat Aug 1, 2026
e8f1830
Fix detachReceipt argument in receipt test
parasharrajat Aug 1, 2026
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
2 changes: 2 additions & 0 deletions src/components/ReportActionItem/MoneyRequestReceiptView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ function MoneyRequestReceiptView({
}, [parentReportAction]);

const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(linkedTransactionID)}`);
const [transactionReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`);
const [policy] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY}${moneyRequestReport?.policyID}`);
const [cardList] = useOnyx(ONYXKEYS.CARD_LIST);
const transactionViolations = useTransactionViolations(transaction?.transactionID);
Expand Down Expand Up @@ -568,6 +569,7 @@ function MoneyRequestReceiptView({
transactionPolicyCategories: policyCategories,
transactionPolicyTagList: policyTagList,
transactionViolations: rawTransactionViolations,
transactionReport,
});
};

Expand Down
37 changes: 22 additions & 15 deletions src/libs/actions/IOU/Receipt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import type {ValueOf} from 'type-fest';

import Onyx from 'react-native-onyx';

import {getAllReports} from '.';
import {getReceiptError} from './MoneyRequestBuilder';

type ReplaceReceipt = {
Expand All @@ -40,23 +39,22 @@ type ReplaceReceipt = {
isSameReceipt?: boolean;
transactionPolicyTagList?: OnyxEntry<OnyxTypes.PolicyTagLists>;
transactionViolations?: OnyxEntry<OnyxTypes.TransactionViolations>;
transactionReport: OnyxEntry<OnyxTypes.Report>;
};
type ReplaceReceiptRetryParams = Omit<ReplaceReceipt, 'transaction'> & {transactionID: string};
type ReplaceReceiptRetryParams = Omit<ReplaceReceipt, 'transaction' | 'transactionReport'> & {transactionID: string};
Comment thread
parasharrajat marked this conversation as resolved.

function detachReceipt(
transaction: OnyxEntry<OnyxTypes.Transaction>,
transactionPolicy: OnyxEntry<OnyxTypes.Policy>,
transactionPolicyTagList: OnyxEntry<OnyxTypes.PolicyTagLists>,
transactionViolations: OnyxEntry<OnyxTypes.TransactionViolations>,
transactionReport: OnyxEntry<OnyxTypes.Report>,
transactionPolicyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
) {
const transactionID = transaction?.transactionID;
if (!transactionID) {
return;
}
const allReports = getAllReports();

const expenseReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] ?? null;
const newTransaction = transaction
? {
...transaction,
Expand Down Expand Up @@ -115,7 +113,7 @@ function detachReceipt(
policyTagList: transactionPolicyTagList ?? {},
policyCategories: transactionPolicyCategories ?? {},
hasDependentTags: hasDependentTags(transactionPolicy, transactionPolicyTagList ?? {}),
isInvoiceTransaction: isInvoiceReportReportUtils(expenseReport),
isInvoiceTransaction: isInvoiceReportReportUtils(transactionReport),
ownerLogin: undefined,
});
optimisticData.push(violationsOnyxData);
Expand All @@ -126,7 +124,7 @@ function detachReceipt(
});
}

const updatedReportAction = buildOptimisticDetachReceipt(expenseReport?.reportID, transactionID, transaction?.merchant);
const updatedReportAction = buildOptimisticDetachReceipt(transactionReport?.reportID, transactionID, transaction?.merchant);

optimisticData.push({
onyxMethod: Onyx.METHOD.MERGE,
Expand All @@ -147,20 +145,20 @@ function detachReceipt(
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT}${updatedReportAction?.reportID}`,
value: {
lastVisibleActionCreated: expenseReport?.lastVisibleActionCreated,
lastReadTime: expenseReport?.lastReadTime,
lastVisibleActionCreated: transactionReport?.lastVisibleActionCreated,
lastReadTime: transactionReport?.lastReadTime,
},
});
successData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionReport?.reportID}`,
value: {
[updatedReportAction.reportActionID]: {pendingAction: null},
},
});
failureData.push({
onyxMethod: Onyx.METHOD.MERGE,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport?.reportID}`,
key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${transactionReport?.reportID}`,
value: {
[updatedReportAction.reportActionID]: {
...(updatedReportAction as OnyxTypes.ReportAction),
Expand All @@ -181,7 +179,18 @@ function detachReceipt(
);
}

function replaceReceipt({transaction, file, source, state, transactionPolicy, transactionPolicyCategories, isSameReceipt, transactionPolicyTagList, transactionViolations}: ReplaceReceipt) {
function replaceReceipt({
transaction,
file,
source,
state,
transactionPolicy,
transactionPolicyCategories,
isSameReceipt,
transactionPolicyTagList,
transactionViolations,
transactionReport,
}: ReplaceReceipt) {
const transactionID = transaction?.transactionID;

if (!file || !transactionID) {
Expand All @@ -190,9 +199,7 @@ function replaceReceipt({transaction, file, source, state, transactionPolicy, tr

const receiptTraceId = mintAndStampReceiptTraceId(file);
logReceiptCaptured({file, captureSource: 'replace', receiptTraceId});
const allReports = getAllReports();

const expenseReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`] ?? null;
const oldReceipt = transaction?.receipt ?? {};
const receiptOptimistic = {
source,
Expand Down Expand Up @@ -262,7 +269,7 @@ function replaceReceipt({transaction, file, source, state, transactionPolicy, tr
policyTagList: transactionPolicyTagList ?? {},
policyCategories: transactionPolicyCategories ?? {},
hasDependentTags: hasDependentTags(transactionPolicy, transactionPolicyTagList ?? {}),
isInvoiceTransaction: isInvoiceReportReportUtils(expenseReport),
isInvoiceTransaction: isInvoiceReportReportUtils(transactionReport),
ownerLogin: undefined,
});
optimisticData.push(violationsOnyxData);
Expand Down
2 changes: 2 additions & 0 deletions src/pages/inbox/report/ReportActionCompose/useReceiptDrop.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ function useReceiptDrop({reportID, report, shouldAddOrReplaceReceipt, transactio
const [policyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`);
const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${getNonEmptyStringOnyxID(transactionID)}`);
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`);
const [transactionReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`);

const onFilesValidated = (files: FileObject[]) => {
if (files.length === 0) {
Expand All @@ -63,6 +64,7 @@ function useReceiptDrop({reportID, report, shouldAddOrReplaceReceipt, transactio
transactionPolicyCategories: policyCategories,
transactionPolicyTagList: policyTagList,
transactionViolations,
transactionReport,
});
return;
}
Expand Down
2 changes: 2 additions & 0 deletions src/pages/iou/request/step/IOURequestStepScan/components/ScanEditReceipt.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ function ScanEditReceipt({report, transactionID, backTo, isEditing}: ScanEditRec
const [policyTagList] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy?.id}`);
const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`);
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`);
const [transactionReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`);

const {setIsLoaderVisible} = useFullScreenLoaderActions();

Expand Down Expand Up @@ -73,6 +74,7 @@ function ScanEditReceipt({report, transactionID, backTo, isEditing}: ScanEditRec
transactionPolicyCategories: policyCategories,
transactionPolicyTagList: policyTagList,
transactionViolations,
transactionReport,
});
} else {
setMoneyRequestReceipt(transactionID, source, file.name ?? '', true, file.type);
Expand Down
7 changes: 4 additions & 3 deletions src/pages/media/AttachmentModalScreen/routes/TransactionReceiptModalContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre
* Detach the receipt and close the modal.
*/
const deleteReceiptAndClose = useCallback(() => {
detachReceipt(transaction, policy, policyTagList, transactionViolations, policyCategories);
detachReceipt(transaction, policy, policyTagList, transactionViolations, transactionReport, policyCategories);
navigation.goBack();
}, [transaction, policy, policyTagList, transactionViolations, policyCategories, navigation]);
}, [transaction, policy, policyTagList, transactionViolations, transactionReport, policyCategories, navigation]);

/**
* Remove odometer image and close the modal.
Expand Down Expand Up @@ -313,12 +313,13 @@ function TransactionReceiptModalContent({navigation, route}: AttachmentModalScre
transactionPolicy: policy,
transactionPolicyTagList: policyTagList,
transactionViolations,
transactionReport,
...(isSameReceipt ? {state: transaction?.receipt?.state, isSameReceipt: true} : {}),
});
}
});
},
[transaction, isDraftTransaction, isOdometerImage, isEditingConfirmation, imageType, fileType, policyCategories, policy, policyTagList, transactionViolations],
[transaction, isDraftTransaction, isOdometerImage, isEditingConfirmation, imageType, fileType, policyCategories, policy, policyTagList, transactionViolations, transactionReport],
);

const rotateReceipt = useCallback(() => {
Expand Down
Loading
Loading