Merge pull request #30914 from Expensify/beaman-removeFinalOwnerEmail…

…Uses Remove remaining uses of `report.ownerEmail`
Expensify · Nov 10, 2023 · e220352 · e220352
2 parents 9628af9 + 493fc45
commit e220352
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 19 deletions.
diff --git a/src/components/MoneyRequestHeader.js b/src/components/MoneyRequestHeader.js
@@ -121,7 +121,6 @@ function MoneyRequestHeader({session, parentReport, report, parentReportAction,
                     report={{
                         ...report,
                         ownerAccountID: lodashGet(parentReport, 'ownerAccountID', null),
-                        ownerEmail: lodashGet(parentReport, 'ownerEmail', null),
                     }}
                     policy={policy}
                     personalDetails={personalDetails}

diff --git a/src/libs/E2E/apiMocks/openReport.js b/src/libs/E2E/apiMocks/openReport.js
@@ -8,9 +8,7 @@ export default () => ({
                 reportName: 'Chat Report',
                 type: 'chat',
                 chatType: '',
-                ownerEmail: '__fake__',
                 ownerAccountID: 0,
-                managerEmail: '__fake__',
                 managerID: 0,
                 policyID: '_FAKE_',
                 participantAccountIDs: [14567013],

diff --git a/src/libs/PersonalDetailsUtils.js b/src/libs/PersonalDetailsUtils.js
@@ -22,7 +22,7 @@ Onyx.connect({
  * @param {String} [defaultValue] optional default display name value
  * @returns {String}
  */
-function getDisplayNameOrDefault(passedPersonalDetails, pathToDisplayName, defaultValue) {
+function getDisplayNameOrDefault(passedPersonalDetails, pathToDisplayName, defaultValue = '') {
     const displayName = lodashGet(passedPersonalDetails, pathToDisplayName);
 
     return displayName || defaultValue || Localize.translateLocal('common.hidden');

diff --git a/src/libs/ReportUtils.js b/src/libs/ReportUtils.js
@@ -303,7 +303,7 @@ function isCurrentUserSubmitter(reportID) {
         return false;
     }
     const report = allReports[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`] || {};
-    return report && report.ownerEmail === currentUserEmail;
+    return report && report.ownerAccountID === currentUserAccountID;
 }
 
 /**

diff --git a/src/libs/actions/IOU.js b/src/libs/actions/IOU.js
@@ -2715,10 +2715,7 @@ function submitReport(expenseReport) {
  * @param {String} reimbursementBankAccountState
  */
 function payMoneyRequest(paymentType, chatReport, iouReport) {
-    const recipient = {
-        login: iouReport.ownerEmail,
-        accountID: iouReport.ownerAccountID,
-    };
+    const recipient = {accountID: iouReport.ownerAccountID};
     const {params, optimisticData, successData, failureData} = getPayMoneyRequestParams(chatReport, iouReport, recipient, paymentType);
 
     // For now we need to call the PayMoneyRequestWithWallet API since PayMoneyRequest was not updated to work with

diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js
@@ -171,11 +171,11 @@ function deleteWorkspace(policyID, reports, policyName) {
         // Add closed actions to all chat reports linked to this policy
         ..._.map(reports, ({reportID, ownerAccountID}) => {
             // Announce & admin chats have FAKE owners, but workspace chats w/ users do have owners.
-            let reportOwnerEmail = CONST.POLICY.OWNER_EMAIL_FAKE;
+            let emailClosingReport = CONST.POLICY.OWNER_EMAIL_FAKE;
             if (ownerAccountID !== CONST.POLICY.OWNER_ACCOUNT_ID_FAKE) {
-                reportOwnerEmail = lodashGet(allPersonalDetails, [ownerAccountID, 'login'], '');
+                emailClosingReport = lodashGet(allPersonalDetails, [ownerAccountID, 'login'], '');
             }
-            const optimisticClosedReportAction = ReportUtils.buildOptimisticClosedReportAction(reportOwnerEmail, policyName, CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED);
+            const optimisticClosedReportAction = ReportUtils.buildOptimisticClosedReportAction(emailClosingReport, policyName, CONST.REPORT.ARCHIVE_REASON.POLICY_DELETED);
             const optimisticReportActions = {};
             optimisticReportActions[optimisticClosedReportAction.reportActionID] = optimisticClosedReportAction;
             return {

diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
@@ -559,11 +559,11 @@ function openReport(reportID, participantLoginList = [], newReportObject = {}, p
             isOptimisticReport: true,
         };
 
-        let reportOwnerEmail = CONST.REPORT.OWNER_EMAIL_FAKE;
+        let emailCreatingAction = CONST.REPORT.OWNER_EMAIL_FAKE;
         if (newReportObject.ownerAccountID && newReportObject.ownerAccountID !== CONST.REPORT.OWNER_ACCOUNT_ID_FAKE) {
-            reportOwnerEmail = lodashGet(allPersonalDetails, [newReportObject.ownerAccountID, 'login'], '');
+            emailCreatingAction = lodashGet(allPersonalDetails, [newReportObject.ownerAccountID, 'login'], '');
         }
-        const optimisticCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(reportOwnerEmail);
+        const optimisticCreatedAction = ReportUtils.buildOptimisticCreatedReportAction(emailCreatingAction);
         onyxData.optimisticData.push({
             onyxMethod: Onyx.METHOD.SET,
             key: `${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${reportID}`,

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
@@ -366,7 +366,7 @@ function ReportActionItem(props) {
                 </ShowContextMenuContext.Provider>
             );
         } else if (props.action.actionName === CONST.REPORT.ACTIONS.TYPE.REIMBURSEMENTQUEUED) {
-            const submitterDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(personalDetails, [props.report.ownerAccountID, 'displayName'], props.report.ownerEmail);
+            const submitterDisplayName = PersonalDetailsUtils.getDisplayNameOrDefault(personalDetails, [props.report.ownerAccountID, 'displayName']);
             const paymentType = lodashGet(props.action, 'originalMessage.paymentType', '');
 
             const isSubmitterOfUnsettledReport = ReportUtils.isCurrentUserSubmitter(props.report.reportID) && !ReportUtils.isSettled(props.report.reportID);

diff --git a/src/types/onyx/Report.ts b/src/types/onyx/Report.ts
@@ -36,9 +36,6 @@ type Report = {
     /** The policy name to use for an archived report */
     oldPolicyName?: string;
 
-    /** The email address of the report owner */
-    ownerEmail?: string;
-
     /** Linked policy's ID */
     policyID?: string;