From 45f9fd667e9481568d2284fc4922d38e5767e03f Mon Sep 17 00:00:00 2001
From: Ana Margarida Silva <ana.margarida.silva@callstack.com>
Date: Fri, 6 Oct 2023 11:25:48 +0100
Subject: [PATCH 1/5] feat: show submit button in MoneyReportHeader when report
 is in draft/open state

---
 src/components/MoneyReportHeader.js | 32 +++++++++++++++++++++++++----
 src/languages/en.ts                 |  1 +
 src/languages/es.ts                 |  1 +
 src/libs/ReportUtils.js             |  9 ++++++++
 src/libs/actions/IOU.js             |  5 +++++
 5 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index dded77d5e30f..65f2732adbcd 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -69,16 +69,18 @@ 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 isDraft = ReportUtils.isReportDraft(moneyRequestReport);
     const shouldShowSettlementButton = useMemo(
-        () => isPayer && !isSettled && !moneyRequestReport.isWaitingOnBankAccount && reportTotal !== 0 && !ReportUtils.isArchivedRoom(chatReport),
-        [isPayer, isSettled, moneyRequestReport, reportTotal, chatReport],
+        () => isPayer && !isDraft && !isSettled && !moneyRequestReport.isWaitingOnBankAccount && reportTotal !== 0 && !ReportUtils.isArchivedRoom(chatReport),
+        [isPayer, isDraft, isSettled, moneyRequestReport, reportTotal, chatReport],
     );
     const shouldShowApproveButton = useMemo(() => {
         if (policyType !== CONST.POLICY.TYPE.CORPORATE) {
             return false;
         }
-        return isManager && !isApproved && !isSettled;
-    }, [policyType, isManager, isApproved, isSettled]);
+        return isManager && !isDraft && !isApproved && !isSettled;
+    }, [policyType, isManager, isDraft, isApproved, isSettled]);
+    const shouldShowSubmitButton = isDraft;
     const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
     const formattedAmount = CurrencyUtils.convertToDisplayString(reportTotal, moneyRequestReport.currency);
 
@@ -126,6 +128,17 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                         />
                     </View>
                 )}
+                {shouldShowSubmitButton && !isSmallScreenWidth && (
+                    <View style={[styles.pv2]}>
+                        <Button
+                            success
+                            medium
+                            text={translate('common.submit')}
+                            style={[styles.mnw120, styles.pv2, styles.pr0]}
+                            onPress={() => IOU.submitReport(moneyRequestReport)}
+                        />
+                    </View>
+                )}
             </HeaderWithBackButton>
             {shouldShowSettlementButton && isSmallScreenWidth && (
                 <View style={[styles.ph5, styles.pb2, isSmallScreenWidth && styles.borderBottom]}>
@@ -153,6 +166,17 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                     />
                 </View>
             )}
+            {shouldShowSubmitButton && isSmallScreenWidth && (
+                <View style={[styles.ph5, styles.pb2, isSmallScreenWidth && styles.borderBottom]}>
+                    <Button
+                        success
+                        medium
+                        text={translate('common.submit')}
+                        style={[styles.w100, styles.pr0]}
+                        onPress={() => IOU.submitReport(moneyRequestReport)}
+                    />
+                </View>
+            )}
         </View>
     );
 }
diff --git a/src/languages/en.ts b/src/languages/en.ts
index 7e4c4d0c45e2..0d7d9605509c 100755
--- a/src/languages/en.ts
+++ b/src/languages/en.ts
@@ -108,6 +108,7 @@ export default {
         resend: 'Resend',
         save: 'Save',
         saveChanges: 'Save changes',
+        submit: 'Submit',
         rotate: 'Rotate',
         zoom: 'Zoom',
         password: 'Password',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 2c4b3e56523c..ee0574774b32 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -98,6 +98,7 @@ export default {
         resend: 'Reenviar',
         save: 'Guardar',
         saveChanges: 'Guardar cambios',
+        submit: 'Enviar',
         rotate: 'Rotar',
         zoom: 'Zoom',
         password: 'Contraseña',
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index 7d3e1a2b7098..ef9fb053309d 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -3769,6 +3769,14 @@ function getIOUReportActionDisplayMessage(reportAction) {
     return displayMessage;
 }
 
+/**
+ * @param {Object} report
+ * @returns {Boolean}
+ */
+function isReportDraft(report) {
+    return lodashGet(report, 'stateNum') === CONST.REPORT.STATE_NUM.OPEN && lodashGet(report, 'statusNum') === CONST.REPORT.STATUS.OPEN;
+}
+
 export {
     getReportParticipantsTitle,
     isReportMessageAttachment,
@@ -3912,4 +3920,5 @@ export {
     hasMissingSmartscanFields,
     getIOUReportActionDisplayMessage,
     isWaitingForTaskCompleteFromAssignee,
+    isReportDraft,
 };
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index b6f193ceeef4..eb44491eb7eb 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -2302,6 +2302,10 @@ function navigateToNextPage(iou, iouType, report, path = '') {
     Navigation.navigate(ROUTES.MONEY_REQUEST_PARTICIPANTS.getRoute(iouType));
 }
 
+function submitReport() {
+    // TODO: this will be done in the future, part of wave 6: drafts
+}
+
 export {
     createDistanceRequest,
     editMoneyRequest,
@@ -2332,4 +2336,5 @@ export {
     navigateToNextPage,
     updateDistanceRequest,
     replaceReceipt,
+    submitReport,
 };

From 2eca6a1f18fd10167d1c384be63db4ed126e357d Mon Sep 17 00:00:00 2001
From: Ana Margarida Silva <ana.margarida.silva@callstack.com>
Date: Fri, 6 Oct 2023 11:38:01 +0100
Subject: [PATCH 2/5] fix: small fix on showing border

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

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 65f2732adbcd..5da96cf3b096 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -81,6 +81,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
         return isManager && !isDraft && !isApproved && !isSettled;
     }, [policyType, isManager, isDraft, isApproved, isSettled]);
     const shouldShowSubmitButton = isDraft;
+    const shouldShowAnyButton = shouldShowSettlementButton || shouldShowApproveButton || shouldShowSubmitButton;
     const bankAccountRoute = ReportUtils.getBankAccountRoute(chatReport);
     const formattedAmount = CurrencyUtils.convertToDisplayString(reportTotal, moneyRequestReport.currency);
 
@@ -95,7 +96,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                 personalDetails={personalDetails}
                 shouldShowBackButton={isSmallScreenWidth}
                 onBackButtonPress={() => Navigation.goBack(ROUTES.HOME, false, true)}
-                shouldShowBorderBottom={!shouldShowSettlementButton || !isSmallScreenWidth}
+                shouldShowBorderBottom={!shouldShowAnyButton || !isSmallScreenWidth}
             >
                 {shouldShowSettlementButton && !isSmallScreenWidth && (
                     <View style={[styles.pv2]}>

From 687ab6d0b9350bb475ea1153741f26f6b2e60247 Mon Sep 17 00:00:00 2001
From: Ana Margarida Silva <ana.margarida.silva@callstack.com>
Date: Fri, 6 Oct 2023 12:33:28 +0100
Subject: [PATCH 3/5] refactor: remove brackets

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

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 5da96cf3b096..154919f5c3f2 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -99,7 +99,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                 shouldShowBorderBottom={!shouldShowAnyButton || !isSmallScreenWidth}
             >
                 {shouldShowSettlementButton && !isSmallScreenWidth && (
-                    <View style={[styles.pv2]}>
+                    <View style={styles.pv2}>
                         <SettlementButton
                             currency={moneyRequestReport.currency}
                             policyID={moneyRequestReport.policyID}
@@ -119,7 +119,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                     </View>
                 )}
                 {shouldShowApproveButton && !isSmallScreenWidth && (
-                    <View style={[styles.pv2]}>
+                    <View style={styles.pv2}>
                         <Button
                             success
                             medium
@@ -130,7 +130,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                     </View>
                 )}
                 {shouldShowSubmitButton && !isSmallScreenWidth && (
-                    <View style={[styles.pv2]}>
+                    <View style={styles.pv2}>
                         <Button
                             success
                             medium

From 4775ea7aeaa48ea10f10d890b400f0ead4ba167b Mon Sep 17 00:00:00 2001
From: Ana Margarida Silva <ana.margarida.silva@callstack.com>
Date: Fri, 6 Oct 2023 14:27:05 +0100
Subject: [PATCH 4/5] fix: button color for submit

---
 src/components/MoneyReportHeader.js | 4 ++--
 src/libs/actions/IOU.js             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 154919f5c3f2..723c6abf6d63 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -132,8 +132,8 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                 {shouldShowSubmitButton && !isSmallScreenWidth && (
                     <View style={styles.pv2}>
                         <Button
-                            success
                             medium
+                            success={moneyRequestReport.isOwnPolicyExpenseChat}
                             text={translate('common.submit')}
                             style={[styles.mnw120, styles.pv2, styles.pr0]}
                             onPress={() => IOU.submitReport(moneyRequestReport)}
@@ -170,8 +170,8 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
             {shouldShowSubmitButton && isSmallScreenWidth && (
                 <View style={[styles.ph5, styles.pb2, isSmallScreenWidth && styles.borderBottom]}>
                     <Button
-                        success
                         medium
+                        success={moneyRequestReport.isOwnPolicyExpenseChat}
                         text={translate('common.submit')}
                         style={[styles.w100, styles.pr0]}
                         onPress={() => IOU.submitReport(moneyRequestReport)}
diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
index eb44491eb7eb..358008dc2d88 100644
--- a/src/libs/actions/IOU.js
+++ b/src/libs/actions/IOU.js
@@ -2303,7 +2303,7 @@ function navigateToNextPage(iou, iouType, report, path = '') {
 }
 
 function submitReport() {
-    // TODO: this will be done in the future, part of wave 6: drafts
+    // Will be implemented in https://github.com/Expensify/App/issues/28763
 }
 
 export {

From 09c620cb818d377cf60625a1ab11f25696c8b4a4 Mon Sep 17 00:00:00 2001
From: Ana Margarida Silva <ana.margarida.silva@callstack.com>
Date: Fri, 6 Oct 2023 16:17:30 +0100
Subject: [PATCH 5/5] fix: add check for expense report in isDraft and use chat
 report

---
 src/components/MoneyReportHeader.js | 4 ++--
 src/libs/ReportUtils.js             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/MoneyReportHeader.js b/src/components/MoneyReportHeader.js
index 723c6abf6d63..fbd686fac692 100644
--- a/src/components/MoneyReportHeader.js
+++ b/src/components/MoneyReportHeader.js
@@ -133,7 +133,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                     <View style={styles.pv2}>
                         <Button
                             medium
-                            success={moneyRequestReport.isOwnPolicyExpenseChat}
+                            success={chatReport.isOwnPolicyExpenseChat}
                             text={translate('common.submit')}
                             style={[styles.mnw120, styles.pv2, styles.pr0]}
                             onPress={() => IOU.submitReport(moneyRequestReport)}
@@ -171,7 +171,7 @@ function MoneyReportHeader({session, personalDetails, policy, chatReport, report
                 <View style={[styles.ph5, styles.pb2, isSmallScreenWidth && styles.borderBottom]}>
                     <Button
                         medium
-                        success={moneyRequestReport.isOwnPolicyExpenseChat}
+                        success={chatReport.isOwnPolicyExpenseChat}
                         text={translate('common.submit')}
                         style={[styles.w100, styles.pr0]}
                         onPress={() => IOU.submitReport(moneyRequestReport)}
diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
index ef9fb053309d..67d3de386df3 100644
--- a/src/libs/ReportUtils.js
+++ b/src/libs/ReportUtils.js
@@ -3774,7 +3774,7 @@ function getIOUReportActionDisplayMessage(reportAction) {
  * @returns {Boolean}
  */
 function isReportDraft(report) {
-    return lodashGet(report, 'stateNum') === CONST.REPORT.STATE_NUM.OPEN && lodashGet(report, 'statusNum') === CONST.REPORT.STATUS.OPEN;
+    return isExpenseReport(report) && lodashGet(report, 'stateNum') === CONST.REPORT.STATE_NUM.OPEN && lodashGet(report, 'statusNum') === CONST.REPORT.STATUS.OPEN;
 }
 
 export {