Merge pull request Expensify#64209 from eh2077/63114

fix: submitted expense shows Review button in Reports

Author: mollfpr

src/components/ReportActionItem/MoneyRequestReportPreview/MoneyRequestReportPreviewContent.tsx

@@ -35,7 +35,7 @@ import {getTotalAmountForIOUReportPreviewButton} from '@libs/MoneyRequestReportU
 import Navigation from '@libs/Navigation/Navigation';
 import Performance from '@libs/Performance';
 import {getConnectedIntegration} from '@libs/PolicyUtils';
-import getReportPreviewAction from '@libs/ReportPreviewActionUtils';
+import {getReportPreviewAction} from '@libs/ReportPreviewActionUtils';
 import {
     areAllRequestsBeingSmartScanned as areAllRequestsBeingSmartScannedReportUtils,
     getBankAccountRoute,

src/libs/ReportPreviewActionUtils.ts

@@ -253,4 +253,4 @@ function getReportPreviewAction(
     return CONST.REPORT.REPORT_PREVIEW_ACTIONS.VIEW;
 }
 
-export default getReportPreviewAction;
+export {canReview, getReportPreviewAction};

src/libs/SearchUIUtils.ts

@@ -45,6 +45,7 @@ import Parser from './Parser';
 import {getDisplayNameOrDefault} from './PersonalDetailsUtils';
 import {canSendInvoice, getActivePolicy, getGroupPaidPoliciesWithExpenseChatEnabled, getPolicy, isPaidGroupPolicy} from './PolicyUtils';
 import {getOriginalMessage, isCreatedAction, isDeletedAction, isMoneyRequestAction, isResolvedActionableWhisper, isWhisperActionTargetedToOthers} from './ReportActionsUtils';
+import {canReview} from './ReportPreviewActionUtils';
 import {
     getIcons,
     getPersonalDetailsForAccountID,
@@ -680,6 +681,9 @@ function getAction(data: OnyxTypes.SearchResults['data'], allViolations: OnyxCol
 
     // Only check for violations if we need to (when user has permission to review)
     if ((isSubmitter || isApprover || isAdmin) && hasViolations(report.reportID, allViolations, undefined, allReportTransactions)) {
+        if (isSubmitter && !isApprover && !isAdmin && !canReview(report, allViolations, policy, allReportTransactions)) {
+            return CONST.SEARCH.ACTION_TYPES.VIEW;
+        }
         return CONST.SEARCH.ACTION_TYPES.REVIEW;
     }
     // Submit/Approve/Pay can only be taken on transactions if the transaction is the only one on the report, otherwise `View` is the only option.

tests/actions/ReportPreviewActionUtilsTest.ts

@@ -4,7 +4,7 @@ import Onyx from 'react-native-onyx';
 import useReportIsArchived from '@hooks/useReportIsArchived';
 // eslint-disable-next-line no-restricted-syntax
 import type * as PolicyUtils from '@libs/PolicyUtils';
-import getReportPreviewAction from '@libs/ReportPreviewActionUtils';
+import {getReportPreviewAction} from '@libs/ReportPreviewActionUtils';
 // eslint-disable-next-line no-restricted-syntax
 import * as ReportUtils from '@libs/ReportUtils';
 import CONST from '@src/CONST';

tests/unit/Search/SearchUIUtilsTest.ts

@@ -20,6 +20,8 @@ const approverAccountID = 1111111;
 const approverEmail = 'approver@policy.com';
 const overlimitApproverAccountID = 222222;
 const overlimitApproverEmail = 'overlimit@policy.com';
+const submitterAccountID = 333333;
+const submitterEmail = 'submitter@policy.com';
 const policyID = 'A1B2C3';
 const reportID = '123456789';
 const reportID2 = '11111';
@@ -61,6 +63,12 @@ const searchResults: OnyxTypes.SearchResults = {
                 displayName: 'Overlimit Approver',
                 login: overlimitApproverEmail,
             },
+            [submitterAccountID]: {
+                accountID: submitterAccountID,
+                avatar: 'https://d2k5nsl2zxldvw.cloudfront.net/images/avatars/avatar_3.png',
+                displayName: 'Submitter',
+                login: submitterEmail,
+            },
         },
         [`policy_${policyID}`]: {
             id: 'Admin',
@@ -98,6 +106,11 @@ const searchResults: OnyxTypes.SearchResults = {
                     role: CONST.POLICY.ROLE.ADMIN,
                     submitsTo: approverEmail,
                 },
+                [submitterEmail]: {
+                    email: submitterEmail,
+                    role: CONST.POLICY.ROLE.USER,
+                    submitsTo: adminEmail,
+                },
             },
         },
         [`reportActions_${reportID}`]: {
@@ -957,6 +970,29 @@ describe('SearchUIUtils', () => {
             expect(action).toStrictEqual(CONST.SEARCH.ACTION_TYPES.SUBMIT);
         });
 
+        test('Should return `View` action for transaction on policy with delayed submission and with violations when current user is submitter and the expense was submitted', async () => {
+            await Onyx.merge(ONYXKEYS.SESSION, {accountID: submitterAccountID});
+            const localSearchResults = {
+                ...searchResults.data,
+                [`policy_${policyID}`]: {
+                    ...searchResults.data[`policy_${policyID}`],
+                    role: CONST.POLICY.ROLE.USER,
+                },
+                [`report_${reportID2}`]: {
+                    ...searchResults.data[`report_${reportID2}`],
+                    accountID: submitterAccountID,
+                    ownerAccountID: submitterAccountID,
+                },
+                [`transactions_${transactionID2}`]: {
+                    ...searchResults.data[`transactions_${transactionID2}`],
+                    accountID: submitterAccountID,
+                    managerID: adminAccountID,
+                },
+            };
+            expect(SearchUIUtils.getAction(localSearchResults, allViolations, `report_${reportID2}`)).toStrictEqual(CONST.SEARCH.ACTION_TYPES.VIEW);
+            expect(SearchUIUtils.getAction(localSearchResults, allViolations, `transactions_${transactionID2}`)).toStrictEqual(CONST.SEARCH.ACTION_TYPES.VIEW);
+        });
+
         test('Should return `Review` action for transaction on policy with delayed submission and with violations', () => {
             let action = SearchUIUtils.getAction(searchResults.data, allViolations, `report_${reportID2}`);
             expect(action).toStrictEqual(CONST.SEARCH.ACTION_TYPES.REVIEW);