Refactor IOU/Hold actions

src/components/MoneyReportHeader.tsx

@@ -354,6 +354,8 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
 
     const iouTransactionID = isMoneyRequestAction(requestParentReportAction) ? getOriginalMessage(requestParentReportAction)?.IOUTransactionID : undefined;
     const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(iouTransactionID)}`);
+    const linkedTrackedExpenseTransactionID = getExistingTransactionID(transaction?.linkedTrackedExpenseReportAction);
+    const [linkedTrackedExpenseTransaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(linkedTrackedExpenseTransactionID)}`);
 
     const [dismissedRejectUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_REJECT_USE_EXPLANATION);
     const [dismissedHoldUseExplanation] = useOnyx(ONYXKEYS.NVP_DISMISSED_HOLD_USE_EXPLANATION);
@@ -955,7 +957,7 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
     );
 
     const duplicateExpenseTransaction = useCallback(
-        (transactionList: OnyxTypes.Transaction[]) => {
+        (transactionList: OnyxTypes.Transaction[], linkedTrackedExpenseTransactions: OnyxTypes.Transaction[]) => {
             if (!transactionList.length) {
                 return;
             }
@@ -967,6 +969,7 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
             for (const item of transactionList) {
                 const existingTransactionID = getExistingTransactionID(item.linkedTrackedExpenseReportAction);
                 const existingTransactionDraft = existingTransactionID ? transactionDrafts?.[existingTransactionID] : undefined;
+                const existingTransaction = existingTransactionID? linkedTrackedExpenseTransactions?.find(txn => txn?.transactionID === existingTransactionID) : undefined;
 
                 duplicateTransactionAction({
                     transaction: item,
@@ -983,6 +986,7 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
                     targetPolicyCategories: activePolicyCategories,
                     targetReport: activePolicyExpenseChat,
                     existingTransactionDraft,
+                    existingTransaction,
                     draftTransactionIDs,
                     betas,
                     personalDetails,
@@ -1903,7 +1907,7 @@ function MoneyReportHeader({reportID: reportIDProp, shouldDisplayBackButton = fa
 
                 temporarilyDisableDuplicateAction();
 
-                duplicateExpenseTransaction([transaction]);
+                duplicateExpenseTransaction([transaction], linkedTrackedExpenseTransaction ? [linkedTrackedExpenseTransaction]: []);
             },
             shouldCloseModalOnSelect: shouldDuplicateCloseModalOnSelect,
         },

src/components/MoneyRequestHeader.tsx

@@ -251,7 +251,7 @@
                 const existingTransactionID = getExistingTransactionID(item.linkedTrackedExpenseReportAction);
                 const existingTransactionDraft = existingTransactionID ? transactionDrafts?.[existingTransactionID] : undefined;
 
                 duplicateTransactionAction({
                     transaction: item,
                     optimisticChatReportID,
                     optimisticIOUReportID,
@@ -611,7 +611,7 @@
                         deleteTrackExpense({
                             chatReportID: report?.parentReportID,
                             chatReport: parentReport,
-                            transactionID: transaction.transactionID,
+                            transaction,
                             reportAction: parentReportAction,
                             iouReport,
                             chatIOUReport,

src/components/ReportActionItem/MoneyRequestReceiptView.tsx

@@ -409,11 +409,11 @@ function MoneyRequestReceiptView({
 
         const file = files.at(0);
 
-        if (!file || !linkedTransactionID) {
+        if (!file || !transaction) {
             return;
         }
         const source = URL.createObjectURL(file as Blob);
-        replaceReceipt({transactionID: linkedTransactionID, file: file as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories});
+        replaceReceipt({transaction, file: file as File, source, transactionPolicy: policy, transactionPolicyCategories: policyCategories});
     };
 
     // For empty receipt should be fullHeight

src/hooks/useSelectedTransactionsActions.ts

@@ -245,7 +245,10 @@ function useSelectedTransactionsActions({
                         if (!action?.childReportID) {
                             continue;
                         }
-                        unholdRequest(transactionID, action?.childReportID, policy);
+                        const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
+                        if(transaction){
+                            unholdRequest(transaction, action?.childReportID, policy);
+                        }
                     }
                     clearSelectedTransactions(true);
                 },

src/libs/API/parameters/MergeDuplicatesParams.ts

@@ -1,6 +1,9 @@
+import type { Transaction } from "@src/types/onyx";
+import type { OnyxEntry } from "react-native-onyx";
+
 type MergeDuplicatesParams = {
-    transactionID: string | undefined;
-    transactionIDList: string[];
+    transaction: OnyxEntry<Transaction>;
+    transactionList: Transaction[];
     created: string;
     merchant: string;
     amount: number;

src/libs/ReportUtils.ts

@@ -1056,7 +1056,7 @@
 };
 
 let conciergeReportIDOnyxConnect: OnyxEntry<string>;
 Onyx.connect({
     key: ONYXKEYS.CONCIERGE_REPORT_ID,
     callback: (value) => {
         conciergeReportIDOnyxConnect = value;
@@ -1064,7 +1064,7 @@
 });
 
 const defaultAvatarBuildingIconTestID = 'SvgDefaultAvatarBuilding Icon';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
         // When signed out, val is undefined
@@ -1082,7 +1082,7 @@
 let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
 let allPersonalDetailLogins: string[];
 let currentUserPersonalDetails: OnyxEntry<PersonalDetails>;
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     callback: (value) => {
         if (deprecatedCurrentUserAccountID) {
@@ -1094,7 +1094,7 @@
 });
 
 let allReportsDraft: OnyxCollection<Report>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_DRAFT,
     waitForCollectionCallback: true,
     callback: (value) => (allReportsDraft = value),
@@ -1102,7 +1102,7 @@
 
 let allPolicies: OnyxCollection<Policy>;
 let policiesArray: Policy[] = [];
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY,
     waitForCollectionCallback: true,
     callback: (value) => {
@@ -1112,7 +1112,7 @@
 });
 
 let allPolicyDrafts: OnyxCollection<Policy>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY_DRAFTS,
     waitForCollectionCallback: true,
     callback: (value) => (allPolicyDrafts = value),
@@ -1120,7 +1120,7 @@
 
 let allReports: OnyxCollection<Report>;
 let reportsByPolicyID: ReportByPolicyMap;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT,
     waitForCollectionCallback: true,
     callback: (value) => {
@@ -1156,14 +1156,14 @@
 });
 
 let betaConfiguration: OnyxEntry<BetaConfiguration> = {};
 Onyx.connect({
     key: ONYXKEYS.BETA_CONFIGURATION,
     callback: (value) => (betaConfiguration = value ?? {}),
 });
 
 let deprecatedAllTransactions: OnyxCollection<Transaction> = {};
 let deprecatedReportsTransactions: Record<string, Transaction[]> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.TRANSACTION,
     waitForCollectionCallback: true,
     callback: (value) => {
@@ -1189,7 +1189,7 @@
 });
 
 let allReportActions: OnyxCollection<ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     waitForCollectionCallback: true,
     callback: (actions) => {
@@ -5131,12 +5131,13 @@
 
     const isOnHold = isOnHoldTransactionUtils(iouTransaction);
     const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${moneyRequestReport.policyID}`];
-
+    // @todo: We should not rely on deprecatedAllTransactions to get the transaction details, but we need to do it for now to avoid refactoring the entire action file. We will remove this once we refactor the action file and get rid of Onyx in it.
+    const transaction = deprecatedAllTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`];
     if (isOnHold) {
-        if (reportAction.childReportID) {
-            unholdRequest(transactionID, reportAction.childReportID, policy);
+        if (reportAction.childReportID && transaction) {
+            unholdRequest(transaction, reportAction.childReportID, policy);
         } else {
-            Log.warn('Missing reportAction.childReportID during money request unhold');
+            Log.warn('Missing reportAction.childReportID or transaction during money request unhold');
         }
     } else {
         const activeRoute = encodeURIComponent(Navigation.getActiveRoute());

src/libs/TransactionUtils/index.ts

@@ -2577,15 +2577,16 @@ function buildMergeDuplicatesParams(
     reviewDuplicates: OnyxEntry<ReviewDuplicates>,
     duplicatedTransactions: Array<OnyxEntry<Transaction>>,
     originalTransaction: Partial<Transaction>,
+    duplicatedTransaction: OnyxEntry<Transaction>,
 ): MergeDuplicatesParams {
     return {
         amount: -getAmount(originalTransaction as OnyxEntry<Transaction>, true),
         reportID: originalTransaction?.reportID,
         receiptID: originalTransaction?.receipt?.receiptID ?? CONST.DEFAULT_NUMBER_ID,
         currency: getCurrency(originalTransaction as OnyxEntry<Transaction>),
         created: getFormattedCreated(originalTransaction as OnyxEntry<Transaction>),
-        transactionID: reviewDuplicates?.transactionID,
-        transactionIDList: removeSettledAndApprovedTransactions(duplicatedTransactions ?? []).map((transaction) => transaction.transactionID),
+        transaction: duplicatedTransaction,
+        transactionList: removeSettledAndApprovedTransactions(duplicatedTransactions ?? []),
         billable: reviewDuplicates?.billable ?? false,
         reimbursable: reviewDuplicates?.reimbursable ?? false,
         category: reviewDuplicates?.category ?? '',