From e4a5d9bfe1ec177065e72f1277c919929ae8e72f Mon Sep 17 00:00:00 2001
From: Rutika Pawar <183392827+twilight2294@users.noreply.github.com>
Date: Mon, 17 Feb 2025 20:31:19 +0530
Subject: [PATCH 1/3] update status num to correct value

---
 src/libs/actions/IOU.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
index 008220df05cc..5d4f5ee97b7e 100644
--- a/src/libs/actions/IOU.ts
+++ b/src/libs/actions/IOU.ts
@@ -8625,7 +8625,7 @@ function cancelPayment(expenseReport: OnyxEntry<OnyxTypes.Report>, chatReport: O
     const policy = getPolicy(chatReport.policyID);
     const approvalMode = policy?.approvalMode ?? CONST.POLICY.APPROVAL_MODE.BASIC;
     const stateNum: ValueOf<typeof CONST.REPORT.STATE_NUM> = approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL ? CONST.REPORT.STATE_NUM.SUBMITTED : CONST.REPORT.STATE_NUM.APPROVED;
-    const statusNum: ValueOf<typeof CONST.REPORT.STATUS_NUM> = approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL ? CONST.REPORT.STATUS_NUM.CLOSED : CONST.REPORT.STATUS_NUM.APPROVED;
+    const statusNum: ValueOf<typeof CONST.REPORT.STATUS_NUM> = approvalMode === CONST.POLICY.APPROVAL_MODE.OPTIONAL ? CONST.REPORT.STATUS_NUM.SUBMITTED : CONST.REPORT.STATUS_NUM.APPROVED;
     const optimisticNextStep = buildNextStep(expenseReport, statusNum);
     const iouReportActions = getAllReportActions(chatReport.iouReportID);
     const expenseReportActions = getAllReportActions(expenseReport.reportID);

From a2cfd84705132cd1fb0ad704be6b332af265ea44 Mon Sep 17 00:00:00 2001
From: Rutika Pawar <183392827+twilight2294@users.noreply.github.com>
Date: Tue, 18 Feb 2025 12:05:32 +0530
Subject: [PATCH 2/3] update next step for optimistic action

---
 src/libs/NextStepUtils.ts | 42 +++++++++++++++++++++++++++++++++------
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
index 97e62ee4d129..bbe8be9a4a00 100644
--- a/src/libs/NextStepUtils.ts
+++ b/src/libs/NextStepUtils.ts
@@ -5,7 +5,7 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy, Report, ReportNextStep} from '@src/types/onyx';
+import type {Policy, Report, ReportNextStep, Session} from '@src/types/onyx';
 import type {Message} from '@src/types/onyx/ReportNextStep';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import {getNextApproverAccountID} from './actions/IOU';
@@ -13,10 +13,11 @@ 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';
+import {getDisplayNameForParticipant, getPersonalDetailsForAccountID, isExpenseReport, isInvoiceReport, isPayer as isPayerReportUtils} from './ReportUtils';
 
 let currentUserAccountID = -1;
 let currentUserEmail = '';
+let session: Session;
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
@@ -26,6 +27,7 @@ Onyx.connect({
 
         currentUserAccountID = value?.accountID ?? CONST.DEFAULT_NUMBER_ID;
         currentUserEmail = value?.email ?? '';
+        session = value;
     },
 });
 
@@ -87,6 +89,7 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
     }
 
     const {policyID = '', ownerAccountID = -1} = report ?? {};
+    const isPayer = isPayerReportUtils(session, report);
     const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`] ?? ({} as Policy);
     const {harvesting, autoReportingOffset} = policy;
     const autoReportingFrequency = getCorrectedAutoReportingFrequency(policy);
@@ -228,7 +231,10 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
             optimisticNextStep = {
                 type,
                 icon: CONST.NEXT_STEP.ICONS.HOURGLASS,
-                message: [
+            };
+
+            if (autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT) {
+                optimisticNextStep.message = [
                     {
                         text: 'Waiting for ',
                     },
@@ -246,8 +252,32 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
                     {
                         text: ' %expenses.',
                     },
-                ],
-            };
+                ];
+            } else {
+                optimisticNextStep.message = [
+                    {
+                        text: 'Waiting for ',
+                    },
+                    isPayer
+                        ? {
+                              text: `you`,
+                              type: 'strong',
+                          }
+                        : {
+                              text: `an admin`,
+                              type: 'strong',
+                          },
+                    {
+                        text: ' to ',
+                    },
+                    {
+                        text: 'pay',
+                    },
+                    {
+                        text: ' %expenses.',
+                    },
+                ];
+            }
 
             break;
         }
@@ -268,7 +298,7 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
         case CONST.REPORT.STATUS_NUM.APPROVED:
             if (
                 isInvoiceReport(report) ||
-                !isPayer(
+                !isPayerReportUtils(
                     {
                         accountID: currentUserAccountID,
                         email: currentUserEmail,

From 523734fe67fa11782ce8e73f325191a00f922dad Mon Sep 17 00:00:00 2001
From: Rutika Pawar <183392827+twilight2294@users.noreply.github.com>
Date: Thu, 20 Feb 2025 15:30:42 +0530
Subject: [PATCH 3/3] apply suggestions

---
 src/libs/NextStepUtils.ts | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
index bbe8be9a4a00..4f5c6c15e47c 100644
--- a/src/libs/NextStepUtils.ts
+++ b/src/libs/NextStepUtils.ts
@@ -5,7 +5,7 @@ import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
 import type {ValueOf} from 'type-fest';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
-import type {Policy, Report, ReportNextStep, Session} from '@src/types/onyx';
+import type {Policy, Report, ReportNextStep} from '@src/types/onyx';
 import type {Message} from '@src/types/onyx/ReportNextStep';
 import type DeepValueOf from '@src/types/utils/DeepValueOf';
 import {getNextApproverAccountID} from './actions/IOU';
@@ -13,11 +13,10 @@ import DateUtils from './DateUtils';
 import EmailUtils from './EmailUtils';
 import {getLoginsByAccountIDs} from './PersonalDetailsUtils';
 import {getCorrectedAutoReportingFrequency, getReimburserAccountID} from './PolicyUtils';
-import {getDisplayNameForParticipant, getPersonalDetailsForAccountID, isExpenseReport, isInvoiceReport, isPayer as isPayerReportUtils} from './ReportUtils';
+import {getDisplayNameForParticipant, getPersonalDetailsForAccountID, isExpenseReport, isInvoiceReport, isPayer} from './ReportUtils';
 
 let currentUserAccountID = -1;
 let currentUserEmail = '';
-let session: Session;
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
@@ -27,7 +26,6 @@ Onyx.connect({
 
         currentUserAccountID = value?.accountID ?? CONST.DEFAULT_NUMBER_ID;
         currentUserEmail = value?.email ?? '';
-        session = value;
     },
 });
 
@@ -89,7 +87,6 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
     }
 
     const {policyID = '', ownerAccountID = -1} = report ?? {};
-    const isPayer = isPayerReportUtils(session, report);
     const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`] ?? ({} as Policy);
     const {harvesting, autoReportingOffset} = policy;
     const autoReportingFrequency = getCorrectedAutoReportingFrequency(policy);
@@ -232,7 +229,7 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
                 type,
                 icon: CONST.NEXT_STEP.ICONS.HOURGLASS,
             };
-
+            // We want to show pending approval next step for cases where the policy has approvals enabled
             if (autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.INSTANT) {
                 optimisticNextStep.message = [
                     {
@@ -258,14 +255,19 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
                     {
                         text: 'Waiting for ',
                     },
-                    isPayer
+                    isPayer(
+                        {
+                            accountID: currentUserAccountID,
+                            email: currentUserEmail,
+                        },
+                        report,
+                    )
                         ? {
                               text: `you`,
                               type: 'strong',
                           }
                         : {
                               text: `an admin`,
-                              type: 'strong',
                           },
                     {
                         text: ' to ',
@@ -298,7 +300,7 @@ function buildNextStep(report: OnyxEntry<Report>, predictedNextStatus: ValueOf<t
         case CONST.REPORT.STATUS_NUM.APPROVED:
             if (
                 isInvoiceReport(report) ||
-                !isPayerReportUtils(
+                !isPayer(
                     {
                         accountID: currentUserAccountID,
                         email: currentUserEmail,