Merge pull request #42018 from dominictb/fix/41614

fix: update next step for approver
Expensify · May 27, 2024 · 63a20f4 · 63a20f4
2 parents b720ae6 + 9bbed8f
commit 63a20f4
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 43 deletions.
diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts
@@ -16,6 +16,7 @@ import * as PolicyUtils from './PolicyUtils';
 import * as ReportUtils from './ReportUtils';
 
 let currentUserAccountID = -1;
+let currentUserEmail = '';
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
@@ -24,6 +25,7 @@ Onyx.connect({
         }
 
         currentUserAccountID = value?.accountID ?? -1;
+        currentUserEmail = value?.email ?? '';
     },
 });
 
@@ -273,6 +275,27 @@ function buildNextStep(
 
         // Generates an optimistic nextStep once a report has been approved
         case CONST.REPORT.STATUS_NUM.APPROVED:
+            if (
+                ReportUtils.isInvoiceReport(report) ||
+                !ReportUtils.isPayer(
+                    {
+                        accountID: currentUserAccountID,
+                        email: currentUserEmail,
+                    },
+                    report as Report,
+                )
+            ) {
+                optimisticNextStep = {
+                    type,
+                    title: 'Finished!',
+                    message: [
+                        {
+                            text: 'No further action required!',
+                        },
+                    ],
+                };
+                break;
+            }
             // Self review
             optimisticNextStep = {
                 type,
@@ -297,30 +320,6 @@ function buildNextStep(
                     },
                 ],
             };
-
-            // Another owner
-            if (!isOwner) {
-                optimisticNextStep.message = [
-                    {
-                        text: 'Waiting for ',
-                    },
-                    {
-                        text: managerDisplayName,
-                        type: 'strong',
-                    },
-                    {
-                        text: ' to ',
-                    },
-                    {
-                        text: 'pay',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' %expenses.',
-                    },
-                ];
-            }
-
             break;
 
         // Generates an optimistic nextStep once a report has been paid

diff --git a/tests/unit/NextStepUtilsTest.ts b/tests/unit/NextStepUtilsTest.ts
@@ -31,6 +31,7 @@ describe('libs/NextStepUtils', () => {
             type: 'team',
             outputCurrency: CONST.CURRENCY.USD,
             isPolicyExpenseChatEnabled: true,
+            reimbursementChoice: CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL,
         };
         const optimisticNextStep: ReportNextStep = {
             type: 'neutral',
@@ -483,25 +484,12 @@ describe('libs/NextStepUtils', () => {
         });
 
         describe('it generates an optimistic nextStep once a report has been approved', () => {
-            test('self review', () => {
-                optimisticNextStep.title = 'Next Steps:';
+            test('non-payer', () => {
+                report.managerID = strangeAccountID;
+                optimisticNextStep.title = 'Finished!';
                 optimisticNextStep.message = [
                     {
-                        text: 'Waiting for ',
-                    },
-                    {
-                        text: 'you',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' to ',
-                    },
-                    {
-                        text: 'pay',
-                        type: 'strong',
-                    },
-                    {
-                        text: ' %expenses.',
+                        text: 'No further action required!',
                     },
                 ];
 
@@ -510,8 +498,7 @@ describe('libs/NextStepUtils', () => {
                 expect(result).toMatchObject(optimisticNextStep);
             });
 
-            test('another owner', () => {
-                report.ownerAccountID = strangeAccountID;
+            test('payer', () => {
                 optimisticNextStep.title = 'Next Steps:';
                 optimisticNextStep.message = [
                     {
@@ -532,10 +519,18 @@ describe('libs/NextStepUtils', () => {
                         text: ' %expenses.',
                     },
                 ];
+                // mock the report as approved
+                const originalState = {stateNum: report.stateNum, statusNum: report.statusNum};
+                report.stateNum = CONST.REPORT.STATE_NUM.APPROVED;
+                report.statusNum = CONST.REPORT.STATUS_NUM.APPROVED;
 
                 const result = NextStepUtils.buildNextStep(report, CONST.REPORT.STATUS_NUM.APPROVED);
 
                 expect(result).toMatchObject(optimisticNextStep);
+
+                // restore
+                report.stateNum = originalState.stateNum;
+                report.statusNum = originalState.statusNum;
             });
         });