Skip to content

[Part 2]: Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.REPORT in src/libs/TransactionUtils #77109

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
mountiny merged 8 commits into from
Dec 29, 2025
Merged

[Part 2]: Remove Onyx.connect() for the key: ONYXKEYS.COLLECTION.REPORT in src/libs/TransactionUtils #77109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e7524c1
remove onyx connect
DylanDylann Dec 9, 2025
0b4c16c
add empty line
DylanDylann Dec 9, 2025
832888a
Merge branch 'main' into refactor-650
DylanDylann Dec 9, 2025
6e697ca
minor fix
DylanDylann Dec 9, 2025
7f1f54f
remove condition
DylanDylann Dec 17, 2025
e76a7f1
Merge branch 'main' into refactor-650
DylanDylann Dec 18, 2025
ddedcad
remove duplicated
DylanDylann Dec 20, 2025
36b950c
Merge branch 'main' into refactor-650
DylanDylann Dec 20, 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
2 changes: 1 addition & 1 deletion src/libs/DebugUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1465,7 +1465,7 @@ function getReasonAndReportActionForRBRInLHNRow(
}

function getTransactionID(report: OnyxEntry<Report>, reportActions: OnyxEntry<ReportActions>) {
const transactionID = TransactionUtilsGetTransactionID(report?.reportID);
const transactionID = TransactionUtilsGetTransactionID(report);

return Number(transactionID) > 0
? transactionID
Expand Down
12 changes: 7 additions & 5 deletions src/libs/SidebarUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import {
getIntegrationSyncFailedMessage,
getLastVisibleMessage,
getMessageOfOldDotReportAction,
getOneTransactionThreadReportID,
getOneTransactionThreadReportAction,
getOriginalMessage,
getPolicyChangeLogAddEmployeeMessage,
getPolicyChangeLogDefaultBillableMessage,
Expand Down Expand Up @@ -83,6 +83,7 @@ import {
isActionOfType,
isCardIssuedAction,
isInviteOrRemovedAction,
isMoneyRequestAction,
isOldDotReportAction,
isRenamedAction,
isTagModificationAction,
Expand Down Expand Up @@ -588,17 +589,18 @@ function getReasonAndReportActionThatHasRedBrickRoad(
};
}
const parentReportAction = getReportAction(report?.parentReportID, report?.parentReportActionID);
const transactionThreadReportID = getOneTransactionThreadReportID(report, chatReport, reportActions ?? []);
if (transactionThreadReportID) {
const transactionID = getTransactionID(transactionThreadReportID);
const transactionThreadReportAction = getOneTransactionThreadReportAction(report, chatReport, reportActions ?? []);

if (transactionThreadReportAction) {
const transactionID = isMoneyRequestAction(transactionThreadReportAction) ? getOriginalMessage(transactionThreadReportAction)?.IOUTransactionID : undefined;
const transaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
if (hasReceiptError(transaction)) {
return {
reason: CONST.RBR_REASONS.HAS_ERRORS,
};
}
}
const transactionID = getTransactionID(report.reportID);
const transactionID = getTransactionID(report);
const transaction = transactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
if (isTransactionThread(parentReportAction) && hasReceiptError(transaction)) {
return {
Expand Down
5 changes: 2 additions & 3 deletions src/libs/TransactionUtils/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
};

let deprecatedAllReports: OnyxCollection<Report> = {};
Onyx.connect({

Check warning on line 128 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.REPORT,
waitForCollectionCallback: true,
callback: (value) => {
Expand All @@ -134,7 +134,7 @@
});

let deprecatedAllTransactionViolations: OnyxCollection<TransactionViolations> = {};
Onyx.connect({

Check warning on line 137 in src/libs/TransactionUtils/index.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check 

Onyx.connect() is deprecated. Use useOnyx() hook instead and pass the data as parameters to a pure function
key: ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS,
waitForCollectionCallback: true,
callback: (value) => (deprecatedAllTransactionViolations = value),
Expand Down Expand Up @@ -2147,11 +2147,10 @@
return {keep, change};
}

function getTransactionID(threadReportID?: string): string | undefined {
if (!threadReportID) {
function getTransactionID(report?: OnyxEntry<Report>): string | undefined {
if (!report) {
return;
}
const report = deprecatedAllReports?.[`${ONYXKEYS.COLLECTION.REPORT}${threadReportID}`];
const parentReportAction = isThread(report) ? getReportAction(report.parentReportID, report.parentReportActionID) : undefined;
const IOUTransactionID = isMoneyRequestAction(parentReportAction) ? getOriginalMessage(parentReportAction)?.IOUTransactionID : undefined;

Expand Down
8 changes: 3 additions & 5 deletions src/pages/TransactionDuplicate/Confirmation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import * as ReportActionsUtils from '@src/libs/ReportActionsUtils';
import * as ReportUtils from '@src/libs/ReportUtils';
import {generateReportID} from '@src/libs/ReportUtils';
import * as TransactionUtils from '@src/libs/TransactionUtils';
import {getTransactionID} from '@src/libs/TransactionUtils';
import ONYXKEYS from '@src/ONYXKEYS';
import type SCREENS from '@src/SCREENS';
import type {Transaction} from '@src/types/onyx';
Expand All @@ -44,7 +43,8 @@ function Confirmation() {
const [reviewDuplicates, reviewDuplicatesResult] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES, {canBeMissing: true});
const [duplicatedTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(reviewDuplicates?.transactionID)}`, {canBeMissing: true});
const newTransaction = useMemo(() => TransactionUtils.buildNewTransactionAfterReviewingDuplicates(reviewDuplicates, duplicatedTransaction), [duplicatedTransaction, reviewDuplicates]);
const transactionID = TransactionUtils.getTransactionID(route.params.threadReportID);
const [report, reportResult] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`, {canBeMissing: true});
const transactionID = TransactionUtils.getTransactionID(report);
const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT, {canBeMissing: false});
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});
const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${getNonEmptyStringOnyxID(transactionID)}`, {
Expand All @@ -59,7 +59,6 @@ function Confirmation() {
const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${getNonEmptyStringOnyxID(reviewDuplicatesReport?.policyID)}`, {canBeMissing: true});
const compareResult = TransactionUtils.compareDuplicateTransactionFields(transaction, allDuplicates, reviewDuplicatesReport, undefined, policyCategories);
const {goBack} = useReviewDuplicatesNavigation(Object.keys(compareResult.change ?? {}), 'confirmation', route.params.threadReportID, route.params.backTo);
const [report, reportResult] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`, {canBeMissing: true});
const [iouReport] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${newTransaction?.reportID}`, {canBeMissing: true});
const [reportActions] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${newTransaction?.reportID}`, {canBeMissing: true});
const reportAction = Object.values(reportActions ?? {}).find(
Expand Down Expand Up @@ -102,8 +101,7 @@ function Confirmation() {
[report, reportAction],
);

const reportTransactionID = report?.reportID ? getTransactionID(report.reportID) : undefined;
const doesTransactionBelongToReport = reviewDuplicates?.transactionID === reportTransactionID || (reportTransactionID && reviewDuplicates?.duplicates.includes(reportTransactionID));
const doesTransactionBelongToReport = reviewDuplicates?.transactionID === transactionID || (transactionID && reviewDuplicates?.duplicates.includes(transactionID));

// eslint-disable-next-line rulesdir/no-negated-variables
const shouldShowNotFoundPage =
Expand Down
3 changes: 2 additions & 1 deletion src/pages/TransactionDuplicate/ReviewBillable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import ReviewFields from './ReviewFields';
function ReviewBillable() {
const route = useRoute<PlatformStackRouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.TAG>>();
const {translate} = useLocalize();
const transactionID = getTransactionID(route.params.threadReportID);
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`, {canBeMissing: true});
const transactionID = getTransactionID(report);
const [reviewDuplicates] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES, {canBeMissing: true});
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});
const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, {
Expand Down
3 changes: 2 additions & 1 deletion src/pages/TransactionDuplicate/ReviewCategory.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ import ReviewFields from './ReviewFields';
function ReviewCategory() {
const route = useRoute<PlatformStackRouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.CATEGORY>>();
const {translate} = useLocalize();
const transactionID = getTransactionID(route.params.threadReportID);
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`, {canBeMissing: true});
const transactionID = getTransactionID(report);
const [reviewDuplicates] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES, {canBeMissing: true});
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});
const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, {
Expand Down
3 changes: 2 additions & 1 deletion src/pages/TransactionDuplicate/ReviewDescription.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ import ReviewFields from './ReviewFields';
function ReviewDescription() {
const route = useRoute<PlatformStackRouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.DESCRIPTION>>();
const {translate} = useLocalize();
const transactionID = getTransactionID(route.params.threadReportID);
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`, {canBeMissing: true});
const transactionID = getTransactionID(report);
const [reviewDuplicates] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES, {canBeMissing: false});
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});
const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, {
Expand Down
3 changes: 2 additions & 1 deletion src/pages/TransactionDuplicate/ReviewMerchant.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import ReviewFields from './ReviewFields';
function ReviewMerchant() {
const route = useRoute<PlatformStackRouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.TAG>>();
const {translate} = useLocalize();
const transactionID = getTransactionID(route.params.threadReportID);
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`, {canBeMissing: true});
const transactionID = getTransactionID(report);
const [reviewDuplicates] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES, {canBeMissing: true});
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});
const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, {
Expand Down
3 changes: 2 additions & 1 deletion src/pages/TransactionDuplicate/ReviewReimbursable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ import ReviewFields from './ReviewFields';
function ReviewReimbursable() {
const route = useRoute<PlatformStackRouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.TAG>>();
const {translate} = useLocalize();
const transactionID = getTransactionID(route.params.threadReportID);
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`, {canBeMissing: true});
const transactionID = getTransactionID(report);
const [reviewDuplicates] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES, {canBeMissing: true});
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});
const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, {
Expand Down
4 changes: 2 additions & 2 deletions src/pages/TransactionDuplicate/ReviewTag.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import ReviewFields from './ReviewFields';
function ReviewTag() {
const route = useRoute<PlatformStackRouteProp<TransactionDuplicateNavigatorParamList, typeof SCREENS.TRANSACTION_DUPLICATE.TAG>>();
const {translate} = useLocalize();
const transactionID = getTransactionID(route.params.threadReportID);

const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.threadReportID}`, {canBeMissing: true});
const transactionID = getTransactionID(report);
const [reviewDuplicates] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES, {canBeMissing: true});
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});
const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/TransactionDuplicate/ReviewTaxCode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ function ReviewTaxRate() {
const [reviewDuplicates] = useOnyx(ONYXKEYS.REVIEW_DUPLICATES, {canBeMissing: true});
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reviewDuplicates?.reportID ?? route.params.threadReportID}`, {canBeMissing: true});
const policy = usePolicy(report?.policyID);
const transactionID = getTransactionID(route.params.threadReportID);
const transactionID = getTransactionID(report);

@dmkt9 dmkt9 May 7, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change caused issue #85218. The transactionID can be undefined because the report may not be a transaction thread report for the duplicated transaction.

const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});
const [transactionViolations] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, {
canBeMissing: false,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/report/ReportActionCompose/ReportActionCompose.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ function ReportActionCompose({
const iouAction = reportActions ? Object.values(reportActions).find((action) => isMoneyRequestAction(action)) : null;
const linkedTransactionID = iouAction && !isExpensesReport ? getLinkedTransactionID(iouAction) : undefined;

const transactionID = useMemo(() => getTransactionID(reportID) ?? linkedTransactionID, [reportID, linkedTransactionID]);
const transactionID = useMemo(() => getTransactionID(report) ?? linkedTransactionID, [report, linkedTransactionID]);
Comment thread
DylanDylann marked this conversation as resolved.

const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});

Expand Down
Loading