Merge pull request #52297 from truph01/fix/50269

fix: Second approver unapproval shows 'Waiting for first approver' in next steps

Author: Julesssss

src/libs/NextStepUtils.ts

@@ -11,6 +11,7 @@ import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import {getNextApproverAccountID} from './actions/IOU';
 import DateUtils from './DateUtils';
 import EmailUtils from './EmailUtils';
+import {getLoginsByAccountIDs} from './PersonalDetailsUtils';
 import {getCorrectedAutoReportingFrequency, getReimburserAccountID} from './PolicyUtils';
 import {getDisplayNameForParticipant, getPersonalDetailsForAccountID, isExpenseReport, isInvoiceReport, isPayer} from './ReportUtils';
 
@@ -66,8 +67,8 @@ function parseMessage(messages: Message[] | undefined) {
     return `<next-step>${formattedHtml}</next-step>`;
 }
 
-function getNextApproverDisplayName(report: OnyxEntry<Report>) {
-    const approverAccountID = getNextApproverAccountID(report);
+function getNextApproverDisplayName(report: OnyxEntry<Report>, isUnapprove?: boolean) {
+    const approverAccountID = getNextApproverAccountID(report, isUnapprove);
 
     return getDisplayNameForParticipant({accountID: approverAccountID}) ?? getPersonalDetailsForAccountID(approverAccountID).login;
 }
@@ -80,7 +81,7 @@ function getNextApproverDisplayName(report: OnyxEntry<Report>) {
  * @param parameters.isPaidWithExpensify - Whether a report has been paid with Expensify or outside
  * @returns nextStep
  */
-function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<typeof CONST.REPORT.STATUS_NUM>): ReportNextStep | null {
+function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<typeof CONST.REPORT.STATUS_NUM>, isUnapprove?: boolean): ReportNextStep | null {
     if (!isExpenseReport(report)) {
         return null;
     }
@@ -90,7 +91,9 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
     const {harvesting, autoReportingOffset} = policy;
     const autoReportingFrequency = getCorrectedAutoReportingFrequency(policy);
     const ownerDisplayName = getDisplayNameForParticipant({accountID: ownerAccountID});
-    const nextApproverDisplayName = getNextApproverDisplayName(report);
+    const nextApproverDisplayName = getNextApproverDisplayName(report, isUnapprove);
+    const approverAccountID = getNextApproverAccountID(report, isUnapprove);
+    const approvers = getLoginsByAccountIDs([approverAccountID ?? CONST.DEFAULT_NUMBER_ID]);
 
     const reimburserAccountID = getReimburserAccountID(policy);
     const hasValidAccount = !!policy?.achAccount?.accountNumber;
@@ -232,6 +235,7 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
                     {
                         text: nextApproverDisplayName,
                         type: 'strong',
+                        clickToCopyText: approvers.at(0),
                     },
                     {
                         text: ' to ',

src/libs/actions/IOU.ts

@@ -8092,11 +8092,19 @@ function isLastApprover(approvalChain: string[]): boolean {
     return approvalChain.at(-1) === currentUserEmail;
 }
 
-function getNextApproverAccountID(report: OnyxEntry<OnyxTypes.Report>) {
+function getNextApproverAccountID(report: OnyxEntry<OnyxTypes.Report>, isUnapproved = false) {
     const policy = getPolicy(report?.policyID);
     const approvalChain = getApprovalChain(policy, report);
     const submitToAccountID = getSubmitToAccountID(policy, report);
 
+    if (isUnapproved) {
+        if (approvalChain.includes(currentUserEmail)) {
+            return userAccountID;
+        }
+
+        return report?.managerID;
+    }
+
     if (approvalChain.length === 0) {
         return submitToAccountID;
     }
@@ -8284,7 +8292,7 @@ function unapproveExpenseReport(expenseReport: OnyxEntry<OnyxTypes.Report>) {
     const currentNextStep = allNextSteps[`${ONYXKEYS.COLLECTION.NEXT_STEP}${expenseReport.reportID}`] ?? null;
 
     const optimisticUnapprovedReportAction = buildOptimisticUnapprovedReportAction(expenseReport.total ?? 0, expenseReport.currency ?? '', expenseReport.reportID);
-    const optimisticNextStep = buildNextStep(expenseReport, CONST.REPORT.STATUS_NUM.SUBMITTED);
+    const optimisticNextStep = buildNextStep(expenseReport, CONST.REPORT.STATUS_NUM.SUBMITTED, true);
 
     const optimisticReportActionData: OnyxUpdate = {
         onyxMethod: Onyx.METHOD.MERGE,