@@ -366,26 +366,19 @@ function buildMergedTransactionData(targetTransaction: OnyxEntry<Transaction>, m
366366 * - Users cannot merge two split expenses
367367 * - Users can merge any other combinations
368368 *
369- * @param originalTargetTransaction - The transaction where the merge action is started from
370- * @param originalSourceTransaction - The selected transaction to be merged with the target transaction
371- * @param originalTransactionForSourceTransaction - The original transaction of the source transaction
369+ * @param targetTransaction - The transaction where the merge action is started from
370+ * @param sourceTransaction - The selected transaction to be merged with the target transaction
371+ * @param originalSourceTransaction - The original transaction of the source transaction
372372 * @returns An object containing the determined targetTransaction and sourceTransaction
373373 */
374- function selectTargetAndSourceTransactionsForMerge (
375- originalTargetTransaction : OnyxEntry < Transaction > ,
376- originalSourceTransaction : OnyxEntry < Transaction > ,
377- originalTransactionForSourceTransaction ?: OnyxEntry < Transaction > ,
378- ) {
374+ function selectTargetAndSourceTransactionsForMerge ( targetTransaction : OnyxEntry < Transaction > , sourceTransaction : OnyxEntry < Transaction > , originalSourceTransaction ?: OnyxEntry < Transaction > ) {
379375 // If target transaction is a card or split expense, always preserve the target transaction
380376 // Card takes precedence over split expense
381- if (
382- isManagedCardTransaction ( originalSourceTransaction ) ||
383- ( isExpenseSplit ( originalSourceTransaction , originalTransactionForSourceTransaction ) && ! isManagedCardTransaction ( originalTargetTransaction ) )
384- ) {
385- return { targetTransaction : originalSourceTransaction , sourceTransaction : originalTargetTransaction } ;
377+ if ( isManagedCardTransaction ( sourceTransaction ) || ( isExpenseSplit ( sourceTransaction , originalSourceTransaction ) && ! isManagedCardTransaction ( targetTransaction ) ) ) {
378+ return { targetTransaction : sourceTransaction , sourceTransaction : targetTransaction } ;
386379 }
387380
388- return { targetTransaction : originalTargetTransaction , sourceTransaction : originalSourceTransaction } ;
381+ return { targetTransaction, sourceTransaction} ;
389382}
390383
391384/**
0 commit comments