Skip to content

Revert "fix: show Mark As Resolved as primary action" #74305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
luacmartins merged 1 commit into from
Nov 5, 2025
Merged

Revert "fix: show Mark As Resolved as primary action" #74305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/CONST/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1139,7 +1139,6 @@ const CONST = {
REMOVE_HOLD: 'removeHold',
REVIEW_DUPLICATES: 'reviewDuplicates',
MARK_AS_CASH: 'markAsCash',
MARK_AS_RESOLVED: 'markAsResolved',
},
TRANSACTION_PRIMARY_ACTIONS: {
REMOVE_HOLD: 'removeHold',
Expand Down
16 changes: 0 additions & 16 deletions src/libs/ReportPrimaryActionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ import {
import {getSession} from './SessionUtils';
import {
allHavePendingRTERViolation,
getTransactionViolations,
hasPendingRTERViolation as hasPendingRTERViolationTransactionUtils,
isDuplicate,
isOnHold as isOnHoldTransactionUtils,
Expand Down Expand Up @@ -314,16 +313,6 @@ function isMarkAsResolvedAction(report?: Report, violations?: TransactionViolati
return violations?.some((violation) => violation.name === CONST.VIOLATIONS.AUTO_REPORTED_REJECTED_EXPENSE);
}

function isPrimaryMarkAsResolvedAction(report?: Report, reportTransactions?: Transaction[], violations?: OnyxCollection<TransactionViolation[]>, policy?: Policy) {
if (!reportTransactions || reportTransactions.length !== 1) {
return false;
}

const transactionViolations = getTransactionViolations(reportTransactions.at(0), violations);

return isExpenseReportUtils(report) && isMarkAsResolvedAction(report, transactionViolations, policy);
}

function getAllExpensesToHoldIfApplicable(report?: Report, reportActions?: ReportAction[]) {
if (!report || !reportActions || !hasOnlyHeldExpenses(report?.reportID)) {
return [];
Expand Down Expand Up @@ -379,10 +368,6 @@ function getReportPrimaryAction(params: GetReportPrimaryActionParams): ValueOf<t
return CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD;
}

if (isPrimaryMarkAsResolvedAction(report, reportTransactions, violations, policy)) {
return CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_RESOLVED;
}

if (isSubmitAction(report, reportTransactions, policy, reportNameValuePairs, reportActions)) {
return CONST.REPORT.PRIMARY_ACTIONS.SUBMIT;
}
Expand Down Expand Up @@ -459,5 +444,4 @@ export {
isMarkAsResolvedAction,
getAllExpensesToHoldIfApplicable,
isReviewDuplicatesAction,
isPrimaryMarkAsResolvedAction,
};
4 changes: 0 additions & 4 deletions src/libs/ReportSecondaryActionUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,6 @@ function isSubmitAction(
return false;
}

if (primaryAction === CONST.REPORT.PRIMARY_ACTIONS.MARK_AS_RESOLVED) {
return false;
}

if (reportTransactions.length > 0 && reportTransactions.every((transaction) => isPending(transaction))) {
return false;
}
Expand Down
137 changes: 1 addition & 136 deletions tests/unit/ReportPrimaryActionUtilsTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import {renderHook} from '@testing-library/react-native';
import Onyx from 'react-native-onyx';
import type {OnyxCollection} from 'react-native-onyx';
import useReportIsArchived from '@hooks/useReportIsArchived';
import {getValidConnectedIntegration} from '@libs/PolicyUtils';
// eslint-disable-next-line no-restricted-syntax
import type * as PolicyUtils from '@libs/PolicyUtils';
import {getReportPrimaryAction, getTransactionThreadPrimaryAction, isMarkAsResolvedAction, isPrimaryMarkAsResolvedAction, isReviewDuplicatesAction} from '@libs/ReportPrimaryActionUtils';
import {getReportPrimaryAction, getTransactionThreadPrimaryAction, isMarkAsResolvedAction, isReviewDuplicatesAction} from '@libs/ReportPrimaryActionUtils';
import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type {Policy, Report, ReportAction, Transaction, TransactionViolation} from '@src/types/onyx';
Expand Down Expand Up @@ -1154,138 +1153,4 @@ describe('getTransactionThreadPrimaryAction', () => {
expect(result2).toBe(false);
});
});

describe('isPrimaryMarkAsResolvedAction', () => {
const submitterAccountID = 1;
const otherUserAccountID = 3;
const submitterEmail = 'submitter@example.com';
beforeEach(async () => {
jest.clearAllMocks();
Onyx.clear();
await Onyx.merge(ONYXKEYS.SESSION, {accountID: submitterAccountID, email: submitterEmail});
});

it('should return true if isMarkAsResolvedAction returns true and there is exactly one transaction', () => {
const policy = {
role: CONST.POLICY.ROLE.ADMIN,
} as Policy;

const report = {
reportID: REPORT_ID,
ownerAccountID: submitterAccountID,
type: CONST.REPORT.TYPE.EXPENSE,
} as unknown as Report;

const violations: OnyxCollection<TransactionViolation[]> = {
[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}1`]: [
{
name: CONST.VIOLATIONS.AUTO_REPORTED_REJECTED_EXPENSE,
type: CONST.VIOLATION_TYPES.WARNING,
},
],
};

const reportTransactions = [
{
transactionID: '1',
} as unknown as Transaction,
];

const result = isPrimaryMarkAsResolvedAction(report, reportTransactions, violations, policy);
expect(result).toBe(true);
});

it('should return false if there are multiple transactions', () => {
const policy = {
role: CONST.POLICY.ROLE.ADMIN,
} as Policy;

const report = {
reportID: REPORT_ID,
ownerAccountID: submitterAccountID,
type: CONST.REPORT.TYPE.EXPENSE,
} as unknown as Report;

const violations: OnyxCollection<TransactionViolation[]> = {
[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}1`]: [
{
name: CONST.VIOLATIONS.AUTO_REPORTED_REJECTED_EXPENSE,
type: CONST.VIOLATION_TYPES.WARNING,
},
],
};

const reportTransactions = [
{
transactionID: '1',
} as unknown as Transaction,
{
transactionID: '2',
} as unknown as Transaction,
];

const result = isPrimaryMarkAsResolvedAction(report, reportTransactions, violations, policy);
expect(result).toBe(false);
});

it('should return false if isMarkAsResolvedAction returns false', () => {
const policy = {
role: CONST.POLICY.ROLE.USER,
} as Policy;

const report = {
reportID: REPORT_ID,
ownerAccountID: otherUserAccountID,
type: CONST.REPORT.TYPE.EXPENSE,
} as unknown as Report;

const violations: OnyxCollection<TransactionViolation[]> = {
[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}1`]: [
{
name: CONST.VIOLATIONS.MISSING_CATEGORY,
type: CONST.VIOLATION_TYPES.VIOLATION,
},
],
};

const reportTransactions = [
{
transactionID: '1',
} as unknown as Transaction,
];

const result = isPrimaryMarkAsResolvedAction(report, reportTransactions, violations, policy);
expect(result).toBe(false);
});

it('should return false if report is not an expense report', () => {
const policy = {
role: CONST.POLICY.ROLE.ADMIN,
} as Policy;

const report = {
reportID: REPORT_ID,
ownerAccountID: submitterAccountID,
type: CONST.REPORT.TYPE.INVOICE,
} as unknown as Report;

const violations: OnyxCollection<TransactionViolation[]> = {
[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}1`]: [
{
name: CONST.VIOLATIONS.AUTO_REPORTED_REJECTED_EXPENSE,
type: CONST.VIOLATION_TYPES.WARNING,
},
],
};

const reportTransactions = [
{
transactionID: '1',
} as unknown as Transaction,
];

const result = isPrimaryMarkAsResolvedAction(report, reportTransactions, violations, policy);
expect(result).toBe(false);
});
});
});
Loading