From 3d3faee391c928cb351ca3fbe29d7ef11cb0b324 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Fri, 22 Apr 2022 14:18:26 -0400 Subject: [PATCH 1/4] Use oldPolicyName when building archived policyExpenseChat report object --- src/libs/actions/Report.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 5ef5463a5437..715fbd2e98b9 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -161,13 +161,15 @@ function getChatReportName(fullReport, chatType) { } if (ReportUtils.isPolicyExpenseChat({chatType})) { - return `${LoginUtils.getEmailWithoutMergedAccountPrefix(fullReport.reportName)}${(ReportUtils.isArchivedRoom({ + const isArchivedRoom = ReportUtils.isArchivedRoom({ chatType, stateNum: fullReport.state, statusNum: fullReport.status, - }) - ? ` (${Localize.translateLocal('common.archived')})` - : '')}`; + }); + const name = (isArchivedRoom && fullReport.isOwnPolicyExpenseChat) + ? fullReport.oldPolicyName + : LoginUtils.getEmailWithoutMergedAccountPrefix(lodashGet(fullReport, ['reportName'], '')); + return `${name}${isArchivedRoom ? ` (${Localize.translateLocal('common.archived')})` : ''}`; } const {sharedReportList} = fullReport; From 41bc8463bcd6623aec936cab39f4773d05121a23 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Fri, 22 Apr 2022 14:18:42 -0400 Subject: [PATCH 2/4] Remove redundant oldPolicyName logic --- src/libs/OptionsListUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/OptionsListUtils.js b/src/libs/OptionsListUtils.js index 80b75da60daf..5655b9f292c6 100644 --- a/src/libs/OptionsListUtils.js +++ b/src/libs/OptionsListUtils.js @@ -275,7 +275,7 @@ function createOption(personalDetailList, report, { let text; let alternateText; if (isChatRoom || isPolicyExpenseChat) { - text = (isArchivedRoom && report.isOwnPolicyExpenseChat) ? report.oldPolicyName : lodashGet(report, ['reportName'], ''); + text = lodashGet(report, ['reportName'], ''); alternateText = (showChatPreviewLine && !forcePolicyNamePreview && lastMessageText) ? lastMessageText : subtitle; From d06375da73937422b7f81c043be2d673e78ed56b Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Fri, 22 Apr 2022 14:23:55 -0400 Subject: [PATCH 3/4] Fix oldPolicyName logic that was unavailable before --- src/libs/actions/Report.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 715fbd2e98b9..cf1ee19f24cd 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -142,9 +142,10 @@ function getParticipantEmailsFromReport({sharedReportList, reportNameValuePairs, * * @param {Object} fullReport * @param {String} chatType + * @param {String} oldPolicyName * @return {String} */ -function getChatReportName(fullReport, chatType) { +function getChatReportName(fullReport, chatType, oldPolicyName) { if (ReportUtils.isDefaultRoom({chatType})) { return `#${fullReport.reportName}${(ReportUtils.isArchivedRoom({ chatType, @@ -167,7 +168,7 @@ function getChatReportName(fullReport, chatType) { statusNum: fullReport.status, }); const name = (isArchivedRoom && fullReport.isOwnPolicyExpenseChat) - ? fullReport.oldPolicyName + ? oldPolicyName : LoginUtils.getEmailWithoutMergedAccountPrefix(lodashGet(fullReport, ['reportName'], '')); return `${name}${isArchivedRoom ? ` (${Localize.translateLocal('common.archived')})` : ''}`; } @@ -209,17 +210,17 @@ function getSimplifiedReportObject(report) { lastMessageText = ReportUtils.formatReportLastMessageText(lastMessageText); } + // Used for archived rooms, will store the policy name that the room used to belong to. + const oldPolicyName = lodashGet(report, ['reportNameValuePairs', 'oldPolicyName'], ''); + const reportName = lodashGet(report, ['reportNameValuePairs', 'type']) === 'chat' - ? getChatReportName(report, chatType) + ? getChatReportName(report, chatType, oldPolicyName) : report.reportName; const lastActorEmail = lodashGet(report, 'lastActionActorEmail', ''); const notificationPreference = ReportUtils.isChatRoom({chatType}) ? lodashGet(report, ['reportNameValuePairs', 'notificationPreferences', currentUserAccountID], 'daily') : ''; - // Used for archived rooms, will store the policy name that the room used to belong to. - const oldPolicyName = lodashGet(report, ['reportNameValuePairs', 'oldPolicyName'], ''); - // Used for User Created Policy Rooms, will denote how access to a chat room is given among workspace members const visibility = lodashGet(report, ['reportNameValuePairs', 'visibility']); From 06628f993e71ae3b0bb1073f1eaa95ba99801e49 Mon Sep 17 00:00:00 2001 From: Amal Nazeem Date: Fri, 22 Apr 2022 14:27:47 -0400 Subject: [PATCH 4/4] DRY for isArchivedRoom value --- src/libs/actions/Report.js | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index cf1ee19f24cd..7d9414b70754 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -146,14 +146,14 @@ function getParticipantEmailsFromReport({sharedReportList, reportNameValuePairs, * @return {String} */ function getChatReportName(fullReport, chatType, oldPolicyName) { + const isArchivedRoom = ReportUtils.isArchivedRoom({ + chatType, + stateNum: fullReport.state, + statusNum: fullReport.status, + }); + if (ReportUtils.isDefaultRoom({chatType})) { - return `#${fullReport.reportName}${(ReportUtils.isArchivedRoom({ - chatType, - stateNum: fullReport.state, - statusNum: fullReport.status, - }) - ? ` (${Localize.translateLocal('common.deleted')})` - : '')}`; + return `#${fullReport.reportName}${isArchivedRoom ? ` (${Localize.translateLocal('common.deleted')})` : ''}`; } // For a basic policy room, return its original name @@ -162,11 +162,6 @@ function getChatReportName(fullReport, chatType, oldPolicyName) { } if (ReportUtils.isPolicyExpenseChat({chatType})) { - const isArchivedRoom = ReportUtils.isArchivedRoom({ - chatType, - stateNum: fullReport.state, - statusNum: fullReport.status, - }); const name = (isArchivedRoom && fullReport.isOwnPolicyExpenseChat) ? oldPolicyName : LoginUtils.getEmailWithoutMergedAccountPrefix(lodashGet(fullReport, ['reportName'], ''));