Merge pull request #54056 from Expensify/cmartins-fixSearchSubmit

[CP Staging] Fix submit action
Expensify · Dec 12, 2024 · 69aaec3 · 69aaec3
2 parents a4b4933 + 349eda0
commit 69aaec3
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/libs/SearchUIUtils.ts b/src/libs/SearchUIUtils.ts
@@ -301,11 +301,13 @@ function getAction(data: OnyxTypes.SearchResults['data'], key: string): SearchTr
         return CONST.SEARCH.ACTION_TYPES.PAY;
     }
 
-    if (IOU.canApproveIOU(report, policy) && ReportUtils.isAllowedToApproveExpenseReport(report, undefined, policy)) {
+    const isAllowedToApproveExpenseReport = ReportUtils.isAllowedToApproveExpenseReport(report, undefined, policy);
+    if (IOU.canApproveIOU(report, policy) && isAllowedToApproveExpenseReport) {
         return CONST.SEARCH.ACTION_TYPES.APPROVE;
     }
 
-    if (IOU.canSubmitReport(report, policy)) {
+    // We check for isAllowedToApproveExpenseReport because if the policy has preventSelfApprovals enabled, we disable the Submit action and in that case we want to show the View action instead
+    if (IOU.canSubmitReport(report, policy) && isAllowedToApproveExpenseReport) {
         return CONST.SEARCH.ACTION_TYPES.SUBMIT;
     }