From 647da4ae68c0483f7dc199f23f76f02a4c3ecdf8 Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Mon, 6 Nov 2023 16:11:21 +0200 Subject: [PATCH 1/4] Remove remaining uses of report.ownerEmail --- src/components/MoneyRequestHeader.js | 1 - src/libs/PersonalDetailsUtils.js | 2 +- src/libs/ReportUtils.js | 2 +- src/libs/actions/IOU.js | 5 +---- src/pages/home/report/ReportActionItem.js | 2 +- src/types/onyx/Report.ts | 3 --- 6 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/components/MoneyRequestHeader.js b/src/components/MoneyRequestHeader.js index cbadbf40ff5c..4625fcf5d458 100644 --- a/src/components/MoneyRequestHeader.js +++ b/src/components/MoneyRequestHeader.js @@ -122,7 +122,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/PersonalDetailsUtils.js b/src/libs/PersonalDetailsUtils.js index e346dcde4fc4..c99adc32a56a 100644 --- 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 index 1e3fc5297193..baf7adbc1e89 100644 --- 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 index 19ac03228753..8db5d8a3941a 100644 --- a/src/libs/actions/IOU.js +++ b/src/libs/actions/IOU.js @@ -2708,10 +2708,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/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js index 4da88fd5d352..c6e2693fa0f2 100644 --- a/src/pages/home/report/ReportActionItem.js +++ b/src/pages/home/report/ReportActionItem.js @@ -365,7 +365,7 @@ function ReportActionItem(props) { ); } 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 index 7721f3518181..08a1e2ff71c2 100644 --- 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; From 44e88a831d3ed674bf78b56945012574510c691e Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Wed, 8 Nov 2023 13:53:00 +0200 Subject: [PATCH 2/4] Clarify email is about closing, not owner --- src/libs/actions/Policy.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/actions/Policy.js b/src/libs/actions/Policy.js index bf064d8bf6d8..4df510d44db7 100644 --- 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 { From 793d1223aae86c3ae722f04b6038c9cd604667ff Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Wed, 8 Nov 2023 13:55:01 +0200 Subject: [PATCH 3/4] Rename var to make it more accurate --- src/libs/actions/Report.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index a10e7e01da03..b310687e9fbc 100644 --- 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}`, From 493fc459bac7da9a610f12f2428d44e3e12198bf Mon Sep 17 00:00:00 2001 From: Alex Beaman Date: Wed, 8 Nov 2023 13:55:07 +0200 Subject: [PATCH 4/4] Remove unused data --- src/libs/E2E/apiMocks/openReport.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libs/E2E/apiMocks/openReport.js b/src/libs/E2E/apiMocks/openReport.js index b20b3df35bad..4c464d62b912 100644 --- 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],