Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions src/libs/TransactionUtils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@
});

let allPolicyTags: OnyxCollection<PolicyTagLists> = {};
Onyx.connect({

Check warning on line 143 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.POLICY_TAGS,
waitForCollectionCallback: true,
callback: (value) => {
Expand Down Expand Up @@ -2588,11 +2588,6 @@
}

function isExpenseSplit(transaction: OnyxEntry<Transaction>, originalTransaction?: OnyxEntry<Transaction>): boolean {
const isAddedToReport = !!transaction?.reportID && transaction.reportID !== CONST.REPORT.SPLIT_REPORT_ID && transaction.reportID !== CONST.REPORT.UNREPORTED_REPORT_ID;
if (isAddedToReport) {
return false;
}

if (!originalTransaction) {
return !!transaction?.comment?.originalTransactionID && transaction?.comment?.source === 'split';
}
Comment on lines 2590 to 2593

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

P1 Badge Treat submitted split expenses as normal by checking reportID

With the reportID guard removed, isExpenseSplit now returns true solely based on comment.originalTransactionID/source, even after a split expense has been submitted into a real report (i.e., reportID is neither SPLIT_REPORT_ID nor UNREPORTED_REPORT_ID). In that state the split comment still exists, so this function stays true and downstream UI (e.g., amount description in MoneyRequestView and split edit actions) continues to show the “Split” label for a submitted expense. This reintroduces the regression the reverted PR was fixing: unreported split expenses that are submitted remain labeled as split when they shouldn’t be.

Useful? React with 👍 / 👎.

Expand Down
2 changes: 0 additions & 2 deletions tests/actions/MergeTransactionTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -736,7 +736,6 @@ describe('areTransactionsEligibleForMerge', () => {
it('can not merge 2 split expenses', () => {
const splitExpenseTransaction1 = {
...createRandomTransaction(1),
reportID: CONST.REPORT.SPLIT_REPORT_ID,
managedCard: false,
cardName: CONST.EXPENSE.TYPE.CASH_CARD_NAME,
comment: {
Expand All @@ -747,7 +746,6 @@ describe('areTransactionsEligibleForMerge', () => {
} as Transaction;
const splitExpenseTransaction2 = {
...createRandomTransaction(2),
reportID: CONST.REPORT.SPLIT_REPORT_ID,
managedCard: false,
cardName: CONST.EXPENSE.TYPE.CASH_CARD_NAME,
comment: {
Expand Down
1 change: 0 additions & 1 deletion tests/unit/MergeTransactionUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,6 @@ describe('MergeTransactionUtils', () => {
it('should keep split expense when merging split and cash expenses', () => {
const targetTransaction = {
...createRandomTransaction(1),
reportID: CONST.REPORT.SPLIT_REPORT_ID,
amount: 1000,
currency: CONST.CURRENCY.USD,
comment: {
Expand Down
67 changes: 0 additions & 67 deletions tests/unit/TransactionUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1713,71 +1713,4 @@ describe('TransactionUtils', () => {
expect(TransactionUtils.getConvertedAmount(transaction, true, false, false, true)).toBe(-100);
});
});

describe('isExpenseSplit', () => {
it('should return false when transaction is assigned to a real report', () => {
const transaction = generateTransaction({
reportID: '12345',
comment: {
source: CONST.IOU.TYPE.SPLIT,
originalTransactionID: 'original123',
},
});
expect(TransactionUtils.isExpenseSplit(transaction)).toBe(false);
});

it('should return true when transaction is in split report and has split comment', () => {
const transaction = generateTransaction({
reportID: CONST.REPORT.SPLIT_REPORT_ID,
comment: {
source: CONST.IOU.TYPE.SPLIT,
originalTransactionID: 'original123',
},
});
expect(TransactionUtils.isExpenseSplit(transaction)).toBe(true);
});

it('should return true when transaction is unreported and has split comment', () => {
const transaction = generateTransaction({
reportID: CONST.REPORT.UNREPORTED_REPORT_ID,
comment: {
source: CONST.IOU.TYPE.SPLIT,
originalTransactionID: 'original123',
},
});
expect(TransactionUtils.isExpenseSplit(transaction)).toBe(true);
});

it('should return true when transaction has no reportID and has split comment', () => {
const transaction = generateTransaction({
reportID: undefined,
comment: {
source: CONST.IOU.TYPE.SPLIT,
originalTransactionID: 'original123',
},
});
expect(TransactionUtils.isExpenseSplit(transaction)).toBe(true);
});

it('should return false when transaction comment source is not split', () => {
const transaction = generateTransaction({
reportID: CONST.REPORT.SPLIT_REPORT_ID,
comment: {
source: CONST.IOU.TYPE.REQUEST,
originalTransactionID: 'original123',
},
});
expect(TransactionUtils.isExpenseSplit(transaction)).toBe(false);
});

it('should return false when transaction comment is missing originalTransactionID', () => {
const transaction = generateTransaction({
reportID: CONST.REPORT.SPLIT_REPORT_ID,
comment: {
source: CONST.IOU.TYPE.SPLIT,
},
});
expect(TransactionUtils.isExpenseSplit(transaction)).toBe(false);
});
});
});
Loading