Show action badge in LHN for individual expense reports #88294

aimane-chnaif · 2026-04-19T20:17:16Z

@MelvinBot add unit test

aimane-chnaif · 2026-04-19T19:48:37Z

@MelvinBot add unit test for this function

Added 3 unit tests for getBadgeFromIOUReport: APPROVE for submitted reports, PAY for approved reports, and undefined for settled reports.

Added unit tests for getBadgeFromIOUReport: APPROVE for submitted reports, PAY for approved reports, and undefined for settled reports.

aimane-chnaif · 2026-04-19T19:49:10Z

@MelvinBot restore this comment in new getBadgeFromIOUReport function

Restored the comment: // Show to the actual payer, or to policy admins via the pay-elsewhere path for negative expenses

Restored — the comment is at line 272 in the new getBadgeFromIOUReport function.

-Original file line number
+Diff line change
@@ Expand Up / @@ -1408,6 +1408,10 @@ const CONST = { @@
                 PAY: 'pay',
                 FIX: 'fix',
             },
+            ACTION_TYPES_FOR_ASSIGNEE_TO_COMPLETE: {
+                EXPENSE: 'expense',
+                TASK: 'task',
+            },
             ACTIONS: {
                 LIMIT: 50,
                 // OldDot Actions render getMessage from Web-Expensify/lib/Report/Action PHP files via getMessageOfOldDotReportAction in ReportActionsUtils.ts
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,7 @@ @@
     import {createDraftTransaction, setMoneyRequestParticipants, setMoneyRequestParticipantsFromReport, setMoneyRequestReportID, startDistanceRequest, startMoneyRequest} from './actions/IOU';
     import type {IOURequestType} from './actions/IOU';
     import {unholdRequest} from './actions/IOU/Hold';
-    import {canApproveIOU, canIOUBePaid, canSubmitReport, getIOUReportActionWithBadge} from './actions/IOU/ReportWorkflow';
+    import {canApproveIOU, canIOUBePaid, canSubmitReport, getBadgeFromIOUReport, getIOUReportActionWithBadge} from './actions/IOU/ReportWorkflow';
     import {createDraftWorkspace} from './actions/Policy/Policy';
     import {hasCreditBankAccount} from './actions/ReimbursementAccount/store';
     import {openUnreportedExpense} from './actions/Report';
@@ Expand Down Expand Up / @@ -1037,7 +1037,7 @@ @@
     };
     let conciergeReportIDOnyxConnect: OnyxEntry<string>;
     Onyx.connect({
         key: ONYXKEYS.CONCIERGE_REPORT_ID,
         callback: (value) => {
             conciergeReportIDOnyxConnect = value;
@@ Expand All / @@ -1045,7 +1045,7 @@ @@
     });
     const defaultAvatarBuildingIconTestID = 'SvgDefaultAvatarBuilding Icon';
     Onyx.connect({
         key: ONYXKEYS.SESSION,
         callback: (value) => {
             // When signed out, val is undefined
@@ Expand All / @@ -1063,7 +1063,7 @@ @@
     let allPersonalDetails: OnyxEntry<PersonalDetailsList>;
     let allPersonalDetailLogins: string[];
     let currentUserPersonalDetails: OnyxEntry<PersonalDetails>;
     Onyx.connect({
         key: ONYXKEYS.PERSONAL_DETAILS_LIST,
         callback: (value) => {
             if (deprecatedCurrentUserAccountID) {
@@ Expand All / @@ -1075,7 +1075,7 @@ @@
     });
     let allReportsDraft: OnyxCollection<Report>;
     Onyx.connect({
         key: ONYXKEYS.COLLECTION.REPORT_DRAFT,
         waitForCollectionCallback: true,
         callback: (value) => (allReportsDraft = value),
@@ Expand All / @@ -1083,7 +1083,7 @@ @@
     let allPolicies: OnyxCollection<Policy>;
     let policiesArray: Policy[] = [];
     Onyx.connect({
         key: ONYXKEYS.COLLECTION.POLICY,
         waitForCollectionCallback: true,
         callback: (value) => {
@@ Expand All / @@ -1093,7 +1093,7 @@ @@
     });
     let allPolicyDrafts: OnyxCollection<Policy>;
     Onyx.connect({
         key: ONYXKEYS.COLLECTION.POLICY_DRAFTS,
         waitForCollectionCallback: true,
         callback: (value) => (allPolicyDrafts = value),
@@ Expand All / @@ -1101,7 +1101,7 @@ @@
     let deprecatedAllReports: OnyxCollection<Report>;
     let deprecatedReportsByPolicyID: ReportByPolicyMap;
     Onyx.connect({
         key: ONYXKEYS.COLLECTION.REPORT,
         waitForCollectionCallback: true,
         callback: (value) => {
@@ Expand Down Expand Up / @@ -1137,14 +1137,14 @@ @@
     });
     let betaConfiguration: OnyxEntry<BetaConfiguration> = {};
     Onyx.connect({
         key: ONYXKEYS.BETA_CONFIGURATION,
         callback: (value) => (betaConfiguration = value ?? {}),
     });
     let deprecatedAllTransactions: OnyxCollection<Transaction> = {};
     let deprecatedReportsTransactions: Record<string, Transaction[]> = {};
     Onyx.connect({
         key: ONYXKEYS.COLLECTION.TRANSACTION,
         waitForCollectionCallback: true,
         callback: (value) => {
@@ Expand All / @@ -1170,7 +1170,7 @@ @@
     });
     let allReportActions: OnyxCollection<ReportActions>;
     Onyx.connect({
         key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
         waitForCollectionCallback: true,
         callback: (actions) => {
@@ Expand Down Expand Up / @@ -4196,27 +4196,30 @@ @@
     }
     /**
-     * Checks if a report is waiting for the manager to complete an action.
+     * Returns the action type for the assignee to complete, or undefined if there is no pending action.
      * Example: the assignee of an open task report or the manager of a processing expense report.
      *
      * @param [parentReportAction] - The parent report action of the report (Used to check if the task has been canceled)
      */
-    function isWaitingForAssigneeToCompleteAction(report: OnyxEntry<Report>, parentReportAction: OnyxEntry<ReportAction>): boolean {
+    function getActionTypeForAssigneeToComplete(
+        report: OnyxEntry<Report>,
+        parentReportAction: OnyxEntry<ReportAction>,
+    ): ValueOf<typeof CONST.REPORT.ACTION_TYPES_FOR_ASSIGNEE_TO_COMPLETE> | undefined {
         if (report?.hasOutstandingChildTask) {
-            return true;
+            return CONST.REPORT.ACTION_TYPES_FOR_ASSIGNEE_TO_COMPLETE.TASK;
         }
         if (report?.hasParentAccess === false && isReportManager(report)) {
             if (isOpenTaskReport(report, parentReportAction)) {
-                return true;
+                return CONST.REPORT.ACTION_TYPES_FOR_ASSIGNEE_TO_COMPLETE.TASK;
             }
             if (isProcessingReport(report) && isExpenseReport(report)) {
-                return true;
+                return CONST.REPORT.ACTION_TYPES_FOR_ASSIGNEE_TO_COMPLETE.EXPENSE;
             }
         }
-        return false;
+        return undefined;
     }
     function isUnreadWithMention(reportOrOption: OnyxEntry<Report> | OptionData): boolean {
@@ Expand Down Expand Up / @@ -4299,25 +4302,30 @@ @@
             };
         }
-        if (isWaitingForAssigneeToCompleteAction(optionOrReport, parentReportAction)) {
+        const optionReportMetadata = allReportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${optionOrReport.reportID}`];
+        // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
+        const policy = getPolicy(optionOrReport.policyID);
+        const invoiceReceiverPolicyID = optionOrReport?.invoiceReceiver && 'policyID' in optionOrReport.invoiceReceiver ? optionOrReport.invoiceReceiver.policyID : undefined;
+        // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850
+        // eslint-disable-next-line @typescript-eslint/no-deprecated
+        const invoiceReceiverPolicy = invoiceReceiverPolicyID ? getPolicy(invoiceReceiverPolicyID) : undefined;
+        const actionTypeForAssigneeToComplete = getActionTypeForAssigneeToComplete(optionOrReport, parentReportAction);
+        if (actionTypeForAssigneeToComplete) {
+            const isAssigneeExpenseAction = actionTypeForAssigneeToComplete === CONST.REPORT.ACTION_TYPES_FOR_ASSIGNEE_TO_COMPLETE.EXPENSE;
+            const expenseBadge = isAssigneeExpenseAction ? getBadgeFromIOUReport(optionOrReport, undefined, policy, optionReportMetadata, invoiceReceiverPolicy) : undefined;
             return {
                 reason: CONST.REQUIRES_ATTENTION_REASONS.IS_WAITING_FOR_ASSIGNEE_TO_COMPLETE_ACTION,
                 reportAction: Object.values(reportActions)
                     .filter((action) => action.childType === CONST.REPORT.TYPE.TASK && !isTaskCompleted(action) && action.childManagerAccountID === deprecatedCurrentUserAccountID)
                     // eslint-disable-next-line rulesdir/prefer-locale-compare-from-context
                     .sort((a, b) => (!a.created || !b.created ? 0 : a.created.localeCompare(b.created)))
                     .at(0),
+                ...(expenseBadge ? {actionBadge: expenseBadge} : {}),
             };
         }
-        const optionReportMetadata = allReportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${optionOrReport.reportID}`];
-        // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850
-        // eslint-disable-next-line @typescript-eslint/no-deprecated
-        const policy = getPolicy(optionOrReport.policyID);
-        const invoiceReceiverPolicyID = optionOrReport?.invoiceReceiver && 'policyID' in optionOrReport.invoiceReceiver ? optionOrReport.invoiceReceiver.policyID : undefined;
-        // This will be fixed as part of https://github.com/Expensify/Expensify/issues/507850
-        // eslint-disable-next-line @typescript-eslint/no-deprecated
-        const invoiceReceiverPolicy = invoiceReceiverPolicyID ? getPolicy(invoiceReceiverPolicyID) : undefined;
         const {reportAction: iouReportActionToApproveOrPay, actionBadge} = getIOUReportActionWithBadge(optionOrReport, policy, optionReportMetadata, invoiceReceiverPolicy);
         const iouReportID = getIOUReportIDFromReportActionPreview(iouReportActionToApproveOrPay);
         const transactions = getReportTransactions(iouReportID);
@@ Expand Down Expand Up / @@ -13754,7 +13762,7 @@ @@
         isUserCreatedPolicyRoom,
         isValidReport,
         isValidReportIDFromPath,
-        isWaitingForAssigneeToCompleteAction,
+        getActionTypeForAssigneeToComplete,
         isWaitingForSubmissionFromCurrentUser,
         isWorkspaceMemberLeavingWorkspaceRoom,
         isInvoiceRoom,
@@ Expand Down @@

-Original file line number
+Diff line change
@@ Expand Up / @@ -262,6 +262,39 @@ function canSubmitReport( @@
         );
     }
+    function getBadgeFromIOUReport(
+        iouReport: OnyxEntry<OnyxTypes.Report>,
+        chatReport: OnyxEntry<OnyxTypes.Report>,
+        policy: OnyxEntry<OnyxTypes.Policy>,
+        reportMetadata: OnyxEntry<OnyxTypes.ReportMetadata>,
+        invoiceReceiverPolicy: OnyxEntry<OnyxTypes.Policy>,
+    ): ValueOf<typeof CONST.REPORT.ACTION_BADGE> | undefined {
+        // Show to the actual payer, or to policy admins via the pay-elsewhere path for negative expenses
+        if (
+            canIOUBePaid(iouReport, chatReport, policy, undefined, undefined, undefined, undefined, invoiceReceiverPolicy) ||
+            canIOUBePaid(iouReport, chatReport, policy, undefined, undefined, true, undefined, invoiceReceiverPolicy)
+        ) {
+            return CONST.REPORT.ACTION_BADGE.PAY;
+        }
+        if (canApproveIOU(iouReport, policy, reportMetadata)) {
+            return CONST.REPORT.ACTION_BADGE.APPROVE;
+        }
+        const isWaitingSubmitFromCurrentUser = canSubmitAndIsAwaitingForCurrentUser(
+            iouReport,
+            chatReport,
+            policy,
+            getReportTransactions(iouReport?.reportID),
+            getAllTransactionViolations(),
+            getCurrentUserEmail(),
+            getUserAccountID(),
+            getAllReportActions(iouReport?.reportID),
+        );
+        if (isWaitingSubmitFromCurrentUser) {
+            return CONST.REPORT.ACTION_BADGE.SUBMIT;
+        }
+        return undefined;
+    }
     function getIOUReportActionWithBadge(
         chatReport: OnyxEntry<OnyxTypes.Report>,
         policy: OnyxEntry<OnyxTypes.Policy>,
@@ Expand All / @@ -276,30 +309,9 @@ function getIOUReportActionWithBadge( @@
                 return false;
             }
             const iouReport = getReportOrDraftReport(action.childReportID);
-            // Show to the actual payer, or to policy admins via the pay-elsewhere path for negative expenses
-            if (
-                canIOUBePaid(iouReport, chatReport, policy, undefined, undefined, undefined, undefined, invoiceReceiverPolicy) ||
-                canIOUBePaid(iouReport, chatReport, policy, undefined, undefined, true, undefined, invoiceReceiverPolicy)
-            ) {
-                actionBadge = CONST.REPORT.ACTION_BADGE.PAY;
-                return true;
-            }
-            if (canApproveIOU(iouReport, policy, reportMetadata)) {
-                actionBadge = CONST.REPORT.ACTION_BADGE.APPROVE;
-                return true;
-            }
-            const isWaitingSubmitFromCurrentUser = canSubmitAndIsAwaitingForCurrentUser(
-                iouReport,
-                chatReport,
-                policy,
-                getReportTransactions(iouReport?.reportID),
-                getAllTransactionViolations(),
-                getCurrentUserEmail(),
-                getUserAccountID(),
-                getAllReportActions(iouReport?.reportID),
-            );
-            if (isWaitingSubmitFromCurrentUser) {
-                actionBadge = CONST.REPORT.ACTION_BADGE.SUBMIT;
+            const badge = getBadgeFromIOUReport(iouReport, chatReport, policy, reportMetadata, invoiceReceiverPolicy);
+            if (badge) {
+                actionBadge = badge;
                 return true;
             }
             return false;
@@ Expand Down Expand Up / @@ -1740,6 +1752,7 @@ export { @@
         canSubmitReport,
         canUnapproveIOU,
         determineIouReportID,
+        getBadgeFromIOUReport,
         getIOUReportActionWithBadge,
         getReportOriginalCreationTimestamp,
         reopenReport,
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Show action badge in LHN for individual expense reports #88294

Uh oh!

Diff view

Diff view

There are no files selected for viewing

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

aimane-chnaif Apr 19, 2026

Uh oh!

aimane-chnaif Apr 19, 2026

Uh oh!

MelvinBot Apr 19, 2026

Uh oh!

MelvinBot Apr 19, 2026

Uh oh!

aimane-chnaif Apr 19, 2026

Uh oh!

MelvinBot Apr 19, 2026

Uh oh!

MelvinBot Apr 19, 2026

Uh oh!

Uh oh!

Uh oh!

Show action badge in LHN for individual expense reports #88294

Uh oh!

Show action badge in LHN for individual expense reports #88294

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

GitHub Actions / Changed files ESLint check

aimane-chnaif Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

aimane-chnaif Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

MelvinBot Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!