Skip to content

Commit e10e658

Browse files
authored
Merge pull request Expensify#61892 from nkdengineer/fix/61168-f
fix: submit button is missing for non-admin approver
2 parents 4e57a59 + ef7967f commit e10e658

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

src/libs/ReportPreviewActionUtils.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ function canSubmit(report: Report, violations: OnyxCollection<TransactionViolati
4444
const isExpense = isExpenseReport(report);
4545
const isSubmitter = isCurrentUserSubmitter(report.reportID);
4646
const isOpen = isOpenReport(report);
47+
const isManager = report.managerID === getCurrentUserAccountID();
48+
const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
4749
const isManualSubmitEnabled = getCorrectedAutoReportingFrequency(policy) === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL;
4850
const hasAnyViolations =
4951
hasMissingSmartscanFields(report.reportID, transactions) ||
@@ -58,7 +60,7 @@ function canSubmit(report: Report, violations: OnyxCollection<TransactionViolati
5860
return false;
5961
}
6062

61-
return isExpense && isSubmitter && isOpen && isManualSubmitEnabled && !hasAnyViolations && !isAnyReceiptBeingScanned;
63+
return isExpense && (isSubmitter || isManager || isAdmin) && isOpen && isManualSubmitEnabled && !hasAnyViolations && !isAnyReceiptBeingScanned;
6264
}
6365

6466
function canApprove(report: Report, violations: OnyxCollection<TransactionViolation[]>, policy?: Policy, transactions?: Transaction[]) {

src/libs/ReportSecondaryActionUtils.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ function isSubmitAction(report: Report, reportTransactions: Transaction[], polic
7979
}
8080

8181
const isAdmin = policy?.role === CONST.POLICY.ROLE.ADMIN;
82-
if (isAdmin) {
82+
const isManager = report.managerID === getCurrentUserAccountID();
83+
if (isAdmin || isManager) {
8384
return true;
8485
}
8586

0 commit comments

Comments
 (0)