From e1c03197369c48c97de67376459f4a21b5d2e828 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Mon, 7 Aug 2023 19:38:31 +0100
Subject: [PATCH 01/43] Add approveMoneyRequest action

---
 src/libs/ReportActionsUtils.js |  7 +++++
 src/libs/actions/IOU.js        | 53 ++++++++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

diff --git a/src/libs/ReportActionsUtils.js b/src/libs/ReportActionsUtils.js
index 3cd5621e5e32..8391648df4a0 100644
--- a/src/libs/ReportActionsUtils.js
+++ b/src/libs/ReportActionsUtils.js
@@ -202,6 +202,12 @@ function getSortedReportActions(reportActions, shouldSortInDescendingOrder = fal
         .value();
 }
 
+function getReportMostRecentIOUTransactionID(reportID) {
+    const reportActions = _.filter(allReportActions[reportID], (action) => lodashGet(action, 'originalMessage.type') === CONST.IOU.REPORT_ACTION_TYPE.CREATE);
+    const sortedReportActions = getSortedReportActions(reportActions);
+    return _.last(sortedReportActions).originalMessage.IOUTransactionID;
+}
+
 /**
  * Finds most recent IOU request action ID.
  *
@@ -566,6 +572,7 @@ export {
     getLastVisibleAction,
     getLastVisibleMessage,
     getMostRecentIOURequestActionID,
+    getReportMostRecentIOUTransactionID,
     extractLinksFromMessageHtml,
     isCreatedAction,
     isDeletedAction,
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 45fcd35eb839..de753e7016ae 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -1431,6 +1431,59 @@ function sendMoneyViaPaypal(report, amount, currency, comment, managerID, recipi
     asyncOpenURL(Promise.resolve(), buildPayPalPaymentUrl(amount, recipient.payPalMeAddress, currency));
 }
 
+function approveMoneyRequest(expenseReport) {
+    const IOUTransactionID = ReportActionsUtils.getReportMostRecentIOUTransactionID(expenseReport.reportID);
+    const optimisticIOUReportAction = ReportUtils.buildOptimisticApprovedReportAction(expenseReport.total, expenseReport.currency, expenseReport.reportID, IOUTransactionID);
+
+    const optimisticReportActionsData = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
+        value: {
+            [optimisticIOUReportAction.reportActionID]: {
+                ...optimisticIOUReportAction,
+                pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+            },
+        },
+    };
+    const optimisticIOUReportData = {
+        onyxMethod: Onyx.METHOD.MERGE,
+        key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`,
+        value: {
+            ...expenseReport,
+            lastMessageText: optimisticIOUReportAction.message[0].text,
+            lastMessageHtml: optimisticIOUReportAction.message[0].html,
+            statusNum: CONST.REPORT.STATUS.APPROVED,
+        },
+    };
+    const optimisticData = [optimisticIOUReportData, optimisticReportActionsData];
+
+    const successData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
+            value: {
+                [optimisticIOUReportAction.reportActionID]: {
+                    pendingAction: null,
+                },
+            },
+        },
+    ];
+
+    const failureData = [
+        {
+            onyxMethod: Onyx.METHOD.MERGE,
+            key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
+            value: {
+                [expenseReport.reportActionID]: {
+                    errors: ErrorUtils.getMicroSecondOnyxError('iou.error.other'),
+                },
+            },
+        },
+    ];
+
+    API.write('ApproveMoneyRequest', {reportID: expenseReport.reportID, approvedReportActionID: optimisticIOUReportAction.reportActionID}, {optimisticData, successData, failureData});
+}
+
 /**
  * @param {String} paymentType
  * @param {Object} chatReport

From b1e77abbc8eb7c558bc6953bb4b48076d1c9a543 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Mon, 7 Aug 2023 19:46:23 +0100
Subject: [PATCH 02/43] Add logic for showing the approve/settlement button

---
 src/components/MoneyReportHeader.js | 41 ++++++++++++++++++++++++++++-
 src/libs/ReportUtils.js             | 10 ++++---
 src/libs/SidebarUtils.js            |  2 +-
 3 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 71ac5e02467b..c2a70bd23fa6 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -58,7 +58,28 @@ function MoneyReportHeader(props) {
     const isPayer =
         Policy.isAdminOfFreePolicy([policy]) || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(props.session, 'accountID', null) === moneyRequestReport.managerID);
     const reportTotal = ReportUtils.getMoneyRequestTotal(props.report);
-    const shouldShowSettlementButton = !isSettled && isPayer && !moneyRequestReport.isWaitingOnBankAccount && reportTotal !== 0;
+    const shouldShowSettlementButton = useMemo(() => {
+        if (ReportUtils.getPolicyType(moneyRequestReport, props.policies) === CONST.POLICY.TYPE.CORPORATE) {
+            return Policy.isAdminOfControlPolicy([policy]) && ReportUtils.isReportApproved(moneyRequestReport) && !ReportUtils.isSettled(moneyRequestReport.reportID);
+        }
+
+        return (
+            (Policy.isAdminOfFreePolicy([policy]) ||
+                (ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(props.session, 'accountID', null) === moneyRequestReport.managerID)) &&
+            !ReportUtils.isSettled(moneyRequestReport)
+        );
+    }, [moneyRequestReport, policy, props.policies, props.session]);
+    const shouldShowApprovedButton = useMemo(() => {
+        if (ReportUtils.getPolicyType(moneyRequestReport) !== CONST.POLICY.TYPE.CORPORATE) {
+            return false;
+        }
+
+        return (
+            ReportUtils.isReportManager(moneyRequestReport) &&
+            lodashGet(moneyRequestReport, 'stateNum') === CONST.REPORT.STATE_NUM.PROCESSING &&
+            lodashGet(moneyRequestReport, 'statusNum') === CONST.REPORT.STATUS.SUBMITTED
+        );
+    }, [moneyRequestReport]);
     const bankAccountRoute = ReportUtils.getBankAccountRoute(props.chatReport);
     const shouldShowPaypal = Boolean(lodashGet(props.personalDetails, [moneyRequestReport.managerID, 'payPalMeAddress']));
     const formattedAmount = CurrencyUtils.convertToDisplayString(reportTotal, props.report.currency);
@@ -93,6 +114,15 @@ function MoneyReportHeader(props) {
                         />
                     </View>
                 )}
+                {shouldShowApprovedButton && !props.isSmallScreenWidth && (
+                    <View style={[styles.pv2]}>
+                        <Button
+                            success
+                            text="Approve"
+                            onPress={() => IOU.approveMoneyRequest(props.report)}
+                        />
+                    </View>
+                )}
             </HeaderWithBackButton>
             {shouldShowSettlementButton && props.isSmallScreenWidth && (
                 <View style={[styles.ph5, styles.pb2, props.isSmallScreenWidth && styles.borderBottom]}>
@@ -110,6 +140,15 @@ function MoneyReportHeader(props) {
                     />
                 </View>
             )}
+            {shouldShowApprovedButton && props.isSmallScreenWidth && (
+                <View style={[styles.ph5, styles.pb2, props.isSmallScreenWidth && styles.borderBottom]}>
+                    <Button
+                        success
+                        text="Approve"
+                        onPress={() => IOU.approveMoneyRequest(props.report)}
+                    />
+                </View>
+            )}
         </View>
     );
 }
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 327611fa0191..7c0489d53f72 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -178,10 +178,14 @@ function isCompletedTaskReport(report) {
     return isTaskReport(report) && report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && report.statusNum === CONST.REPORT.STATUS.APPROVED;
 }
 
-function isTaskAssignee(report) {
+function isReportManager(report) {
     return lodashGet(report, 'managerID') === currentUserAccountID;
 }
 
+function isReportApproved(report) {
+    return lodashGet(report, 'stateNum') === CONST.REPORT.STATE_NUM.SUBMITTED && lodashGet(report, 'statusNum') === CONST.REPORT.STATUS.APPROVED;
+}
+
 /**
  * Given a collection of reports returns them sorted by last read
  *
@@ -1164,7 +1168,7 @@ function isWaitingForIOUActionFromCurrentUser(report, allReportsDict = null) {
 }
 
 function isWaitingForTaskCompleteFromAssignee(report) {
-    return isTaskReport(report) && isTaskAssignee(report) && isOpenTaskReport(report);
+    return isTaskReport(report) && isReportManager(report) && isOpenTaskReport(report);
 }
 
 /**
@@ -2943,7 +2947,7 @@ export {
     isOpenTaskReport,
     isCanceledTaskReport,
     isCompletedTaskReport,
-    isTaskAssignee,
+    isReportManager,
     isMoneyRequestReport,
     isMoneyRequest,
     chatIncludesChronos,
diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index dd55b025b55e..248a5d936de6 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -238,7 +238,7 @@ function getOptionData(report, personalDetails, preferredLocale, policy) {
     result.isTaskReport = ReportUtils.isTaskReport(report);
     if (result.isTaskReport) {
         result.isCompletedTaskReport = ReportUtils.isCompletedTaskReport(report);
-        result.isTaskAssignee = ReportUtils.isTaskAssignee(report);
+        result.isTaskAssignee = ReportUtils.isReportManager(report);
     }
     result.isArchivedRoom = ReportUtils.isArchivedRoom(report);
     result.isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);

From fa1bb921a9d2ce4792c953dc2f967ce8c3236455 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sat, 12 Aug 2023 19:14:10 +0100
Subject: [PATCH 03/43] Add helper methods

---
 src/libs/ReportUtils.js    | 43 ++++++++++++++++++++++++++++++++++++++
 src/libs/actions/Policy.js | 11 ++++++++++
 2 files changed, 54 insertions(+)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 6553aedaf68c..f16d7528666a 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1648,6 +1648,47 @@ function buildOptimisticTaskCommentReportAction(taskReportID, taskTitle, taskAss
     return reportAction;
 }
 
+function buildOptimisticApprovedReportAction(amount, currency, expenseReportID) {
+    const originalMessage = {
+        amount,
+        currency,
+        expenseReportID,
+    };
+
+    const currencyUnit = CurrencyUtils.getCurrencyUnit(currency);
+    const formattedAmount = NumberFormatUtils.format(preferredLocale, Math.abs(amount) / currencyUnit, {style: 'currency', currency});
+    const iouMessage = `approved ${formattedAmount}`;
+    const message = [
+        {
+            html: _.escape(iouMessage),
+            text: iouMessage,
+            isEdited: false,
+            type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
+        },
+    ];
+
+    return {
+        actionName: CONST.REPORT.ACTIONS.TYPE.APPROVED,
+        actorAccountID: currentUserAccountID,
+        automatic: false,
+        avatar: lodashGet(currentUserPersonalDetails, 'avatar', UserUtils.getDefaultAvatar(currentUserAccountID)),
+        isAttachment: false,
+        originalMessage,
+        message,
+        person: [
+            {
+                style: 'strong',
+                text: lodashGet(currentUserPersonalDetails, 'displayName', currentUserEmail),
+                type: 'TEXT',
+            },
+        ],
+        reportActionID: NumberUtils.rand64(),
+        shouldShow: true,
+        created: DateUtils.getDBTime(),
+        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+    };
+}
+
 /**
  * Builds an optimistic IOU report with a randomly generated reportID
  *
@@ -2963,6 +3004,7 @@ export {
     buildOptimisticCreatedReportAction,
     buildOptimisticEditedTaskReportAction,
     buildOptimisticIOUReport,
+    buildOptimisticApprovedReportAction,
     buildOptimisticExpenseReport,
     buildOptimisticIOUReportAction,
     buildOptimisticReportPreview,
@@ -2991,6 +3033,7 @@ export {
     isCanceledTaskReport,
     isCompletedTaskReport,
     isReportManager,
+    isReportApproved,
     isMoneyRequestReport,
     isMoneyRequest,
     chatIncludesChronos,
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 809491c14950..8b90b0d8c347 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -161,6 +161,16 @@ function isAdminOfFreePolicy(policies) {
     return _.some(policies, (policy) => policy && policy.type === CONST.POLICY.TYPE.FREE && policy.role === CONST.POLICY.ROLE.ADMIN);
 }
 
+/**
+ * Is the user an admin of a corporate policy
+ *
+ * @param {Array} policies
+ * @returns {Boolean}
+ */
+function isAdminOfControlPolicy(policies) {
+    return _.some(policies, (policy) => policy && policy.type === CONST.POLICY.TYPE.CORPORATE && policy.role === CONST.POLICY.ROLE.ADMIN);
+}
+
 /**
  * Is the user the owner of the given policy?
  *
@@ -1177,6 +1187,7 @@ export {
     removeMembers,
     addMembersToWorkspace,
     isAdminOfFreePolicy,
+    isAdminOfControlPolicy,
     hasActiveFreePolicy,
     setWorkspaceErrors,
     clearCustomUnitErrors,

From 691cebadb542e51f4ae93c88249546407bde22f7 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sat, 12 Aug 2023 19:14:22 +0100
Subject: [PATCH 04/43] Allow APPROVED action to be displayed

---
 src/CONST.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/CONST.js b/src/CONST.js
index dc0d35129a02..c05999d041f6 100755
--- a/src/CONST.js
+++ b/src/CONST.js
@@ -442,6 +442,7 @@ const CONST = {
         ACTIONS: {
             LIMIT: 50,
             TYPE: {
+                APPROVED: 'APPROVED',
                 ADDCOMMENT: 'ADDCOMMENT',
                 CLOSED: 'CLOSED',
                 CREATED: 'CREATED',

From e0da0f3fd17fceff802f3892af1d0f137a5dbd60 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sat, 12 Aug 2023 19:14:53 +0100
Subject: [PATCH 05/43] Fix optimistic data for approved action

---
 src/libs/actions/IOU.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 5b9905c505f1..bd03b76dd78d 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -1436,8 +1436,7 @@ function sendMoneyViaPaypal(report, amount, currency, comment, managerID, recipi
 }
 
 function approveMoneyRequest(expenseReport) {
-    const IOUTransactionID = ReportActionsUtils.getReportMostRecentIOUTransactionID(expenseReport.reportID);
-    const optimisticIOUReportAction = ReportUtils.buildOptimisticApprovedReportAction(expenseReport.total, expenseReport.currency, expenseReport.reportID, IOUTransactionID);
+    const optimisticIOUReportAction = ReportUtils.buildOptimisticApprovedReportAction(expenseReport.total, expenseReport.currency, expenseReport.reportID);
 
     const optimisticReportActionsData = {
         onyxMethod: Onyx.METHOD.MERGE,
@@ -1456,6 +1455,7 @@ function approveMoneyRequest(expenseReport) {
             ...expenseReport,
             lastMessageText: optimisticIOUReportAction.message[0].text,
             lastMessageHtml: optimisticIOUReportAction.message[0].html,
+            stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
             statusNum: CONST.REPORT.STATUS.APPROVED,
         },
     };
@@ -1615,6 +1615,7 @@ export {
     requestMoney,
     sendMoneyElsewhere,
     sendMoneyViaPaypal,
+    approveMoneyRequest,
     payMoneyRequest,
     sendMoneyWithWallet,
     startMoneyRequest,

From f7b422e32ab79a8bbc24ac4751ea06db79c238ef Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sat, 12 Aug 2023 19:15:05 +0100
Subject: [PATCH 06/43] Add missing imports and code tidying up

---
 src/components/MoneyReportHeader.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index a4b6b6f46ac7..b22ddf55057e 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, {useMemo} from 'react';
 import {withOnyx} from 'react-native-onyx';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
@@ -12,9 +12,11 @@ import withWindowDimensions, {windowDimensionsPropTypes} from './withWindowDimen
 import compose from '../libs/compose';
 import Navigation from '../libs/Navigation/Navigation';
 import ROUTES from '../ROUTES';
+import ONYXKEYS from '../ONYXKEYS';
+import CONST from '../CONST';
 import SettlementButton from './SettlementButton';
+import Button from './Button';
 import * as Policy from '../libs/actions/Policy';
-import ONYXKEYS from '../ONYXKEYS';
 import * as IOU from '../libs/actions/IOU';
 import * as CurrencyUtils from '../libs/CurrencyUtils';
 import reportPropTypes from '../pages/reportPropTypes';
@@ -53,10 +55,7 @@ const defaultProps = {
 
 function MoneyReportHeader(props) {
     const moneyRequestReport = props.report;
-    const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
     const policy = props.policies[`${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}`];
-    const isPayer =
-        Policy.isAdminOfFreePolicy([policy]) || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(props.session, 'accountID', null) === moneyRequestReport.managerID);
     const reportTotal = ReportUtils.getMoneyRequestTotal(props.report);
     const shouldShowSettlementButton = useMemo(() => {
         if (ReportUtils.getPolicyType(moneyRequestReport, props.policies) === CONST.POLICY.TYPE.CORPORATE) {
@@ -70,7 +69,7 @@ function MoneyReportHeader(props) {
         );
     }, [moneyRequestReport, policy, props.policies, props.session]);
     const shouldShowApprovedButton = useMemo(() => {
-        if (ReportUtils.getPolicyType(moneyRequestReport) !== CONST.POLICY.TYPE.CORPORATE) {
+        if (ReportUtils.getPolicyType(moneyRequestReport) === CONST.POLICY.TYPE.FREE) {
             return false;
         }
 

From 9a8bef83fea20afa7a24f1a3d1aeb3fcdd0a6e6a Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sat, 12 Aug 2023 19:31:32 +0100
Subject: [PATCH 07/43] Display APPROVED action text in subtle color

---
 src/pages/home/report/ReportActionItem.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 3c71b8bc62f3..ca49edb0932d 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -332,7 +332,10 @@ function ReportActionItem(props) {
                                 isHidden={isHidden}
                                 style={[
                                     !props.displayAsGroup && isAttachment ? styles.mt2 : undefined,
-                                    _.contains([..._.values(CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG), CONST.REPORT.ACTIONS.TYPE.IOU], props.action.actionName)
+                                    _.contains(
+                                        [..._.values(CONST.REPORT.ACTIONS.TYPE.POLICYCHANGELOG), CONST.REPORT.ACTIONS.TYPE.IOU, CONST.REPORT.ACTIONS.TYPE.APPROVED],
+                                        props.action.actionName,
+                                    )
                                         ? styles.colorMuted
                                         : undefined,
                                 ]}

From 2d50862e39af6f9f0c36dc3e497bae3e2ed1ffb9 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sun, 13 Aug 2023 19:44:08 +0100
Subject: [PATCH 08/43] Display approved reports as approved and not paid

---
 src/components/MoneyReportHeader.js           |  9 ++-----
 src/components/ReportActionItem/IOUPreview.js |  4 ++-
 src/libs/ReportUtils.js                       | 27 ++++++++++++++++++-
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index b22ddf55057e..adc84b0aee79 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -59,7 +59,7 @@ function MoneyReportHeader(props) {
     const reportTotal = ReportUtils.getMoneyRequestTotal(props.report);
     const shouldShowSettlementButton = useMemo(() => {
         if (ReportUtils.getPolicyType(moneyRequestReport, props.policies) === CONST.POLICY.TYPE.CORPORATE) {
-            return Policy.isAdminOfControlPolicy([policy]) && ReportUtils.isReportApproved(moneyRequestReport) && !ReportUtils.isSettled(moneyRequestReport.reportID);
+            return Policy.isAdminOfControlPolicy([policy]) && ReportUtils.isReportApproved(moneyRequestReport);
         }
 
         return (
@@ -72,12 +72,7 @@ function MoneyReportHeader(props) {
         if (ReportUtils.getPolicyType(moneyRequestReport) === CONST.POLICY.TYPE.FREE) {
             return false;
         }
-
-        return (
-            ReportUtils.isReportManager(moneyRequestReport) &&
-            lodashGet(moneyRequestReport, 'stateNum') === CONST.REPORT.STATE_NUM.PROCESSING &&
-            lodashGet(moneyRequestReport, 'statusNum') === CONST.REPORT.STATUS.SUBMITTED
-        );
+        return ReportUtils.isReportManager(moneyRequestReport) && !ReportUtils.isReportApproved(moneyRequestReport);
     }, [moneyRequestReport]);
     const bankAccountRoute = ReportUtils.getBankAccountRoute(props.chatReport);
     const shouldShowPaypal = Boolean(lodashGet(props.personalDetails, [moneyRequestReport.managerID, 'payPalMeAddress']));
diff --git a/src/components/ReportActionItem/IOUPreview.js b/src/components/ReportActionItem/IOUPreview.js
index 85a0b22ac327..069f2c6e3d6e 100644
--- a/src/components/ReportActionItem/IOUPreview.js
+++ b/src/components/ReportActionItem/IOUPreview.js
@@ -166,7 +166,9 @@ function IOUPreview(props) {
         }
 
         let message = props.translate('iou.cash');
-        if (props.iouReport.isWaitingOnBankAccount) {
+        if (ReportUtils.isControlPolicyExpenseReport(props.iouReport) && ReportUtils.isReportApproved(props.iouReport) && !ReportUtils.isSettled(props.iouReport)) {
+            message += ` • approved`;
+        } else if (props.iouReport.isWaitingOnBankAccount) {
             message += ` • ${props.translate('iou.pending')}`;
         } else if (ReportUtils.isSettled(props.iouReport.reportID)) {
             message += ` • ${props.translate('iou.settledExpensify')}`;
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index f16d7528666a..5548a35ac006 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -128,6 +128,16 @@ function isExpenseReport(report) {
     return lodashGet(report, 'type') === CONST.REPORT.TYPE.EXPENSE;
 }
 
+/**
+ * Checks if a report is an expense report that belongs to a Control policy.
+ *
+ * @param {Object} report
+ * @returns {Boolean}
+ */
+function isControlPolicyExpenseReport(report) {
+    return isExpenseReport(report) && getPolicyType(report, allPolicies) === CONST.POLICY.TYPE.CORPORATE;
+}
+
 /**
  * Checks if a report is an IOU report.
  *
@@ -229,7 +239,16 @@ function canEditReportAction(reportAction) {
  */
 function isSettled(reportID) {
     const report = lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {});
-    return !_.isEmpty(report) && !report.isWaitingOnBankAccount && report.stateNum > CONST.REPORT.STATE_NUM.PROCESSING;
+
+    if (_.isEmpty(report) || report.isWaitingOnBankAccount) {
+        return false;
+    }
+
+    if (getPolicyType(report, allPolicies) === CONST.POLICY.TYPE.CORPORATE) {
+        return report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && report.statusNum === CONST.REPORT.STATUS.REIMBURSED;
+    }
+
+    return report.stateNum > CONST.REPORT.STATE_NUM.PROCESSING;
 }
 
 /**
@@ -1289,6 +1308,11 @@ function getReportPreviewMessage(report, reportAction = {}) {
     const payerName = isExpenseReport(report) ? getPolicyName(report) : getDisplayNameForParticipant(report.managerID, true);
     const formattedAmount = CurrencyUtils.convertToDisplayString(totalAmount, report.currency);
 
+    if (isReportApproved(report) && getPolicyType(report, allPolicies) === CONST.POLICY.TYPE.CORPORATE) {
+        const managerName = getDisplayNameForParticipant(report.managerID, true);
+        return `${managerName} approved ${formattedAmount}`;
+    }
+
     if (isSettled(report.reportID)) {
         // A settled report preview message can come in three formats "paid ... using Paypal.me", "paid ... elsewhere" or "paid ... using Expensify"
         let translatePhraseKey = 'iou.paidElsewhereWithAmount';
@@ -3027,6 +3051,7 @@ export {
     isCurrentUserSubmitter,
     isExpenseReport,
     isExpenseRequest,
+    isControlPolicyExpenseReport,
     isIOUReport,
     isTaskReport,
     isOpenTaskReport,

From e8543c85c795c4cb06b821b52d97a36bd2c6915b Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Wed, 16 Aug 2023 18:44:24 +0100
Subject: [PATCH 09/43] Fix lastMessageText showing duplicate actor name

---
 src/libs/ReportUtils.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 5548a35ac006..4634f9825fc7 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1309,8 +1309,7 @@ function getReportPreviewMessage(report, reportAction = {}) {
     const formattedAmount = CurrencyUtils.convertToDisplayString(totalAmount, report.currency);
 
     if (isReportApproved(report) && getPolicyType(report, allPolicies) === CONST.POLICY.TYPE.CORPORATE) {
-        const managerName = getDisplayNameForParticipant(report.managerID, true);
-        return `${managerName} approved ${formattedAmount}`;
+        return `approved ${formattedAmount}`;
     }
 
     if (isSettled(report.reportID)) {

From 11400365fa892551a54e986c1ae2223763d13c3d Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Wed, 16 Aug 2023 18:59:34 +0100
Subject: [PATCH 10/43] Code improvement

---
 src/libs/ReportUtils.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 7c8699dc8fe3..d68486fcc9de 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -246,11 +246,7 @@ function isSettled(reportID) {
         return false;
     }
 
-    if (getPolicyType(report, allPolicies) === CONST.POLICY.TYPE.CORPORATE) {
-        return report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && report.statusNum === CONST.REPORT.STATUS.REIMBURSED;
-    }
-
-    return report.stateNum > CONST.REPORT.STATE_NUM.PROCESSING;
+    return report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && report.statusNum === CONST.REPORT.STATUS.REIMBURSED;
 }
 
 /**

From 266cd4cefd5b012465c96650cd6aea9b10dd62da Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Wed, 16 Aug 2023 21:35:37 +0100
Subject: [PATCH 11/43] Create new IOU report if the current report is approved

---
 src/libs/actions/IOU.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 3918c2090be2..ffd5d60d32f4 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -620,7 +620,10 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
         }
 
         // STEP 2: Get existing IOU report and update its total OR build a new optimistic one
-        const isNewOneOnOneIOUReport = !oneOnOneChatReport.iouReportID;
+        // For Control policy expense chats, if the report is already apprvoed, create a new expense report
+        let isNewOneOnOneIOUReport =
+            !oneOnOneChatReport.iouReportID ||
+            (oneOnOneChatReport.iouReportID && isOwnPolicyExpenseChat && ReportUtils.isReportApproved(allReports[`${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.iouReportID}`]));
         let oneOnOneIOUReport;
         if (!isNewOneOnOneIOUReport) {
             oneOnOneIOUReport = IOUUtils.updateIOUOwnerAndTotal(allReports[`${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.iouReportID}`], currentUserAccountID, splitAmount, currency);

From 5de97921615552fbedbf5a40297bc8b9a9cdd0e0 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Wed, 16 Aug 2023 21:42:47 +0100
Subject: [PATCH 12/43] Display translated IOU/Report previews

---
 src/components/ReportActionItem/IOUPreview.js    | 2 +-
 src/components/ReportActionItem/ReportPreview.js | 7 ++++++-
 src/languages/en.js                              | 2 ++
 src/languages/es.js                              | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/ReportActionItem/IOUPreview.js b/src/components/ReportActionItem/IOUPreview.js
index 069f2c6e3d6e..e1617a4efb9a 100644
--- a/src/components/ReportActionItem/IOUPreview.js
+++ b/src/components/ReportActionItem/IOUPreview.js
@@ -167,7 +167,7 @@ function IOUPreview(props) {
 
         let message = props.translate('iou.cash');
         if (ReportUtils.isControlPolicyExpenseReport(props.iouReport) && ReportUtils.isReportApproved(props.iouReport) && !ReportUtils.isSettled(props.iouReport)) {
-            message += ` • approved`;
+            message += ` • ${props.translate('iou.approved')}`;
         } else if (props.iouReport.isWaitingOnBankAccount) {
             message += ` • ${props.translate('iou.pending')}`;
         } else if (ReportUtils.isSettled(props.iouReport.reportID)) {
diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
index 0ba0a1c4099f..fc3e68974fde 100644
--- a/src/components/ReportActionItem/ReportPreview.js
+++ b/src/components/ReportActionItem/ReportPreview.js
@@ -116,7 +116,12 @@ function ReportPreview(props) {
 
     const managerName = ReportUtils.isPolicyExpenseChat(props.chatReport) ? ReportUtils.getPolicyName(props.chatReport) : ReportUtils.getDisplayNameForParticipant(managerID, true);
     const bankAccountRoute = ReportUtils.getBankAccountRoute(props.chatReport);
-    const previewMessage = props.translate(ReportUtils.isSettled(props.iouReportID) || props.iouReport.isWaitingOnBankAccount ? 'iou.payerPaid' : 'iou.payerOwes', {payer: managerName});
+    let previewMessage;
+    if (ReportUtils.isControlPolicyExpenseReport(props.iouReport) && ReportUtils.isReportApproved(props.iouReport)) {
+        previewMessage = props.translate('iou.managerApproved', {manager: ReportUtils.getDisplayNameForParticipant(managerID, true)});
+    } else {
+        previewMessage = props.translate(ReportUtils.isSettled(props.iouReportID) || props.iouReport.isWaitingOnBankAccount ? 'iou.payerPaid' : 'iou.payerOwes', {payer: managerName});
+    }
     const shouldShowSettlementButton =
         !_.isEmpty(props.iouReport) && isCurrentUserManager && !ReportUtils.isSettled(props.iouReportID) && !props.iouReport.isWaitingOnBankAccount && reportTotal !== 0;
     return (
diff --git a/src/languages/en.js b/src/languages/en.js
index 229166a3f858..e6abd880b6aa 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -370,6 +370,7 @@ export default {
     },
     iou: {
         amount: 'Amount',
+        approved: 'Approved',
         cash: 'Cash',
         split: 'Split',
         request: 'Request',
@@ -395,6 +396,7 @@ export default {
         payerOwes: ({payer}) => `${payer} owes: `,
         payerPaidAmount: ({payer, amount}) => `${payer} paid ${amount}`,
         payerPaid: ({payer}) => `${payer} paid: `,
+        managerApproved: ({manager}) => `${manager} approved:`,
         payerSettled: ({amount}) => `paid ${amount}`,
         waitingOnBankAccount: ({submitterDisplayName}) => `started settling up, payment is held until ${submitterDisplayName} adds a bank account`,
         settledAfterAddedBankAccount: ({submitterDisplayName, amount}) => `${submitterDisplayName} added a bank account. The ${amount} payment has been made.`,
diff --git a/src/languages/es.js b/src/languages/es.js
index 0e24a386cd14..193b9ac2acdf 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -369,6 +369,8 @@ export default {
     },
     iou: {
         amount: 'Importe',
+        // TODO
+        approved: '',
         cash: 'Efectivo',
         split: 'Dividir',
         request: 'Solicitar',
@@ -394,6 +396,8 @@ export default {
         payerOwes: ({payer}) => `${payer} debe: `,
         payerPaidAmount: ({payer, amount}) => `${payer} pagó ${amount}`,
         payerPaid: ({payer}) => `${payer} pagó: `,
+        // TODO
+        managerApproved: ({manager}) => `${manager} approved:`,
         payerSettled: ({amount}) => `pagó ${amount}`,
         waitingOnBankAccount: ({submitterDisplayName}) => `inicio el pago, pero no se procesará hasta que ${submitterDisplayName} añada una cuenta bancaria`,
         settledAfterAddedBankAccount: ({submitterDisplayName, amount}) => `${submitterDisplayName} añadió una cuenta bancaria. El pago de ${amount} se ha realizado.`,

From 75e9ed4dad12b3492becc8936a0ee9b8b4cee3a4 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Wed, 16 Aug 2023 23:16:14 +0100
Subject: [PATCH 13/43] Fix bug showing approve button when report is settled

---
 src/components/MoneyReportHeader.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index adc84b0aee79..fe7a8e2ebac3 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -65,14 +65,14 @@ function MoneyReportHeader(props) {
         return (
             (Policy.isAdminOfFreePolicy([policy]) ||
                 (ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(props.session, 'accountID', null) === moneyRequestReport.managerID)) &&
-            !ReportUtils.isSettled(moneyRequestReport)
+            !ReportUtils.isSettled(moneyRequestReport.reportID)
         );
     }, [moneyRequestReport, policy, props.policies, props.session]);
     const shouldShowApprovedButton = useMemo(() => {
         if (ReportUtils.getPolicyType(moneyRequestReport) === CONST.POLICY.TYPE.FREE) {
             return false;
         }
-        return ReportUtils.isReportManager(moneyRequestReport) && !ReportUtils.isReportApproved(moneyRequestReport);
+        return ReportUtils.isReportManager(moneyRequestReport) && !ReportUtils.isReportApproved(moneyRequestReport) && !ReportUtils.isSettled(moneyRequestReport.reportID);
     }, [moneyRequestReport]);
     const bankAccountRoute = ReportUtils.getBankAccountRoute(props.chatReport);
     const shouldShowPaypal = Boolean(lodashGet(props.personalDetails, [moneyRequestReport.managerID, 'payPalMeAddress']));

From 508021d9f33e21bb492cfcd276fd638c97dc9705 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Wed, 16 Aug 2023 23:16:24 +0100
Subject: [PATCH 14/43] Display green dot properly

---
 src/components/LHNOptionsList/OptionRowLHN.js |  1 +
 src/libs/ReportUtils.js                       | 21 ++++++++++++++-----
 src/libs/SidebarUtils.js                      |  6 ++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index a3fbb5e41378..f34fd39150d5 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -94,6 +94,7 @@ function OptionRowLHN(props) {
 
     const hasBrickError = optionItem.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
     const defaultSubscriptSize = optionItem.isExpenseRequest ? CONST.AVATAR_SIZE.SMALL_NORMAL : CONST.AVATAR_SIZE.DEFAULT;
+    console.log(ReportUtils.isWaitingForIOUActionFromCurrentUser(optionItem, true), optionItem.reportID);
     const shouldShowGreenDotIndicator =
         !hasBrickError &&
         (optionItem.isUnreadWithMention ||
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index d68486fcc9de..319c573b0fa7 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -404,7 +404,7 @@ function isPublicAnnounceRoom(report) {
  * @returns {String}
  */
 function getPolicyType(report, policies) {
-    return lodashGet(policies, [`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'type'], '');
+    return lodashGet(policies || allPolicies, [`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'type'], '');
 }
 
 /**
@@ -1157,14 +1157,25 @@ function getMoneyRequestAction(reportAction = {}) {
  * @param {Object} report (chatReport or iouReport)
  * @returns {boolean}
  */
-function isWaitingForIOUActionFromCurrentUser(report) {
+function isWaitingForIOUActionFromCurrentUser(report, debug) {
     if (!report) {
         return false;
     }
 
-    // Money request waiting for current user to add their credit bank account
-    if (report.ownerAccountID === currentUserAccountID && report.isWaitingOnBankAccount) {
-        return true;
+    const policy = getPolicy(report.policyID);
+    if (policy.type === CONST.POLICY.TYPE.CORPORATE) {
+        // If the report is already settled, there's no action required from any user.
+        if (isSettled(report.reportID)) {
+            return false;
+        }
+
+        // Report is pending approval and the current user is the manager
+        if (isReportManager(report) && !isReportApproved(report)) {
+            return true;
+        }
+
+        // Current user is an admin and the report has been approved but not settled yet
+        return policy.role === CONST.POLICY.ROLE.ADMIN && isReportApproved(report);
     }
 
     // Money request waiting for current user to Pay (from expense or iou report)
diff --git a/src/libs/SidebarUtils.js b/src/libs/SidebarUtils.js
index bef8586e05b5..7b59e8665382 100644
--- a/src/libs/SidebarUtils.js
+++ b/src/libs/SidebarUtils.js
@@ -198,6 +198,9 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale,
         accountID: null,
         managerID: null,
         reportID: null,
+        policyID: null,
+        statusNum: null,
+        stateNum: null,
         phoneNumber: null,
         payPalMeAddress: null,
         isUnread: null,
@@ -242,6 +245,9 @@ function getOptionData(report, reportActions, personalDetails, preferredLocale,
     result.ownerAccountID = report.ownerAccountID;
     result.managerID = report.managerID;
     result.reportID = report.reportID;
+    result.policyID = report.policyID;
+    result.stateNum = report.stateNum;
+    result.statusNum = report.statusNum;
     result.isUnread = ReportUtils.isUnread(report);
     result.isUnreadWithMention = ReportUtils.isUnreadWithMention(report);
     result.hasDraftComment = report.hasDraft;

From ecd428a8ccab34405edc5f0a350e59723953445e Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Wed, 16 Aug 2023 23:22:25 +0100
Subject: [PATCH 15/43] Cleanup

---
 src/components/LHNOptionsList/OptionRowLHN.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/LHNOptionsList/OptionRowLHN.js b/src/components/LHNOptionsList/OptionRowLHN.js
index f34fd39150d5..a3fbb5e41378 100644
--- a/src/components/LHNOptionsList/OptionRowLHN.js
+++ b/src/components/LHNOptionsList/OptionRowLHN.js
@@ -94,7 +94,6 @@ function OptionRowLHN(props) {
 
     const hasBrickError = optionItem.brickRoadIndicator === CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR;
     const defaultSubscriptSize = optionItem.isExpenseRequest ? CONST.AVATAR_SIZE.SMALL_NORMAL : CONST.AVATAR_SIZE.DEFAULT;
-    console.log(ReportUtils.isWaitingForIOUActionFromCurrentUser(optionItem, true), optionItem.reportID);
     const shouldShowGreenDotIndicator =
         !hasBrickError &&
         (optionItem.isUnreadWithMention ||

From 18c51984cf1df9bc32ed7c60c10e10ea3b3d4873 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Thu, 17 Aug 2023 02:02:23 +0100
Subject: [PATCH 16/43] Clean up

---
 src/libs/ReportUtils.js | 2 +-
 src/libs/actions/IOU.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 319c573b0fa7..fcb45fb71495 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1157,7 +1157,7 @@ function getMoneyRequestAction(reportAction = {}) {
  * @param {Object} report (chatReport or iouReport)
  * @returns {boolean}
  */
-function isWaitingForIOUActionFromCurrentUser(report, debug) {
+function isWaitingForIOUActionFromCurrentUser(report) {
     if (!report) {
         return false;
     }
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index ffd5d60d32f4..ba02870e9aeb 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -471,6 +471,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
         ? allReports[`${ONYXKEYS.COLLECTION.REPORT}${existingGroupChatReportID}`]
         : ReportUtils.getChatByParticipants(participantAccountIDs);
     const groupChatReport = existingGroupChatReport || ReportUtils.buildOptimisticChatReport(participantAccountIDs);
+    const isOwnPolicyExpenseChat = groupChatReport.isOwnPolicyExpenseChat;
 
     // ReportID is -2 (aka "deleted") on the group transaction: https://github.com/Expensify/Auth/blob/3fa2698654cd4fbc30f9de38acfca3fbeb7842e4/auth/command/SplitTransaction.cpp#L24-L27
     const formattedParticipants = Localize.arrayToString([currentUserLogin, ..._.map(participants, (participant) => participant.login)]);

From da3222657a1c01120bc1437cf7a5b4844145e254 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Fri, 18 Aug 2023 15:29:04 +0100
Subject: [PATCH 17/43] Use getIOUReportActionMessage to format APPROVED action
 message

---
 src/libs/ReportUtils.js | 39 ++++-----------------------------------
 src/libs/actions/IOU.js |  2 +-
 2 files changed, 5 insertions(+), 36 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 47c4db313fcd..88fabc05c2ef 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -118,16 +118,6 @@ function isExpenseReport(report) {
     return lodashGet(report, 'type') === CONST.REPORT.TYPE.EXPENSE;
 }
 
-/**
- * Checks if a report is an expense report that belongs to a Control policy.
- *
- * @param {Object} report
- * @returns {Boolean}
- */
-function isControlPolicyExpenseReport(report) {
-    return isExpenseReport(report) && getPolicyType(report, allPolicies) === CONST.POLICY.TYPE.CORPORATE;
-}
-
 /**
  * Checks if a report is an IOU report.
  *
@@ -377,17 +367,6 @@ function isPublicAnnounceRoom(report) {
     return visibility === CONST.REPORT.VISIBILITY.PUBLIC_ANNOUNCE;
 }
 
-/**
- * Get the policy type from a given report
- * @param {Object} report
- * @param {String} report.policyID
- * @param {Object} policies must have Onyxkey prefix (i.e 'policy_') for keys
- * @returns {String}
- */
-function getPolicyType(report, policies) {
-    return lodashGet(policies || allPolicies, [`${ONYXKEYS.COLLECTION.POLICY}${report.policyID}`, 'type'], '');
-}
-
 /**
  * If the report is a policy expense, the route should be for adding bank account for that policy
  * else since the report is a personal IOU, the route should be for personal bank account.
@@ -1782,18 +1761,6 @@ function buildOptimisticApprovedReportAction(amount, currency, expenseReportID)
         expenseReportID,
     };
 
-    const currencyUnit = CurrencyUtils.getCurrencyUnit(currency);
-    const formattedAmount = NumberFormatUtils.format(preferredLocale, Math.abs(amount) / currencyUnit, {style: 'currency', currency});
-    const iouMessage = `approved ${formattedAmount}`;
-    const message = [
-        {
-            html: _.escape(iouMessage),
-            text: iouMessage,
-            isEdited: false,
-            type: CONST.REPORT.MESSAGE.TYPE.COMMENT,
-        },
-    ];
-
     return {
         actionName: CONST.REPORT.ACTIONS.TYPE.APPROVED,
         actorAccountID: currentUserAccountID,
@@ -1801,7 +1768,7 @@ function buildOptimisticApprovedReportAction(amount, currency, expenseReportID)
         avatar: lodashGet(currentUserPersonalDetails, 'avatar', UserUtils.getDefaultAvatar(currentUserAccountID)),
         isAttachment: false,
         originalMessage,
-        message,
+        message: getIOUReportActionMessage(CONST.REPORT.ACTIONS.TYPE.APPROVED, Math.abs(amount), '', currency),
         person: [
             {
                 style: 'strong',
@@ -1914,6 +1881,9 @@ function getIOUReportActionMessage(type, total, comment, currency, paymentType =
 
     let iouMessage;
     switch (type) {
+        case CONST.REPORT.ACTIONS.TYPE.APPROVED:
+            iouMessage = `approved ${amount}`;
+            break;
         case CONST.IOU.REPORT_ACTION_TYPE.CREATE:
             iouMessage = `requested ${amount}${comment && ` for ${comment}`}`;
             break;
@@ -3327,7 +3297,6 @@ export {
     isCurrentUserSubmitter,
     isExpenseReport,
     isExpenseRequest,
-    isControlPolicyExpenseReport,
     isIOUReport,
     isTaskReport,
     isOpenTaskReport,
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index a9dc639befe6..2fdf93457386 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -633,7 +633,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
     splitChatReport.lastMessageText = splitIOUReportAction.message[0].text;
     splitChatReport.lastMessageHtml = splitIOUReportAction.message[0].html;
 
-    // If we have an existing groupChatReport use it's pending fields, otherwise indicate that we are adding a chat
+    // If we have an existing splitChatReport (group chat or workspace) use it's pending fields, otherwise indicate that we are adding a chat
     if (!existingSplitChatReport) {
         splitChatReport.pendingFields = {
             createChat: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,

From d75e3f8cd7ea6e8a603acdf8a3738e6872fc1d91 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Fri, 18 Aug 2023 16:07:31 +0100
Subject: [PATCH 18/43] Add spanish translations

---
 src/languages/es.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/languages/es.js b/src/languages/es.js
index f7abe645967f..5facde38bf3c 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -387,8 +387,7 @@ export default {
     },
     iou: {
         amount: 'Importe',
-        // TODO
-        approved: '',
+        approved: 'Aprobado',
         cash: 'Efectivo',
         split: 'Dividir',
         request: 'Solicitar',
@@ -414,8 +413,7 @@ export default {
         payerOwes: ({payer}) => `${payer} debe: `,
         payerPaidAmount: ({payer, amount}) => `${payer} pagó ${amount}`,
         payerPaid: ({payer}) => `${payer} pagó: `,
-        // TODO
-        managerApproved: ({manager}) => `${manager} approved:`,
+        managerApproved: ({manager}) => `${manager} aprobó:`,
         payerSettled: ({amount}) => `pagó ${amount}`,
         waitingOnBankAccount: ({submitterDisplayName}) => `inicio el pago, pero no se procesará hasta que ${submitterDisplayName} añada una cuenta bancaria`,
         settledAfterAddedBankAccount: ({submitterDisplayName, amount}) => `${submitterDisplayName} añadió una cuenta bancaria. El pago de ${amount} se ha realizado.`,

From 39308027eed89bb17c29f66ad786d383488e68b0 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Fri, 18 Aug 2023 16:47:53 +0100
Subject: [PATCH 19/43] Code tidying up

---
 src/libs/actions/IOU.js | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 2fdf93457386..d76832435640 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -736,8 +736,9 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
 
     const hasMultipleParticipants = participants.length > 1;
     _.each(participants, (participant) => {
-        const email = isOwnPolicyExpenseChat ? '' : OptionsListUtils.addSMSDomainIfPhoneNumber(participant.login).toLowerCase();
-        const accountID = isOwnPolicyExpenseChat ? 0 : Number(participant.accountID);
+        // In case the participant is a worskapce, email & accountID should remain undefined and won't be used in the rest of this code
+        const email = !_.isEmpty(participant.login) ? OptionsListUtils.addSMSDomainIfPhoneNumber(participant.login).toLowerCase() : '';
+        const accountID = !_.isEmpty(participant.accountID) ? Number(participant.accountID) : undefined;
         if (email === currentUserEmail) {
             return;
         }
@@ -750,7 +751,10 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
 
         // If this is a split between two people only and the function
         // wasn't provided with an existing group chat report id
-        // or, if this is workspace chat, then the oneOnOneChatReport is the same as the splitChatReport
+        //
+        // or, if the split is being made from the workspace chat, then the oneOnOneChatReport is the same as the splitChatReport
+        // in this case existingSplitChatReport will belong to the policy expense chat and we won't be
+        // entering code that creates optimistic personal details
         if ((!hasMultipleParticipants && !existingSplitChatReportID) || isOwnPolicyExpenseChat) {
             oneOnOneChatReport = splitChatReport;
             shouldCreateOptimisticPersonalDetails = !existingSplitChatReport;
@@ -841,7 +845,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             isNewOneOnOneIOUReport,
         );
 
-        const splitData = {
+        const individualSplit = {
             email,
             accountID,
             amount: splitAmount,
@@ -854,7 +858,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             reportPreviewReportActionID: oneOnOneReportPreviewAction.reportActionID,
         };
 
-        splits.push(splitData);
+        splits.push(individualSplit);
         optimisticData.push(...oneOnOneOptimisticData);
         successData.push(...oneOnOneSuccessData);
         failureData.push(...oneOnOneFailureData);
@@ -885,10 +889,10 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
  * @param {Number} amount - always in smallest currency unit
  * @param {String} comment
  * @param {String} currency
- * @param {String} existingGroupChatReportID
+ * @param {String} existingSplitChatReport - Either a group DM or a workspace chat
  */
-function splitBill(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID = '') {
-    const {splitData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingGroupChatReportID);
+function splitBill(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingSplitChatReportID = '') {
+    const {splitData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingSplitChatReportID);
 
     API.write(
         'SplitBill',

From c7d51cf0ea4e093a9a0b889f7e16ad86f763fb5b Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Fri, 18 Aug 2023 17:07:56 +0100
Subject: [PATCH 20/43] Fix IOU report being created instead of Expense report

---
 src/libs/actions/IOU.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index d76832435640..5cf56e7d6929 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -779,6 +779,8 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             } else {
                 oneOnOneIOUReport = IOUUtils.updateIOUOwnerAndTotal(oneOnOneIOUReport, currentUserAccountID, splitAmount, currency);
             }
+        } else if (isOwnPolicyExpenseChat) {
+            oneOnOneIOUReport = ReportUtils.buildOptimisticExpenseReport(oneOnOneChatReport.reportID, oneOnOneChatReport.policyID, -splitAmount, currentUserAccountID, currency);
         } else {
             oneOnOneIOUReport = ReportUtils.buildOptimisticIOUReport(currentUserAccountID, accountID, splitAmount, oneOnOneChatReport.reportID, currency);
         }

From d160aed6c7f3784147a02e4b19108eb013c707e7 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Fri, 18 Aug 2023 17:31:22 +0100
Subject: [PATCH 21/43] Code tidying up

---
 src/libs/actions/IOU.js | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 5cf56e7d6929..9305103b39c9 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -765,24 +765,23 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             oneOnOneChatReport = existingChatReport || ReportUtils.buildOptimisticChatReport([accountID]);
         }
 
-        // STEP 2: Get existing IOU report and update its total OR build a new optimistic one
+        // STEP 2: Get existing IOU/Expense report and update its total OR build a new optimistic one
         // For Control policy expense chats, if the report is already apprvoed, create a new expense report
-        let isNewOneOnOneIOUReport =
-            !oneOnOneChatReport.iouReportID ||
-            (oneOnOneChatReport.iouReportID && isOwnPolicyExpenseChat && ReportUtils.isReportApproved(allReports[`${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.iouReportID}`]));
-        let oneOnOneIOUReport;
-        if (!isNewOneOnOneIOUReport) {
-            oneOnOneIOUReport = allReports[`${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.iouReportID}`];
+        let oneOnOneIOUReport = lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.iouReportID}`, undefined);
+        const shouldCreateNewOneOnOneIOUReport =
+            _.isUndefined(oneOnOneIOUReport) || (isOwnPolicyExpenseChat && ReportUtils.isControlPolicyExpenseReport(oneOnOneIOUReport) && ReportUtils.isReportApproved(oneOnOneIOUReport));
+
+        if (shouldCreateNewOneOnOneIOUReport) {
+            oneOnOneIOUReport = isOwnPolicyExpenseChat
+                ? ReportUtils.buildOptimisticExpenseReport(oneOnOneChatReport.reportID, oneOnOneChatReport.policyID, -splitAmount, currentUserAccountID, currency)
+                : ReportUtils.buildOptimisticIOUReport(currentUserAccountID, accountID, splitAmount, oneOnOneChatReport.reportID, currency);
+        } else {
             if (isOwnPolicyExpenseChat) {
                 // Because of the Expense reports are stored as negative values, we substract the total from the amount
                 oneOnOneIOUReport.total -= splitAmount;
             } else {
                 oneOnOneIOUReport = IOUUtils.updateIOUOwnerAndTotal(oneOnOneIOUReport, currentUserAccountID, splitAmount, currency);
             }
-        } else if (isOwnPolicyExpenseChat) {
-            oneOnOneIOUReport = ReportUtils.buildOptimisticExpenseReport(oneOnOneChatReport.reportID, oneOnOneChatReport.policyID, -splitAmount, currentUserAccountID, currency);
-        } else {
-            oneOnOneIOUReport = ReportUtils.buildOptimisticIOUReport(currentUserAccountID, accountID, splitAmount, oneOnOneChatReport.reportID, currency);
         }
 
         // STEP 3: Build optimistic transaction
@@ -844,7 +843,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             oneOnOnePersonalDetailListAction,
             oneOnOneReportPreviewAction,
             isNewOneOnOneChatReport,
-            isNewOneOnOneIOUReport,
+            shouldCreateNewOneOnOneIOUReport,
         );
 
         const individualSplit = {

From 07682c5d55d6a5c8bfcdc987973a9f72927014b8 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Fri, 18 Aug 2023 18:06:08 +0100
Subject: [PATCH 22/43] Fix bug

---
 src/libs/actions/IOU.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 9305103b39c9..7057a0e35c1b 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -773,7 +773,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
 
         if (shouldCreateNewOneOnOneIOUReport) {
             oneOnOneIOUReport = isOwnPolicyExpenseChat
-                ? ReportUtils.buildOptimisticExpenseReport(oneOnOneChatReport.reportID, oneOnOneChatReport.policyID, -splitAmount, currentUserAccountID, currency)
+                ? ReportUtils.buildOptimisticExpenseReport(oneOnOneChatReport.reportID, oneOnOneChatReport.policyID, currentUserAccountID, splitAmount, currency)
                 : ReportUtils.buildOptimisticIOUReport(currentUserAccountID, accountID, splitAmount, oneOnOneChatReport.reportID, currency);
         } else {
             if (isOwnPolicyExpenseChat) {
@@ -827,8 +827,10 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
 
         let oneOnOneReportPreviewAction = ReportActionsUtils.getReportPreviewAction(oneOnOneChatReport.reportID, oneOnOneIOUReport.reportID);
         if (oneOnOneReportPreviewAction) {
+            console.log('got report preview');
             oneOnOneReportPreviewAction = ReportUtils.updateReportPreview(oneOnOneIOUReport, oneOnOneReportPreviewAction);
         } else {
+            console.log('creating report preview');
             oneOnOneReportPreviewAction = ReportUtils.buildOptimisticReportPreview(oneOnOneChatReport, oneOnOneIOUReport);
         }
 

From 3b570e2e4c7ca5a03541b821e84fe23210b4e54a Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Fri, 18 Aug 2023 21:42:44 +0100
Subject: [PATCH 23/43] Bug fix

---
 src/libs/ReportUtils.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 6d4cacf148d3..5b956bf752f4 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1768,7 +1768,7 @@ function buildOptimisticApprovedReportAction(amount, currency, expenseReportID)
         avatar: lodashGet(currentUserPersonalDetails, 'avatar', UserUtils.getDefaultAvatar(currentUserAccountID)),
         isAttachment: false,
         originalMessage,
-        message: getIOUReportActionMessage(CONST.REPORT.ACTIONS.TYPE.APPROVED, Math.abs(amount), '', currency),
+        message: getIOUReportActionMessage(expenseReportID, CONST.REPORT.ACTIONS.TYPE.APPROVED, Math.abs(amount), '', currency),
         person: [
             {
                 style: 'strong',
@@ -1866,7 +1866,11 @@ function buildOptimisticExpenseReport(chatReportID, policyID, payeeAccountID, to
  * @returns {Array}
  */
 function getIOUReportActionMessage(iouReportID, type, total, comment, currency, paymentType = '', isSettlingUp = false) {
-    let amount = CurrencyUtils.convertToDisplayString(total, currency);
+    let amount =
+        type === CONST.IOU.REPORT_ACTION_TYPE.PAY
+            ? CurrencyUtils.convertToDisplayString(getMoneyRequestTotal(getReport(iouReportID)), currency)
+            : CurrencyUtils.convertToDisplayString(total, currency);
+
     let paymentMethodMessage;
     switch (paymentType) {
         case CONST.IOU.PAYMENT_TYPE.ELSEWHERE:
@@ -1895,7 +1899,6 @@ function getIOUReportActionMessage(iouReportID, type, total, comment, currency,
             iouMessage = `deleted the ${amount} request${comment && ` for ${comment}`}`;
             break;
         case CONST.IOU.REPORT_ACTION_TYPE.PAY:
-            amount = CurrencyUtils.convertToDisplayString(getMoneyRequestTotal(getReport(iouReportID)), currency);
             iouMessage = isSettlingUp ? `paid ${amount}${paymentMethodMessage}` : `sent ${amount}${comment && ` for ${comment}`}${paymentMethodMessage}`;
             break;
         default:

From 273966c2df350d0fd96a0dcf000a48673bf12160 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sat, 19 Aug 2023 21:28:19 +0100
Subject: [PATCH 24/43] Fix code action

---
 src/libs/actions/IOU.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index e73d85b71394..af0906ff1c64 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -775,13 +775,11 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
             oneOnOneIOUReport = isOwnPolicyExpenseChat
                 ? ReportUtils.buildOptimisticExpenseReport(oneOnOneChatReport.reportID, oneOnOneChatReport.policyID, currentUserAccountID, splitAmount, currency)
                 : ReportUtils.buildOptimisticIOUReport(currentUserAccountID, accountID, splitAmount, oneOnOneChatReport.reportID, currency);
+        } else if (isOwnPolicyExpenseChat) {
+            // Because of the Expense reports are stored as negative values, we substract the total from the amount
+            oneOnOneIOUReport.total -= splitAmount;
         } else {
-            if (isOwnPolicyExpenseChat) {
-                // Because of the Expense reports are stored as negative values, we substract the total from the amount
-                oneOnOneIOUReport.total -= splitAmount;
-            } else {
-                oneOnOneIOUReport = IOUUtils.updateIOUOwnerAndTotal(oneOnOneIOUReport, currentUserAccountID, splitAmount, currency);
-            }
+            oneOnOneIOUReport = IOUUtils.updateIOUOwnerAndTotal(oneOnOneIOUReport, currentUserAccountID, splitAmount, currency);
         }
 
         // STEP 3: Build optimistic transaction

From 100f03d24df9beb51df0c39560d1723da060c818 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sat, 19 Aug 2023 21:36:58 +0100
Subject: [PATCH 25/43] Fix code actions

---
 src/libs/ReportUtils.js | 98 +++++++++++++++++++++++++----------------
 src/libs/actions/IOU.js |  4 +-
 2 files changed, 60 insertions(+), 42 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 5b956bf752f4..33e8d38ecf17 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -81,6 +81,15 @@ function getChatType(report) {
     return report ? report.chatType : '';
 }
 
+/**
+ * @param {String} policyID
+ * @returns {Object}
+ */
+function getPolicy(policyID) {
+    const policy = lodashGet(allPolicies, `${ONYXKEYS.COLLECTION.POLICY}${policyID}`) || {};
+    return policy;
+}
+
 /**
  * Returns the concatenated title for the PrimaryLogins of a report
  *
@@ -168,10 +177,22 @@ function isCompletedTaskReport(report) {
     return isTaskReport(report) && report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && report.statusNum === CONST.REPORT.STATUS.APPROVED;
 }
 
+/**
+ * Checks if the current user is the maanger of the supplied report
+ *
+ * @param {Object} report
+ * @returns {Boolean}
+ */
 function isReportManager(report) {
     return lodashGet(report, 'managerID') === currentUserAccountID;
 }
 
+/**
+ * Checks if the supplied report has been approved
+ *
+ * @param {Object} report
+ * @returns {Boolean}
+ */
 function isReportApproved(report) {
     return lodashGet(report, 'stateNum') === CONST.REPORT.STATE_NUM.SUBMITTED && lodashGet(report, 'statusNum') === CONST.REPORT.STATUS.APPROVED;
 }
@@ -1754,35 +1775,6 @@ function buildOptimisticTaskCommentReportAction(taskReportID, taskTitle, taskAss
     return reportAction;
 }
 
-function buildOptimisticApprovedReportAction(amount, currency, expenseReportID) {
-    const originalMessage = {
-        amount,
-        currency,
-        expenseReportID,
-    };
-
-    return {
-        actionName: CONST.REPORT.ACTIONS.TYPE.APPROVED,
-        actorAccountID: currentUserAccountID,
-        automatic: false,
-        avatar: lodashGet(currentUserPersonalDetails, 'avatar', UserUtils.getDefaultAvatar(currentUserAccountID)),
-        isAttachment: false,
-        originalMessage,
-        message: getIOUReportActionMessage(expenseReportID, CONST.REPORT.ACTIONS.TYPE.APPROVED, Math.abs(amount), '', currency),
-        person: [
-            {
-                style: 'strong',
-                text: lodashGet(currentUserPersonalDetails, 'displayName', currentUserEmail),
-                type: 'TEXT',
-            },
-        ],
-        reportActionID: NumberUtils.rand64(),
-        shouldShow: true,
-        created: DateUtils.getDBTime(),
-        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-    };
-}
-
 /**
  * Builds an optimistic IOU report with a randomly generated reportID
  *
@@ -2007,6 +1999,43 @@ function buildOptimisticIOUReportAction(
         receipt,
     };
 }
+/**
+ * Builds an optimistic APPROVED report action with a randomly generated reportActionID.
+ *
+ * @param {Number} amount
+ * @param {String} currency
+ * @param {Number} expenseReportID
+ *
+ * @returns {Object}
+ */
+function buildOptimisticApprovedReportAction(amount, currency, expenseReportID) {
+    const originalMessage = {
+        amount,
+        currency,
+        expenseReportID,
+    };
+
+    return {
+        actionName: CONST.REPORT.ACTIONS.TYPE.APPROVED,
+        actorAccountID: currentUserAccountID,
+        automatic: false,
+        avatar: lodashGet(currentUserPersonalDetails, 'avatar', UserUtils.getDefaultAvatar(currentUserAccountID)),
+        isAttachment: false,
+        originalMessage,
+        message: getIOUReportActionMessage(expenseReportID, CONST.REPORT.ACTIONS.TYPE.APPROVED, Math.abs(amount), '', currency),
+        person: [
+            {
+                style: 'strong',
+                text: lodashGet(currentUserPersonalDetails, 'displayName', currentUserEmail),
+                type: 'TEXT',
+            },
+        ],
+        reportActionID: NumberUtils.rand64(),
+        shouldShow: true,
+        created: DateUtils.getDBTime(),
+        pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
+    };
+}
 
 /**
  * Builds an optimistic report preview action with a randomly generated reportActionID.
@@ -3003,7 +3032,7 @@ function isReportDataReady() {
  * @returns {Object}
  */
 function getTaskParentReportActionIDInAssigneeReport(taskReport) {
-    const assigneeChatReportID = lodashGet(getChatByParticipants(isTaskAssignee(taskReport) ? [taskReport.ownerAccountID] : [taskReport.managerID]), 'reportID');
+    const assigneeChatReportID = lodashGet(getChatByParticipants(isReportManager(taskReport) ? [taskReport.ownerAccountID] : [taskReport.managerID]), 'reportID');
     if (!assigneeChatReportID || assigneeChatReportID === taskReport.parentReportID) {
         return {};
     }
@@ -3064,15 +3093,6 @@ function getReportOfflinePendingActionAndErrors(report) {
     return {addWorkspaceRoomOrChatPendingAction, addWorkspaceRoomOrChatErrors};
 }
 
-/**
- * @param {String} policyID
- * @returns {Object}
- */
-function getPolicy(policyID) {
-    const policy = lodashGet(allPolicies, `${ONYXKEYS.COLLECTION.POLICY}${policyID}`) || {};
-    return policy;
-}
-
 /*
  * @param {Object|null} report
  * @returns {Boolean}
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index af0906ff1c64..f191a0ae9fbe 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -825,10 +825,8 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
 
         let oneOnOneReportPreviewAction = ReportActionsUtils.getReportPreviewAction(oneOnOneChatReport.reportID, oneOnOneIOUReport.reportID);
         if (oneOnOneReportPreviewAction) {
-            console.log('got report preview');
             oneOnOneReportPreviewAction = ReportUtils.updateReportPreview(oneOnOneIOUReport, oneOnOneReportPreviewAction);
         } else {
-            console.log('creating report preview');
             oneOnOneReportPreviewAction = ReportUtils.buildOptimisticReportPreview(oneOnOneChatReport, oneOnOneIOUReport);
         }
 
@@ -890,7 +888,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
  * @param {Number} amount - always in smallest currency unit
  * @param {String} comment
  * @param {String} currency
- * @param {String} existingSplitChatReport - Either a group DM or a workspace chat
+ * @param {String} existingSplitChatReportID - Either a group DM or a workspace chat
  */
 function splitBill(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingSplitChatReportID = '') {
     const {splitData, splits, onyxData} = createSplitsAndOnyxData(participants, currentUserLogin, currentUserAccountID, amount, comment, currency, existingSplitChatReportID);

From 909cd45ea04c92be36cdd41e0c38a0586cb288cc Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sat, 19 Aug 2023 23:03:09 +0100
Subject: [PATCH 26/43] Linting

---
 src/libs/ReportUtils.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 33e8d38ecf17..f63b52458895 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -1858,7 +1858,7 @@ function buildOptimisticExpenseReport(chatReportID, policyID, payeeAccountID, to
  * @returns {Array}
  */
 function getIOUReportActionMessage(iouReportID, type, total, comment, currency, paymentType = '', isSettlingUp = false) {
-    let amount =
+    const amount =
         type === CONST.IOU.REPORT_ACTION_TYPE.PAY
             ? CurrencyUtils.convertToDisplayString(getMoneyRequestTotal(getReport(iouReportID)), currency)
             : CurrencyUtils.convertToDisplayString(total, currency);

From 3462084b30f2f5d59522b9a92d1152c1bef559a0 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sun, 20 Aug 2023 23:00:28 +0100
Subject: [PATCH 27/43] Style and translation

---
 src/components/MoneyReportHeader.js | 20 +++++++++++++-------
 src/languages/en.js                 |  1 +
 src/languages/es.js                 |  1 +
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index fe7a8e2ebac3..36435bbcbf8e 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -3,6 +3,7 @@ import {withOnyx} from 'react-native-onyx';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import lodashGet from 'lodash/get';
+import withLocalize from './withLocalize';
 import HeaderWithBackButton from './HeaderWithBackButton';
 import iouReportPropTypes from '../pages/iouReportPropTypes';
 import * as ReportUtils from '../libs/ReportUtils';
@@ -108,10 +109,11 @@ function MoneyReportHeader(props) {
                     </View>
                 )}
                 {shouldShowApprovedButton && !props.isSmallScreenWidth && (
-                    <View style={[styles.pv2]}>
+                    <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
                         <Button
                             success
-                            text="Approve"
+                            text={props.translate('iou.approve')}
+                            style={[styles.mnw120]}
                             onPress={() => IOU.approveMoneyRequest(props.report)}
                         />
                     </View>
@@ -135,11 +137,14 @@ function MoneyReportHeader(props) {
             )}
             {shouldShowApprovedButton && props.isSmallScreenWidth && (
                 <View style={[styles.ph5, styles.pb2, props.isSmallScreenWidth && styles.borderBottom]}>
-                    <Button
-                        success
-                        text="Approve"
-                        onPress={() => IOU.approveMoneyRequest(props.report)}
-                    />
+                    <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
+                        <Button
+                            success
+                            text={props.translate('iou.approve')}
+                            style={[styles.w100]}
+                            onPress={() => IOU.approveMoneyRequest(props.report)}
+                        />
+                    </View>
                 </View>
             )}
         </View>
@@ -151,6 +156,7 @@ MoneyReportHeader.propTypes = propTypes;
 MoneyReportHeader.defaultProps = defaultProps;
 
 export default compose(
+    withLocalize,
     withWindowDimensions,
     withOnyx({
         chatReport: {
diff --git a/src/languages/en.js b/src/languages/en.js
index e312b3c6fa94..d5f58b666347 100755
--- a/src/languages/en.js
+++ b/src/languages/en.js
@@ -389,6 +389,7 @@ export default {
     },
     iou: {
         amount: 'Amount',
+        approve: 'Approve',
         approved: 'Approved',
         cash: 'Cash',
         split: 'Split',
diff --git a/src/languages/es.js b/src/languages/es.js
index e8903b72670c..d7ef5859423b 100644
--- a/src/languages/es.js
+++ b/src/languages/es.js
@@ -388,6 +388,7 @@ export default {
     },
     iou: {
         amount: 'Importe',
+        approve: 'Aprobar',
         approved: 'Aprobado',
         cash: 'Efectivo',
         split: 'Dividir',

From fca135f0de9280b45e3e0e686a07a917929e6fc3 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sun, 20 Aug 2023 23:47:13 +0100
Subject: [PATCH 28/43] Add back code removed by mistake

---
 src/libs/ReportUtils.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index f63b52458895..819a9a74457b 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -240,12 +240,7 @@ function canEditReportAction(reportAction) {
  */
 function isSettled(reportID) {
     const report = lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {});
-
-    if (_.isEmpty(report) || report.isWaitingOnBankAccount) {
-        return false;
-    }
-
-    return report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && report.statusNum === CONST.REPORT.STATUS.REIMBURSED;
+    return !_.isEmpty(report) && !report.isWaitingOnBankAccount && report.stateNum > CONST.REPORT.STATE_NUM.PROCESSING;
 }
 
 /**
@@ -1172,6 +1167,11 @@ function isWaitingForIOUActionFromCurrentUser(report) {
         return true;
     }
 
+    // Money request waiting for current user to Pay (from expense or iou report)
+    if (report.hasOutstandingIOU && report.ownerAccountID && (report.ownerAccountID !== currentUserAccountID || currentUserAccountID === report.managerID)) {
+        return true;
+    }
+
     return false;
 }
 

From f7382f3774b5fad78b057090e08384d61c3903e7 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sun, 20 Aug 2023 23:52:57 +0100
Subject: [PATCH 29/43] Fix test

---
 src/libs/actions/IOU.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index f191a0ae9fbe..8e54b6303b53 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -737,8 +737,8 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
     const hasMultipleParticipants = participants.length > 1;
     _.each(participants, (participant) => {
         // In case the participant is a worskapce, email & accountID should remain undefined and won't be used in the rest of this code
-        const email = !_.isEmpty(participant.login) ? OptionsListUtils.addSMSDomainIfPhoneNumber(participant.login).toLowerCase() : '';
-        const accountID = !_.isEmpty(participant.accountID) ? Number(participant.accountID) : undefined;
+        const email = isOwnPolicyExpenseChat ? '' : OptionsListUtils.addSMSDomainIfPhoneNumber(participant.login).toLowerCase();
+        const accountID = isOwnPolicyExpenseChat ? 0 : Number(participant.accountID);
         if (email === currentUserEmail) {
             return;
         }

From 2d3bf23173f20e993117ec8ea224a06035b05535 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Mon, 21 Aug 2023 18:11:41 +0100
Subject: [PATCH 30/43] Style fix

---
 src/components/MoneyReportHeader.js | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 36435bbcbf8e..edd041ae74ce 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -109,7 +109,7 @@ function MoneyReportHeader(props) {
                     </View>
                 )}
                 {shouldShowApprovedButton && !props.isSmallScreenWidth && (
-                    <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
+                    <View style={[styles.pv2]}>
                         <Button
                             success
                             text={props.translate('iou.approve')}
@@ -136,15 +136,13 @@ function MoneyReportHeader(props) {
                 </View>
             )}
             {shouldShowApprovedButton && props.isSmallScreenWidth && (
-                <View style={[styles.ph5, styles.pb2, props.isSmallScreenWidth && styles.borderBottom]}>
-                    <View style={[styles.flexRow, styles.justifyContentBetween, styles.alignItemsCenter]}>
-                        <Button
-                            success
-                            text={props.translate('iou.approve')}
-                            style={[styles.w100]}
-                            onPress={() => IOU.approveMoneyRequest(props.report)}
-                        />
-                    </View>
+                <View style={[styles.pv2]}>
+                    <Button
+                        success
+                        text={props.translate('iou.approve')}
+                        style={[styles.w100]}
+                        onPress={() => IOU.approveMoneyRequest(props.report)}
+                    />
                 </View>
             )}
         </View>

From c1346403e8f674c99ae5f9694a8228026975afea Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Tue, 22 Aug 2023 15:16:25 +0100
Subject: [PATCH 31/43] Remove no longer needed helper func

---
 src/libs/ReportActionsUtils.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/libs/ReportActionsUtils.js b/src/libs/ReportActionsUtils.js
index 276d7f5152de..f68cfe6adeba 100644
--- a/src/libs/ReportActionsUtils.js
+++ b/src/libs/ReportActionsUtils.js
@@ -207,12 +207,6 @@ function getSortedReportActions(reportActions, shouldSortInDescendingOrder = fal
         .value();
 }
 
-function getReportMostRecentIOUTransactionID(reportID) {
-    const reportActions = _.filter(allReportActions[reportID], (action) => lodashGet(action, 'originalMessage.type') === CONST.IOU.REPORT_ACTION_TYPE.CREATE);
-    const sortedReportActions = getSortedReportActions(reportActions);
-    return _.last(sortedReportActions).originalMessage.IOUTransactionID;
-}
-
 /**
  * Finds most recent IOU request action ID.
  *
@@ -585,7 +579,6 @@ export {
     getLastVisibleAction,
     getLastVisibleMessage,
     getMostRecentIOURequestActionID,
-    getReportMostRecentIOUTransactionID,
     extractLinksFromMessageHtml,
     isCreatedAction,
     isDeletedAction,

From 21d578358fd3ea17d9f8999d698dd745833e94de Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Tue, 22 Aug 2023 16:18:58 +0100
Subject: [PATCH 32/43] Show Pay button in report preview for admins when
 report is approved

---
 src/components/ReportActionItem/ReportPreview.js | 6 ++++--
 src/libs/ReportUtils.js                          | 7 ++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
index c9a40965ec62..ba4a6a7314fb 100644
--- a/src/components/ReportActionItem/ReportPreview.js
+++ b/src/components/ReportActionItem/ReportPreview.js
@@ -143,7 +143,7 @@ function ReportPreview(props) {
         if (isScanning) {
             return props.translate('common.receipt');
         }
-        if (ReportUtils.isControlPolicyExpenseReport(props.iouReport) && ReportUtils.isReportApproved(props.iouReport)) {
+        if (ReportUtils.isControlPolicyExpenseChat(props.chatReport) && ReportUtils.isReportApproved(props.iouReport)) {
             return props.translate('iou.managerApproved', {manager: ReportUtils.getDisplayNameForParticipant(managerID, true)});
         }
         const managerName = ReportUtils.isPolicyExpenseChat(props.chatReport) ? ReportUtils.getPolicyName(props.chatReport) : ReportUtils.getDisplayNameForParticipant(managerID, true);
@@ -151,7 +151,9 @@ function ReportPreview(props) {
     };
 
     const bankAccountRoute = ReportUtils.getBankAccountRoute(props.chatReport);
-    const shouldShowSettlementButton = !_.isEmpty(props.iouReport) && isCurrentUserManager && !iouSettled && !props.iouReport.isWaitingOnBankAccount && reportTotal !== 0;
+    const shouldShowSettlementButton = ReportUtils.isControlPolicyExpenseChat(props.chatReport)
+        ? ReportUtils.isReportApproved(props.iouReport) && !iouSettled
+        : !_.isEmpty(props.iouReport) && isCurrentUserManager && !iouSettled && !props.iouReport.isWaitingOnBankAccount && reportTotal !== 0;
 
     return (
         <View style={[styles.chatItemMessage, ...props.containerStyles]}>
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 0a14a9b034b0..f0d9154825fd 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -240,7 +240,12 @@ function canEditReportAction(reportAction) {
  */
 function isSettled(reportID) {
     const report = lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${reportID}`, {});
-    return !_.isEmpty(report) && !report.isWaitingOnBankAccount && report.stateNum > CONST.REPORT.STATE_NUM.PROCESSING;
+
+    if (_.isEmpty(report) || report.isWaitingOnBankAccount) {
+        return false;
+    }
+
+    return report.stateNum === CONST.REPORT.STATE_NUM.SUBMITTED && report.statusNum === CONST.REPORT.STATUS.REIMBURSED;
 }
 
 /**

From 03e95133cff73d8400baf504ef612d238844701e Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Wed, 23 Aug 2023 17:05:06 +0100
Subject: [PATCH 33/43] Clean up

---
 src/libs/ReportUtils.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 29c36f0db569..895f1163f1de 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -3201,7 +3201,6 @@ function getPolicyExpenseChatReportIDByOwner(policyOwner) {
     return expenseChat.reportID;
 }
 
->>>>>>> main
 /*
  * @param {Object|null} report
  * @returns {Boolean}

From ceff45ba404e3c083213aaefd47bccb1deca3d8c Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Wed, 23 Aug 2023 21:49:43 +0100
Subject: [PATCH 34/43] Apply suggestions from code review

Co-authored-by: Carlos Martins <cmartins@expensify.com>
---
 src/libs/ReportUtils.js | 2 +-
 src/libs/actions/IOU.js | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 895f1163f1de..78084ce2e24a 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -216,7 +216,7 @@ function isCompletedTaskReport(report) {
 }
 
 /**
- * Checks if the current user is the maanger of the supplied report
+ * Checks if the current user is the manager of the supplied report
  *
  * @param {Object} report
  * @returns {Boolean}
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 7ab90959bf44..6cd470bcacf4 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -768,7 +768,6 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
 
         // If this is a split between two people only and the function
         // wasn't provided with an existing group chat report id
-        //
         // or, if the split is being made from the workspace chat, then the oneOnOneChatReport is the same as the splitChatReport
         // in this case existingSplitChatReport will belong to the policy expense chat and we won't be
         // entering code that creates optimistic personal details
@@ -783,7 +782,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
         }
 
         // STEP 2: Get existing IOU/Expense report and update its total OR build a new optimistic one
-        // For Control policy expense chats, if the report is already apprvoed, create a new expense report
+        // For Control policy expense chats, if the report is already approved, create a new expense report
         let oneOnOneIOUReport = lodashGet(allReports, `${ONYXKEYS.COLLECTION.REPORT}${oneOnOneChatReport.iouReportID}`, undefined);
         const shouldCreateNewOneOnOneIOUReport =
             _.isUndefined(oneOnOneIOUReport) || (isOwnPolicyExpenseChat && ReportUtils.isControlPolicyExpenseReport(oneOnOneIOUReport) && ReportUtils.isReportApproved(oneOnOneIOUReport));

From 2e373a8a5c4a28c6215a7837ce4f31e83ad08b46 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Wed, 23 Aug 2023 22:14:46 +0100
Subject: [PATCH 35/43] Address PR comments

---
 src/components/MoneyReportHeader.js | 41 +++++++++++++----------------
 src/libs/actions/IOU.js             | 14 +++++-----
 2 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index edd041ae74ce..e7ec86edb5da 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -3,7 +3,7 @@ import {withOnyx} from 'react-native-onyx';
 import {View} from 'react-native';
 import PropTypes from 'prop-types';
 import lodashGet from 'lodash/get';
-import withLocalize from './withLocalize';
+import useLocalize from '../hooks/useLocalize';
 import HeaderWithBackButton from './HeaderWithBackButton';
 import iouReportPropTypes from '../pages/iouReportPropTypes';
 import * as ReportUtils from '../libs/ReportUtils';
@@ -55,26 +55,22 @@ const defaultProps = {
 };
 
 function MoneyReportHeader(props) {
+    const {translate} = useLocalize();
     const moneyRequestReport = props.report;
-    const policy = props.policies[`${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}`];
-    const reportTotal = ReportUtils.getMoneyRequestTotal(props.report);
-    const shouldShowSettlementButton = useMemo(() => {
-        if (ReportUtils.getPolicyType(moneyRequestReport, props.policies) === CONST.POLICY.TYPE.CORPORATE) {
-            return Policy.isAdminOfControlPolicy([policy]) && ReportUtils.isReportApproved(moneyRequestReport);
-        }
-
-        return (
-            (Policy.isAdminOfFreePolicy([policy]) ||
-                (ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(props.session, 'accountID', null) === moneyRequestReport.managerID)) &&
-            !ReportUtils.isSettled(moneyRequestReport.reportID)
-        );
-    }, [moneyRequestReport, policy, props.policies, props.session]);
-    const shouldShowApprovedButton = useMemo(() => {
-        if (ReportUtils.getPolicyType(moneyRequestReport) === CONST.POLICY.TYPE.FREE) {
+    const policy = props.policies[`${ONYXKEYS.COLLECTION.POLICY}${moneyRequestReport.policyID}`];
+    const isPolicyAdmin = policy.role === CONST.POLICY.ROLE.ADMIN;
+    const isManager = ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(props.session, 'accountID', null) === moneyRequestReport.managerID;
+    const isReportApproved = ReportUtils.isReportApproved(moneyRequestReport);
+    const isPayer = CONST.POLICY.TYPE.CORPORATE ? isPolicyAdmin && isReportApproved : isPolicyAdmin || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && isManager);
+    const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
+    const shouldShowSettlementButton = useMemo(() => isPayer && !isSettled, [isPayer, isSettled]);
+    const shouldShowApproveButton = useMemo(() => {
+        if (policy.type === CONST.POLICY.TYPE.FREE) {
             return false;
         }
-        return ReportUtils.isReportManager(moneyRequestReport) && !ReportUtils.isReportApproved(moneyRequestReport) && !ReportUtils.isSettled(moneyRequestReport.reportID);
-    }, [moneyRequestReport]);
+        return isManager && isReportApproved && !isSettled;
+    }, [policy, isManager, isReportApproved, isSettled]);
+    const reportTotal = ReportUtils.getMoneyRequestTotal(props.report);
     const bankAccountRoute = ReportUtils.getBankAccountRoute(props.chatReport);
     const shouldShowPaypal = Boolean(lodashGet(props.personalDetails, [moneyRequestReport.managerID, 'payPalMeAddress']));
     const formattedAmount = CurrencyUtils.convertToDisplayString(reportTotal, props.report.currency);
@@ -108,11 +104,11 @@ function MoneyReportHeader(props) {
                         />
                     </View>
                 )}
-                {shouldShowApprovedButton && !props.isSmallScreenWidth && (
+                {shouldShowApproveButton && !props.isSmallScreenWidth && (
                     <View style={[styles.pv2]}>
                         <Button
                             success
-                            text={props.translate('iou.approve')}
+                            text={translate('iou.approve')}
                             style={[styles.mnw120]}
                             onPress={() => IOU.approveMoneyRequest(props.report)}
                         />
@@ -135,11 +131,11 @@ function MoneyReportHeader(props) {
                     />
                 </View>
             )}
-            {shouldShowApprovedButton && props.isSmallScreenWidth && (
+            {shouldShowApproveButton && props.isSmallScreenWidth && (
                 <View style={[styles.pv2]}>
                     <Button
                         success
-                        text={props.translate('iou.approve')}
+                        text={translate('iou.approve')}
                         style={[styles.w100]}
                         onPress={() => IOU.approveMoneyRequest(props.report)}
                     />
@@ -154,7 +150,6 @@ MoneyReportHeader.propTypes = propTypes;
 MoneyReportHeader.defaultProps = defaultProps;
 
 export default compose(
-    withLocalize,
     withWindowDimensions,
     withOnyx({
         chatReport: {
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 6cd470bcacf4..0e139b9d443a 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -1674,14 +1674,14 @@ function sendMoneyViaPaypal(report, amount, currency, comment, managerID, recipi
 }
 
 function approveMoneyRequest(expenseReport) {
-    const optimisticIOUReportAction = ReportUtils.buildOptimisticApprovedReportAction(expenseReport.total, expenseReport.currency, expenseReport.reportID);
+    const optimisticApprovedReportAction = ReportUtils.buildOptimisticApprovedReportAction(expenseReport.total, expenseReport.currency, expenseReport.reportID);
 
     const optimisticReportActionsData = {
         onyxMethod: Onyx.METHOD.MERGE,
         key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
         value: {
-            [optimisticIOUReportAction.reportActionID]: {
-                ...optimisticIOUReportAction,
+            [optimisticApprovedReportAction.reportActionID]: {
+                ...optimisticApprovedReportAction,
                 pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
             },
         },
@@ -1691,8 +1691,8 @@ function approveMoneyRequest(expenseReport) {
         key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport.reportID}`,
         value: {
             ...expenseReport,
-            lastMessageText: optimisticIOUReportAction.message[0].text,
-            lastMessageHtml: optimisticIOUReportAction.message[0].html,
+            lastMessageText: optimisticApprovedReportAction.message[0].text,
+            lastMessageHtml: optimisticApprovedReportAction.message[0].html,
             stateNum: CONST.REPORT.STATE_NUM.SUBMITTED,
             statusNum: CONST.REPORT.STATUS.APPROVED,
         },
@@ -1704,7 +1704,7 @@ function approveMoneyRequest(expenseReport) {
             onyxMethod: Onyx.METHOD.MERGE,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${expenseReport.reportID}`,
             value: {
-                [optimisticIOUReportAction.reportActionID]: {
+                [optimisticApprovedReportAction.reportActionID]: {
                     pendingAction: null,
                 },
             },
@@ -1723,7 +1723,7 @@ function approveMoneyRequest(expenseReport) {
         },
     ];
 
-    API.write('ApproveMoneyRequest', {reportID: expenseReport.reportID, approvedReportActionID: optimisticIOUReportAction.reportActionID}, {optimisticData, successData, failureData});
+    API.write('ApproveMoneyRequest', {reportID: expenseReport.reportID, approvedReportActionID: optimisticApprovedReportAction.reportActionID}, {optimisticData, successData, failureData});
 }
 
 /**

From 95dc9e2cb3b9e9d98b9651f1d7b8f95a4c11ab6b Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Thu, 24 Aug 2023 17:09:13 +0100
Subject: [PATCH 36/43] Address comments

---
 src/components/MoneyReportHeader.js | 68 ++++++++++++++---------------
 src/libs/actions/Policy.js          | 11 -----
 2 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index e7ec86edb5da..fabe5e5a2a8b 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -17,7 +17,6 @@ import ONYXKEYS from '../ONYXKEYS';
 import CONST from '../CONST';
 import SettlementButton from './SettlementButton';
 import Button from './Button';
-import * as Policy from '../libs/actions/Policy';
 import * as IOU from '../libs/actions/IOU';
 import * as CurrencyUtils from '../libs/CurrencyUtils';
 import reportPropTypes from '../pages/reportPropTypes';
@@ -54,48 +53,47 @@ const defaultProps = {
     },
 };
 
-function MoneyReportHeader(props) {
+function MoneyReportHeader({session, personalDetails, policies, chatReport, report: moneyRequestReport, isSmallScreenWidth}) {
     const {translate} = useLocalize();
-    const moneyRequestReport = props.report;
-    const policy = props.policies[`${ONYXKEYS.COLLECTION.POLICY}${moneyRequestReport.policyID}`];
-    const isPolicyAdmin = policy.role === CONST.POLICY.ROLE.ADMIN;
-    const isManager = ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(props.session, 'accountID', null) === moneyRequestReport.managerID;
-    const isReportApproved = ReportUtils.isReportApproved(moneyRequestReport);
-    const isPayer = CONST.POLICY.TYPE.CORPORATE ? isPolicyAdmin && isReportApproved : isPolicyAdmin || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && isManager);
+    const policy = policies[`${ONYXKEYS.COLLECTION.POLICY}${moneyRequestReport.policyID}`];
+    const isApproved = ReportUtils.isReportApproved(moneyRequestReport);
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
+    const isPolicyAdmin = policy.role === CONST.POLICY.ROLE.ADMIN;
+    const isManager = ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(session, 'accountID', null) === moneyRequestReport.managerID;
+    const isPayer = CONST.POLICY.TYPE.CORPORATE ? isPolicyAdmin && isApproved : isPolicyAdmin || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && isManager);
     const shouldShowSettlementButton = useMemo(() => isPayer && !isSettled, [isPayer, isSettled]);
     const shouldShowApproveButton = useMemo(() => {
         if (policy.type === CONST.POLICY.TYPE.FREE) {
             return false;
         }
-        return isManager && isReportApproved && !isSettled;
-    }, [policy, isManager, isReportApproved, isSettled]);
-    const reportTotal = ReportUtils.getMoneyRequestTotal(props.report);
-    const bankAccountRoute = ReportUtils.getBankAccountRoute(props.chatReport);
-    const shouldShowPaypal = Boolean(lodashGet(props.personalDetails, [moneyRequestReport.managerID, 'payPalMeAddress']));
-    const formattedAmount = CurrencyUtils.convertToDisplayString(reportTotal, props.report.currency);
+        return isManager && !isApproved && !isSettled;
+    }, [policy, isManager, isApproved, isSettled]);
+    const reportTotal = ReportUtils.getMoneyRequestTotal(moneyRequestReport);
+    const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
+    const shouldShowPaypal = Boolean(lodashGet(personalDetails, [moneyRequestReport.managerID, 'payPalMeAddress']));
+    const formattedAmount = CurrencyUtils.convertToDisplayString(reportTotal, moneyRequestReport.currency);
 
     return (
         <View style={[styles.pt0]}>
             <HeaderWithBackButton
                 shouldShowAvatarWithDisplay
                 shouldShowPinButton={false}
-                report={props.report}
+                report={moneyRequestReport}
                 policies={props.policies}
-                personalDetails={props.personalDetails}
-                shouldShowBackButton={props.isSmallScreenWidth}
+                personalDetails={personalDetails}
+                shouldShowBackButton={isSmallScreenWidth}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.HOME, false, true)}
-                shouldShowBorderBottom={!shouldShowSettlementButton || !props.isSmallScreenWidth}
+                shouldShowBorderBottom={!shouldShowSettlementButton || !isSmallScreenWidth}
             >
-                {shouldShowSettlementButton && !props.isSmallScreenWidth && (
+                {shouldShowSettlementButton && !isSmallScreenWidth && (
                     <View style={[styles.pv2]}>
                         <SettlementButton
-                            currency={props.report.currency}
-                            policyID={props.report.policyID}
+                            currency={moneyRequestReport.currency}
+                            policyID={moneyRequestReport.policyID}
                             shouldShowPaypal={shouldShowPaypal}
-                            chatReportID={props.chatReport.reportID}
-                            iouReport={props.report}
-                            onPress={(paymentType) => IOU.payMoneyRequest(paymentType, props.chatReport, props.report)}
+                            chatReportID={chatReport.reportID}
+                            iouReport={moneyRequestReport}
+                            onPress={(paymentType) => IOU.payMoneyRequest(paymentType, chatReport, moneyRequestReport)}
                             enablePaymentsRoute={ROUTES.BANK_ACCOUNT_NEW}
                             addBankAccountRoute={bankAccountRoute}
                             shouldShowPaymentOptions
@@ -104,26 +102,26 @@ function MoneyReportHeader(props) {
                         />
                     </View>
                 )}
-                {shouldShowApproveButton && !props.isSmallScreenWidth && (
+                {shouldShowApproveButton && !isSmallScreenWidth && (
                     <View style={[styles.pv2]}>
                         <Button
                             success
                             text={translate('iou.approve')}
                             style={[styles.mnw120]}
-                            onPress={() => IOU.approveMoneyRequest(props.report)}
+                            onPress={() => IOU.approveMoneyRequest(moneyRequestReport)}
                         />
                     </View>
                 )}
             </HeaderWithBackButton>
-            {shouldShowSettlementButton && props.isSmallScreenWidth && (
-                <View style={[styles.ph5, styles.pb2, props.isSmallScreenWidth && styles.borderBottom]}>
+            {shouldShowSettlementButton && isSmallScreenWidth && (
+                <View style={[styles.ph5, styles.pb2, isSmallScreenWidth && styles.borderBottom]}>
                     <SettlementButton
-                        currency={props.report.currency}
-                        policyID={props.report.policyID}
+                        currency={moneyRequestReport.currency}
+                        policyID={moneyRequestReport.policyID}
                         shouldShowPaypal={shouldShowPaypal}
-                        chatReportID={props.report.chatReportID}
-                        iouReport={props.report}
-                        onPress={(paymentType) => IOU.payMoneyRequest(paymentType, props.chatReport, props.report)}
+                        chatReportID={moneyRequestReport.chatReportID}
+                        iouReport={moneyRequestReport}
+                        onPress={(paymentType) => IOU.payMoneyRequest(paymentType, chatReport, moneyRequestReportt)}
                         enablePaymentsRoute={ROUTES.BANK_ACCOUNT_NEW}
                         addBankAccountRoute={bankAccountRoute}
                         shouldShowPaymentOptions
@@ -131,13 +129,13 @@ function MoneyReportHeader(props) {
                     />
                 </View>
             )}
-            {shouldShowApproveButton && props.isSmallScreenWidth && (
+            {shouldShowApproveButton && isSmallScreenWidth && (
                 <View style={[styles.pv2]}>
                     <Button
                         success
                         text={translate('iou.approve')}
                         style={[styles.w100]}
-                        onPress={() => IOU.approveMoneyRequest(props.report)}
+                        onPress={() => IOU.approveMoneyRequest(moneyRequestReport)}
                     />
                 </View>
             )}
diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
index 51e5c827fe14..87c77e722a5c 100644
--- a/src/libs/actions/Policy.js
+++ b/src/libs/actions/Policy.js
@@ -154,16 +154,6 @@ function isAdminOfFreePolicy(policies) {
     return _.some(policies, (policy) => policy && policy.type === CONST.POLICY.TYPE.FREE && policy.role === CONST.POLICY.ROLE.ADMIN);
 }
 
-/**
- * Is the user an admin of a corporate policy
- *
- * @param {Array} policies
- * @returns {Boolean}
- */
-function isAdminOfControlPolicy(policies) {
-    return _.some(policies, (policy) => policy && policy.type === CONST.POLICY.TYPE.CORPORATE && policy.role === CONST.POLICY.ROLE.ADMIN);
-}
-
 /**
  * Check if the user has any active free policies (aka workspaces)
  *
@@ -1179,7 +1169,6 @@ export {
     removeMembers,
     addMembersToWorkspace,
     isAdminOfFreePolicy,
-    isAdminOfControlPolicy,
     hasActiveFreePolicy,
     setWorkspaceErrors,
     clearCustomUnitErrors,

From 15ab6982975d5351693c0dc0a9084f8bcbb935f9 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Thu, 24 Aug 2023 17:26:45 +0100
Subject: [PATCH 37/43] Only display "Pay" button for the admin in the report
 preview

---
 src/components/MoneyReportHeader.js              |  2 +-
 src/components/ReportActionItem/ReportPreview.js | 11 +++++++++--
 src/pages/home/report/ReportActionItem.js        |  1 +
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index fabe5e5a2a8b..11bc557888ff 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -79,7 +79,7 @@ function MoneyReportHeader({session, personalDetails, policies, chatReport, repo
                 shouldShowAvatarWithDisplay
                 shouldShowPinButton={false}
                 report={moneyRequestReport}
-                policies={props.policies}
+                policies={policies}
                 personalDetails={personalDetails}
                 shouldShowBackButton={isSmallScreenWidth}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.HOME, false, true)}
diff --git a/src/components/ReportActionItem/ReportPreview.js b/src/components/ReportActionItem/ReportPreview.js
index 0ff062c0583f..9611ebb30d30 100644
--- a/src/components/ReportActionItem/ReportPreview.js
+++ b/src/components/ReportActionItem/ReportPreview.js
@@ -11,6 +11,7 @@ import styles from '../../styles/styles';
 import reportActionPropTypes from '../../pages/home/report/reportActionPropTypes';
 import withLocalize, {withLocalizePropTypes} from '../withLocalize';
 import compose from '../../libs/compose';
+import CONST from '../../CONST';
 import ONYXKEYS from '../../ONYXKEYS';
 import ControlSelection from '../../libs/ControlSelection';
 import * as DeviceCapabilities from '../../libs/DeviceCapabilities';
@@ -41,6 +42,9 @@ const propTypes = {
     // eslint-disable-next-line react/no-unused-prop-types
     iouReportID: PropTypes.string.isRequired,
 
+    /** The report's policyID, used for Onyx subscription */
+    policyID: PropTypes.string.isRequired,
+
     /* Onyx Props */
     /** chatReport associated with iouReport */
     chatReport: reportPropTypes,
@@ -152,7 +156,7 @@ function ReportPreview(props) {
 
     const bankAccountRoute = ReportUtils.getBankAccountRoute(props.chatReport);
     const shouldShowSettlementButton = ReportUtils.isControlPolicyExpenseChat(props.chatReport)
-        ? ReportUtils.isReportApproved(props.iouReport) && !iouSettled
+        ? props.policy.role === CONST.POLICY.ROLE.ADMIN && ReportUtils.isReportApproved(props.iouReport) && !iouSettled
         : !_.isEmpty(props.iouReport) && isCurrentUserManager && !iouSettled && !props.iouReport.isWaitingOnBankAccount && reportTotal !== 0;
 
     return (
@@ -207,7 +211,7 @@ function ReportPreview(props) {
                         {shouldShowSettlementButton && (
                             <SettlementButton
                                 currency={props.iouReport.currency}
-                                policyID={props.iouReport.policyID}
+                                policyID={props.policyID}
                                 chatReportID={props.chatReportID}
                                 iouReport={props.iouReport}
                                 onPress={(paymentType) => IOU.payMoneyRequest(paymentType, props.chatReport, props.iouReport)}
@@ -230,6 +234,9 @@ ReportPreview.displayName = 'ReportPreview';
 export default compose(
     withLocalize,
     withOnyx({
+        policy: {
+            key: ({policyID}) => `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
+        },
         chatReport: {
             key: ({chatReportID}) => `${ONYXKEYS.COLLECTION.REPORT}${chatReportID}`,
         },
diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 560f23e32b9c..4de35984100f 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -278,6 +278,7 @@ function ReportActionItem(props) {
                 <ReportPreview
                     iouReportID={ReportActionsUtils.getIOUReportIDFromReportActionPreview(props.action)}
                     chatReportID={props.report.reportID}
+                    policyID={props.report.policyID}
                     containerStyles={props.displayAsGroup ? [] : [styles.mt2]}
                     action={props.action}
                     isHovered={hovered}

From e7c48045f58f3794500164ed620f828a0f659f31 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Thu, 24 Aug 2023 20:10:07 +0100
Subject: [PATCH 38/43] Optimise how policy is passed to money request
 componenets

---
 src/components/AvatarWithDisplayName.js           |  8 ++++----
 .../headerWithBackButtonPropTypes.js              |  4 ++--
 src/components/HeaderWithBackButton/index.js      |  4 ++--
 src/components/MoneyReportHeader.js               | 15 ++++++++++-----
 src/components/MoneyRequestHeader.js              | 11 +++++------
 src/pages/home/ReportScreen.js                    |  4 ++--
 6 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/components/AvatarWithDisplayName.js b/src/components/AvatarWithDisplayName.js
index 2fe1b3b7c57f..cbc34d6f9d47 100644
--- a/src/components/AvatarWithDisplayName.js
+++ b/src/components/AvatarWithDisplayName.js
@@ -26,8 +26,8 @@ const propTypes = {
     /** The report currently being looked at */
     report: reportPropTypes,
 
-    /** The policies which the user has access to and which the report could be tied to */
-    policies: PropTypes.shape({
+    /** The policy which the user has access to and which the report is tied to */
+    policy: PropTypes.shape({
         /** Name of the policy */
         name: PropTypes.string,
     }),
@@ -47,7 +47,7 @@ const propTypes = {
 
 const defaultProps = {
     personalDetails: {},
-    policies: {},
+    policy: {},
     report: {},
     isAnonymous: false,
     size: CONST.AVATAR_SIZE.DEFAULT,
@@ -72,7 +72,7 @@ function AvatarWithDisplayName(props) {
     const subtitle = ReportUtils.getChatRoomSubtitle(props.report);
     const parentNavigationSubtitleData = ReportUtils.getParentNavigationSubtitle(props.report);
     const isMoneyRequestOrReport = ReportUtils.isMoneyRequestReport(props.report) || ReportUtils.isMoneyRequest(props.report);
-    const icons = ReportUtils.getIcons(props.report, props.personalDetails, props.policies, true);
+    const icons = ReportUtils.getIcons(props.report, props.personalDetails, props.policy, true);
     const ownerPersonalDetails = OptionsListUtils.getPersonalDetailsForAccountIDs([props.report.ownerAccountID], props.personalDetails);
     const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(_.values(ownerPersonalDetails), false);
     const shouldShowSubscriptAvatar = ReportUtils.shouldReportShowSubscript(props.report);
diff --git a/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js b/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js
index a5f1c81823b0..800ad7e334a2 100644
--- a/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js
+++ b/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js
@@ -73,8 +73,8 @@ const propTypes = {
     /** Report, if we're showing the details for one and using AvatarWithDisplay */
     report: iouReportPropTypes,
 
-    /** Policies, if we're showing the details for a report and need info about it for AvatarWithDisplay */
-    policies: PropTypes.shape({
+    /** The report's poolicy, if we're showing the details for a report and need info about it for AvatarWithDisplay */
+    policy: PropTypes.shape({
         /** Name of the policy */
         name: PropTypes.string,
     }),
diff --git a/src/components/HeaderWithBackButton/index.js b/src/components/HeaderWithBackButton/index.js
index 6e6164f4c4fc..bbf905cc1ac2 100755
--- a/src/components/HeaderWithBackButton/index.js
+++ b/src/components/HeaderWithBackButton/index.js
@@ -27,7 +27,7 @@ function HeaderWithBackButton({
     onDownloadButtonPress = () => {},
     onThreeDotsButtonPress = () => {},
     report = null,
-    policies = {},
+    policy = {},
     personalDetails = {},
     shouldShowAvatarWithDisplay = false,
     shouldShowBackButton = true,
@@ -77,7 +77,7 @@ function HeaderWithBackButton({
                 {shouldShowAvatarWithDisplay && (
                     <AvatarWithDisplayName
                         report={report}
-                        policies={policies}
+                        policy={policy}
                         personalDetails={personalDetails}
                     />
                 )}
diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 11bc557888ff..03d5d457b2c9 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -25,10 +25,16 @@ const propTypes = {
     /** The report currently being looked at */
     report: iouReportPropTypes.isRequired,
 
-    /** The policies which the user has access to and which the report could be tied to */
-    policies: PropTypes.shape({
+    /** The policy tied to the money request report */
+    policy: PropTypes.shape({
         /** Name of the policy */
         name: PropTypes.string,
+
+        /** Type of the policy */
+        type: PropTypes.string,
+
+        /** The role of the current user in the policy */
+        role: PropTypes.string,
     }).isRequired,
 
     /** The chat report this report is linked to */
@@ -53,9 +59,8 @@ const defaultProps = {
     },
 };
 
-function MoneyReportHeader({session, personalDetails, policies, chatReport, report: moneyRequestReport, isSmallScreenWidth}) {
+function MoneyReportHeader({session, personalDetails, policy, chatReport, report: moneyRequestReport, isSmallScreenWidth}) {
     const {translate} = useLocalize();
-    const policy = policies[`${ONYXKEYS.COLLECTION.POLICY}${moneyRequestReport.policyID}`];
     const isApproved = ReportUtils.isReportApproved(moneyRequestReport);
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
     const isPolicyAdmin = policy.role === CONST.POLICY.ROLE.ADMIN;
@@ -79,7 +84,7 @@ function MoneyReportHeader({session, personalDetails, policies, chatReport, repo
                 shouldShowAvatarWithDisplay
                 shouldShowPinButton={false}
                 report={moneyRequestReport}
-                policies={policies}
+                policy={policy}
                 personalDetails={personalDetails}
                 shouldShowBackButton={isSmallScreenWidth}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.HOME, false, true)}
diff --git a/src/components/MoneyRequestHeader.js b/src/components/MoneyRequestHeader.js
index 60d8a121d4bb..ae1db5fb3711 100644
--- a/src/components/MoneyRequestHeader.js
+++ b/src/components/MoneyRequestHeader.js
@@ -29,8 +29,8 @@ const propTypes = {
     /** The expense report or iou report (only will have a value if this is a transaction thread) */
     parentReport: iouReportPropTypes,
 
-    /** The policies which the user has access to and which the report could be tied to */
-    policies: PropTypes.shape({
+    /** The policy which the report is tied to */
+    policy: PropTypes.shape({
         /** Name of the policy */
         name: PropTypes.string,
     }).isRequired,
@@ -59,9 +59,8 @@ function MoneyRequestHeader(props) {
     const [isDeleteModalVisible, setIsDeleteModalVisible] = useState(false);
     const moneyRequestReport = props.parentReport;
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
-    const policy = props.policies[`${ONYXKEYS.COLLECTION.POLICY}${props.report.policyID}`];
     const isPayer =
-        Policy.isAdminOfFreePolicy([policy]) || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(props.session, 'accountID', null) === moneyRequestReport.managerID);
+        Policy.isAdminOfFreePolicy([props.policy]) || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(props.session, 'accountID', null) === moneyRequestReport.managerID);
     const report = props.report;
     report.ownerAccountID = lodashGet(props, ['parentReport', 'ownerAccountID'], null);
     report.ownerEmail = lodashGet(props, ['parentReport', 'ownerEmail'], '');
@@ -91,7 +90,7 @@ function MoneyRequestHeader(props) {
                     ]}
                     threeDotsAnchorPosition={styles.threeDotsPopoverOffsetNoCloseButton(props.windowWidth)}
                     report={report}
-                    policies={props.policies}
+                    policy={props.policy}
                     personalDetails={props.personalDetails}
                     shouldShowBackButton={props.isSmallScreenWidth}
                     onBackButtonPress={() => Navigation.goBack(ROUTES.HOME, false, true)}
@@ -123,7 +122,7 @@ export default compose(
             key: ONYXKEYS.SESSION,
         },
         parentReport: {
-            key: (props) => `${ONYXKEYS.COLLECTION.REPORT}${props.report.parentReportID}`,
+            key: ({report}) => `${ONYXKEYS.COLLECTION.REPORT}${report.parentReportID}`,
         },
     }),
 )(MoneyRequestHeader);
diff --git a/src/pages/home/ReportScreen.js b/src/pages/home/ReportScreen.js
index 411b5f3fecef..9ea44fa7a91e 100644
--- a/src/pages/home/ReportScreen.js
+++ b/src/pages/home/ReportScreen.js
@@ -260,7 +260,7 @@ class ReportScreen extends React.Component {
             headerView = (
                 <MoneyRequestHeader
                     report={this.props.report}
-                    policies={this.props.policies}
+                    policy={policy}
                     personalDetails={this.props.personalDetails}
                     isSingleTransactionView={isSingleTransactionView}
                     parentReportAction={parentReportAction}
@@ -272,7 +272,7 @@ class ReportScreen extends React.Component {
             headerView = (
                 <MoneyReportHeader
                     report={this.props.report}
-                    policies={this.props.policies}
+                    policy={policy}
                     personalDetails={this.props.personalDetails}
                     isSingleTransactionView={isSingleTransactionView}
                     parentReportAction={parentReportAction}

From 66b6724fe4522d15fd6a24b541c8394e1ddb0282 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sat, 26 Aug 2023 01:03:38 +0100
Subject: [PATCH 39/43] Bug fix

---
 src/components/MoneyReportHeader.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 03d5d457b2c9..5b0d2bc073f8 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -63,12 +63,13 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
     const {translate} = useLocalize();
     const isApproved = ReportUtils.isReportApproved(moneyRequestReport);
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
-    const isPolicyAdmin = policy.role === CONST.POLICY.ROLE.ADMIN;
+    const isPolicyAdmin = lodashGet(policy, 'role') === CONST.POLICY.ROLE.ADMIN;
     const isManager = ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(session, 'accountID', null) === moneyRequestReport.managerID;
-    const isPayer = CONST.POLICY.TYPE.CORPORATE ? isPolicyAdmin && isApproved : isPolicyAdmin || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && isManager);
+    const policyType = lodashGet(policy, 'type');
+    const isPayer = policyType === CONST.POLICY.TYPE.CORPORATE ? isPolicyAdmin && isApproved : isPolicyAdmin || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && isManager);
     const shouldShowSettlementButton = useMemo(() => isPayer && !isSettled, [isPayer, isSettled]);
     const shouldShowApproveButton = useMemo(() => {
-        if (policy.type === CONST.POLICY.TYPE.FREE) {
+        if (policyType === CONST.POLICY.TYPE.FREE) {
             return false;
         }
         return isManager && !isApproved && !isSettled;

From 4833ce40b2d58a3059491f2cd54f8b514fb8be7a Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Sat, 26 Aug 2023 02:05:46 +0100
Subject: [PATCH 40/43] Another bug fix

---
 src/components/MoneyReportHeader.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 5b0d2bc073f8..c23dcbd41ec5 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -63,9 +63,9 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
     const {translate} = useLocalize();
     const isApproved = ReportUtils.isReportApproved(moneyRequestReport);
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
-    const isPolicyAdmin = lodashGet(policy, 'role') === CONST.POLICY.ROLE.ADMIN;
-    const isManager = ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(session, 'accountID', null) === moneyRequestReport.managerID;
     const policyType = lodashGet(policy, 'type');
+    const isPolicyAdmin = policyType !== CONST.POLICY.TYPE.PERSONAL && lodashGet(policy, 'role') === CONST.POLICY.ROLE.ADMIN;
+    const isManager = ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(session, 'accountID', null) === moneyRequestReport.managerID;
     const isPayer = policyType === CONST.POLICY.TYPE.CORPORATE ? isPolicyAdmin && isApproved : isPolicyAdmin || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && isManager);
     const shouldShowSettlementButton = useMemo(() => isPayer && !isSettled, [isPayer, isSettled]);
     const shouldShowApproveButton = useMemo(() => {
@@ -73,7 +73,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
             return false;
         }
         return isManager && !isApproved && !isSettled;
-    }, [policy, isManager, isApproved, isSettled]);
+    }, [policyType, isManager, isApproved, isSettled]);
     const reportTotal = ReportUtils.getMoneyRequestTotal(moneyRequestReport);
     const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
     const shouldShowPaypal = Boolean(lodashGet(personalDetails, [moneyRequestReport.managerID, 'payPalMeAddress']));
@@ -127,7 +127,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                         shouldShowPaypal={shouldShowPaypal}
                         chatReportID={moneyRequestReport.chatReportID}
                         iouReport={moneyRequestReport}
-                        onPress={(paymentType) => IOU.payMoneyRequest(paymentType, chatReport, moneyRequestReportt)}
+                        onPress={(paymentType) => IOU.payMoneyRequest(paymentType, chatReport, moneyRequestReport)}
                         enablePaymentsRoute={ROUTES.BANK_ACCOUNT_NEW}
                         addBankAccountRoute={bankAccountRoute}
                         shouldShowPaymentOptions

From 575524c47efd78cdf1f18a3a40f04a54dcbfb036 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Mon, 28 Aug 2023 21:53:31 +0100
Subject: [PATCH 41/43] Apply suggestions from code review

Co-authored-by: Carlos Martins <cmartins@expensify.com>
Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>
---
 .../HeaderWithBackButton/headerWithBackButtonPropTypes.js       | 2 +-
 src/libs/ReportUtils.js                                         | 1 -
 src/libs/actions/IOU.js                                         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js b/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js
index 800ad7e334a2..d2cdc5b29898 100644
--- a/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js
+++ b/src/components/HeaderWithBackButton/headerWithBackButtonPropTypes.js
@@ -73,7 +73,7 @@ const propTypes = {
     /** Report, if we're showing the details for one and using AvatarWithDisplay */
     report: iouReportPropTypes,
 
-    /** The report's poolicy, if we're showing the details for a report and need info about it for AvatarWithDisplay */
+    /** The report's policy, if we're showing the details for a report and need info about it for AvatarWithDisplay */
     policy: PropTypes.shape({
         /** Name of the policy */
         name: PropTypes.string,
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 97db46934221..4734b4f003ec 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -124,7 +124,6 @@ function getPolicyName(report, returnEmptyIfNotFound = false, policy = undefined
 
     // Public rooms send back the policy name with the reportSummary,
     // since they can also be accessed by people who aren't in the workspace
-
     return lodashGet(finalPolicy, 'name') || report.policyName || report.oldPolicyName || noPolicyFound;
 }
 
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index 82930259b850..3e76035cdcf0 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -792,7 +792,7 @@ function createSplitsAndOnyxData(participants, currentUserLogin, currentUserAcco
                 ? ReportUtils.buildOptimisticExpenseReport(oneOnOneChatReport.reportID, oneOnOneChatReport.policyID, currentUserAccountID, splitAmount, currency)
                 : ReportUtils.buildOptimisticIOUReport(currentUserAccountID, accountID, splitAmount, oneOnOneChatReport.reportID, currency);
         } else if (isOwnPolicyExpenseChat) {
-            // Because of the Expense reports are stored as negative values, we substract the total from the amount
+            // Because of the Expense reports are stored as negative values, we subtract the total from the amount
             oneOnOneIOUReport.total -= splitAmount;
         } else {
             oneOnOneIOUReport = IOUUtils.updateIOUOwnerAndTotal(oneOnOneIOUReport, currentUserAccountID, splitAmount, currency);

From b341aa11b0e68e59884e0c54e581bbc932656ad9 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Mon, 28 Aug 2023 22:56:11 +0100
Subject: [PATCH 42/43] Address PR comments

---
 src/components/MoneyReportHeader.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index c23dcbd41ec5..88fa81c7c77a 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -67,9 +67,12 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
     const isPolicyAdmin = policyType !== CONST.POLICY.TYPE.PERSONAL && lodashGet(policy, 'role') === CONST.POLICY.ROLE.ADMIN;
     const isManager = ReportUtils.isMoneyRequestReport(moneyRequestReport) && lodashGet(session, 'accountID', null) === moneyRequestReport.managerID;
     const isPayer = policyType === CONST.POLICY.TYPE.CORPORATE ? isPolicyAdmin && isApproved : isPolicyAdmin || (ReportUtils.isMoneyRequestReport(moneyRequestReport) && isManager);
-    const shouldShowSettlementButton = useMemo(() => isPayer && !isSettled, [isPayer, isSettled]);
+    const shouldShowSettlementButton = useMemo(
+        () => isPayer && !isSettled && !moneyRequestReport.isWaitingOnBankAccount && reportTotal !== 0,
+        [isPayer, isSettled, moneyRequestReport, reportTotal],
+    );
     const shouldShowApproveButton = useMemo(() => {
-        if (policyType === CONST.POLICY.TYPE.FREE) {
+        if (policyType !== CONST.POLICY.TYPE.CORPORATE) {
             return false;
         }
         return isManager && !isApproved && !isSettled;

From 577d9ad1b1bf44d081fd76b305f495f14229a8a3 Mon Sep 17 00:00:00 2001
From: Youssef Lourayad <youssef@expensify.com>
Date: Mon, 28 Aug 2023 23:09:02 +0100
Subject: [PATCH 43/43] Fix lint and approve button style

---
 src/components/MoneyReportHeader.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 88fa81c7c77a..7e6cc78ebd13 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -61,6 +61,7 @@ const defaultProps = {
 
 function MoneyReportHeader({session, personalDetails, policy, chatReport, report: moneyRequestReport, isSmallScreenWidth}) {
     const {translate} = useLocalize();
+    const reportTotal = ReportUtils.getMoneyRequestTotal(moneyRequestReport);
     const isApproved = ReportUtils.isReportApproved(moneyRequestReport);
     const isSettled = ReportUtils.isSettled(moneyRequestReport.reportID);
     const policyType = lodashGet(policy, 'type');
@@ -77,7 +78,6 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
         }
         return isManager && !isApproved && !isSettled;
     }, [policyType, isManager, isApproved, isSettled]);
-    const reportTotal = ReportUtils.getMoneyRequestTotal(moneyRequestReport);
     const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
     const shouldShowPaypal = Boolean(lodashGet(personalDetails, [moneyRequestReport.managerID, 'payPalMeAddress']));
     const formattedAmount = CurrencyUtils.convertToDisplayString(reportTotal, moneyRequestReport.currency);
@@ -115,8 +115,9 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                     <View style={[styles.pv2]}>
                         <Button
                             success
+                            medium
                             text={translate('iou.approve')}
-                            style={[styles.mnw120]}
+                            style={[styles.mnw120, styles.pv2, styles.pr0]}
                             onPress={() => IOU.approveMoneyRequest(moneyRequestReport)}
                         />
                     </View>
@@ -139,11 +140,12 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                 </View>
             )}
             {shouldShowApproveButton && isSmallScreenWidth && (
-                <View style={[styles.pv2]}>
+                <View style={[styles.ph5, styles.pb2, isSmallScreenWidth && styles.borderBottom]}>
                     <Button
                         success
+                        medium
                         text={translate('iou.approve')}
-                        style={[styles.w100]}
+                        style={[styles.w100, styles.pr0]}
                         onPress={() => IOU.approveMoneyRequest(moneyRequestReport)}
                     />
                 </View>