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
3 changes: 2 additions & 1 deletion src/libs/ReportSecondaryActionUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,8 @@
options.push(CONST.REPORT.SECONDARY_ACTIONS.MERGE);
}

if (isDuplicateAction(report, reportTransactions)) {
// Disabled for now to fix deploy blockers. Will be re-enabled in https://github.com/Expensify/App/pull/77343
if (isDuplicateAction(report, reportTransactions) && false) {

Check warning on line 755 in src/libs/ReportSecondaryActionUtils.ts

View workflow job for this annotation

GitHub Actions / Changed files ESLint check

Unexpected constant condition
options.push(CONST.REPORT.SECONDARY_ACTIONS.DUPLICATE);
}

Expand Down
87 changes: 44 additions & 43 deletions tests/unit/ReportSecondaryActionUtilsTest.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1654,49 +1654,50 @@ describe('getSecondaryAction', () => {
expect(result).not.toContain(CONST.REPORT.SECONDARY_ACTIONS.REMOVE_HOLD);
});

it('include DUPLICATE option for single-transaction expense report', () => {
const report = {
reportID: REPORT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
ownerAccountID: EMPLOYEE_ACCOUNT_ID,
statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
} as unknown as Report;

const TRANSACTION_ID = 'TRANSACTION_ID';

const transaction1 = {
transactionID: TRANSACTION_ID,
reportID: REPORT_ID,
} as unknown as Transaction;

const reportActions = [
{
reportActionID: '1',
actorAccountID: EMPLOYEE_ACCOUNT_ID,
actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
originalMessage: {
IOUTransactionID: TRANSACTION_ID,
IOUReportID: REPORT_ID,
},
},
] as unknown as ReportAction[];

const policy = {} as unknown as Policy;

const result = getSecondaryReportActions({
currentUserEmail: EMPLOYEE_EMAIL,
currentUserAccountID: EMPLOYEE_ACCOUNT_ID,
report,
chatReport,
reportTransactions: [transaction1],
originalTransaction: {} as Transaction,
violations: {},
policy,
reportActions,
});
expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DUPLICATE)).toBe(true);
});
// Will be re-enabled in https://github.com/Expensify/App/pull/77343
// it('include DUPLICATE option for single-transaction expense report', () => {
// const report = {
// reportID: REPORT_ID,
// type: CONST.REPORT.TYPE.EXPENSE,
// ownerAccountID: EMPLOYEE_ACCOUNT_ID,
// statusNum: CONST.REPORT.STATUS_NUM.SUBMITTED,
// stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
// } as unknown as Report;

// const TRANSACTION_ID = 'TRANSACTION_ID';

// const transaction1 = {
// transactionID: TRANSACTION_ID,
// reportID: REPORT_ID,
// } as unknown as Transaction;

// const reportActions = [
// {
// reportActionID: '1',
// actorAccountID: EMPLOYEE_ACCOUNT_ID,
// actionName: CONST.REPORT.ACTIONS.TYPE.IOU,
// originalMessage: {
// IOUTransactionID: TRANSACTION_ID,
// IOUReportID: REPORT_ID,
// },
// },
// ] as unknown as ReportAction[];

// const policy = {} as unknown as Policy;

// const result = getSecondaryReportActions({
// currentUserEmail: EMPLOYEE_EMAIL,
// currentUserAccountID: EMPLOYEE_ACCOUNT_ID,
// report,
// chatReport,
// reportTransactions: [transaction1],
// originalTransaction: {} as Transaction,
// violations: {},
// policy,
// reportActions,
// });
// expect(result.includes(CONST.REPORT.SECONDARY_ACTIONS.DUPLICATE)).toBe(true);
// });

it('does not include DUPLICATE option if there are no transactions', async () => {
const report = {
Expand Down
Loading