Skip to content

Commit c7e4101

Browse files
authored
Merge pull request Expensify#80000 from software-mansion-labs/disallow-tax-cash-expense-merging
Disallow merging time expenses with cash expenses
2 parents e523f32 + a9646f3 commit c7e4101

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

src/libs/MergeTransactionUtils.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import {
2929
isMerchantMissing,
3030
isPerDiemRequest,
3131
isScanning,
32+
isTimeRequest,
3233
isTransactionPendingDelete,
3334
} from './TransactionUtils';
3435

@@ -411,6 +412,10 @@ function areTransactionsEligibleForMerge(transaction1: OnyxEntry<Transaction>, t
411412
return false;
412413
}
413414

415+
if (isTimeRequest(transaction1) !== isTimeRequest(transaction2)) {
416+
return false;
417+
}
418+
414419
return true;
415420
}
416421

0 commit comments

Comments
 (0)