Use oldPolicyName report field for archived workspace chats

src/components/ArchivedReportFooter.js

@@ -8,7 +8,7 @@ import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import compose from '../libs/compose';
 import personalDetailsPropType from '../pages/personalDetailsPropType';
 import ONYXKEYS from '../ONYXKEYS';
-import * as ReportUtils from '../libs/reportUtils';
+import * as ReportUtils from '../libs/ReportUtils';
 
 const propTypes = {
     /** The reason this report was archived */

src/components/OptionRow.js

@@ -7,7 +7,6 @@ import {
     View,
     StyleSheet,
 } from 'react-native';
-import Str from 'expensify-common/lib/str';
 import styles from '../styles/styles';
 import * as StyleUtils from '../styles/StyleUtils';
 import optionPropTypes from './optionPropTypes';
@@ -23,6 +22,7 @@ import Text from './Text';
 import SelectCircle from './SelectCircle';
 import SubscriptAvatar from './SubscriptAvatar';
 import CONST from '../CONST';
+import * as ReportUtils from '../libs/ReportUtils';
 
 const propTypes = {
     /** Background Color of the Option Row */
@@ -113,21 +113,9 @@ const OptionRow = (props) => {
         : props.backgroundColor;
     const focusedBackgroundColor = styles.sidebarLinkActive.backgroundColor;
     const isMultipleParticipant = lodashGet(props.option, 'participantsList.length', 0) > 1;
-    const displayNamesWithTooltips = _.map(
-
-        // We only create tooltips for the first 10 users or so since some reports have hundreds of users causing
-        // performance to degrade.
-        (props.option.participantsList || []).slice(0, 10),
-        ({displayName, firstName, login}) => {
-            const displayNameTrimmed = Str.isSMSLogin(login) ? props.toLocalPhone(displayName) : displayName;
-
-            return {
-                displayName: (isMultipleParticipant ? firstName : displayNameTrimmed) || Str.removeSMSDomain(login),
-                tooltip: Str.removeSMSDomain(login),
-            };
-        },
-    );
 
+    // We only create tooltips for the first 10 users or so since some reports have hundreds of users, causing performance to degrade.
+    const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips((props.option.participantsList || []).slice(0, 10), isMultipleParticipant);
     const avatarTooltips = props.showTitleTooltip && !props.option.isChatRoom && !props.option.isArchivedRoom ? _.pluck(displayNamesWithTooltips, 'tooltip') : undefined;
 
     return (

src/components/ReportWelcomeText.js

@@ -1,17 +1,15 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import lodashGet from 'lodash/get';
-import Str from 'expensify-common/lib/str';
 import {withOnyx} from 'react-native-onyx';
 import _ from 'underscore';
 import styles from '../styles/styles';
 import Text from './Text';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import compose from '../libs/compose';
-import * as ReportUtils from '../libs/reportUtils';
+import * as ReportUtils from '../libs/ReportUtils';
 import * as OptionsListUtils from '../libs/OptionsListUtils';
 import ONYXKEYS from '../ONYXKEYS';
-import CONST from '../CONST';
 
 const personalDetailsPropTypes = PropTypes.shape({
     /** The login of the person (either email or phone number) */
@@ -53,25 +51,9 @@ const ReportWelcomeText = (props) => {
     const isDefault = !(isChatRoom || isPolicyExpenseChat);
     const participants = lodashGet(props.report, 'participants', []);
     const isMultipleParticipant = participants.length > 1;
-    const displayNamesWithTooltips = _.map(
+    const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(
         OptionsListUtils.getPersonalDetailsForLogins(participants, props.personalDetails),
-        ({
-            displayName, firstName, login, pronouns,
-        }) => {
-            const longName = displayName || Str.removeSMSDomain(login);
-            const longNameLocalized = Str.isSMSLogin(longName) ? props.toLocalPhone(longName) : longName;
-            const shortName = firstName || longNameLocalized;
-            let finalPronouns = pronouns;
-            if (pronouns && pronouns.startsWith(CONST.PRONOUNS.PREFIX)) {
-                const localeKey = pronouns.replace(CONST.PRONOUNS.PREFIX, '');
-                finalPronouns = props.translate(`pronouns.${localeKey}`);
-            }
-            return {
-                displayName: isMultipleParticipant ? shortName : longNameLocalized,
-                tooltip: Str.removeSMSDomain(login),
-                pronouns: finalPronouns,
-            };
-        },
+        isMultipleParticipant,
     );
     const roomWelcomeMessage = ReportUtils.getRoomWelcomeMessage(props.report, props.policies);
     return (

src/libs/LoginUtils.js

@@ -7,7 +7,7 @@ import CONST from '../CONST';
  * @returns {String}
  */
 function getEmailWithoutMergedAccountPrefix(email) {
-    return email.replace(/^MERGED_0@/, '');
+    return email.replace(/^MERGED_\d@/, '');
 }
 
 /**

src/libs/Navigation/AppNavigator/MainDrawerNavigator.js

@@ -12,7 +12,7 @@ import Permissions from '../../Permissions';
 import ReportScreen from '../../../pages/home/ReportScreen';
 import SidebarScreen from '../../../pages/home/sidebar/SidebarScreen';
 import BaseDrawerNavigator from './BaseDrawerNavigator';
-import * as ReportUtils from '../../reportUtils';
+import * as ReportUtils from '../../ReportUtils';
 
 const propTypes = {
     /** Available reports that would be displayed in this navigator */

src/libs/OptionsListUtils.js

@@ -6,7 +6,7 @@ import lodashOrderBy from 'lodash/orderBy';
 import Str from 'expensify-common/lib/str';
 import ONYXKEYS from '../ONYXKEYS';
 import CONST from '../CONST';
-import * as ReportUtils from './reportUtils';
+import * as ReportUtils from './ReportUtils';
 import * as Localize from './Localize';
 import Permissions from './Permissions';
 import * as CollectionUtils from './CollectionUtils';
@@ -112,22 +112,22 @@ function addSMSDomainIfPhoneNumber(login) {
  *
  * @param {Array} logins
  * @param {Object} personalDetails
- * @returns {Array}
+ * @returns {Object} – keys of the object are emails, values are PersonalDetails objects.
  */
 function getPersonalDetailsForLogins(logins, personalDetails) {
-    return _.map(logins, (login) => {
+    const personalDetailsForLogins = {};
+    _.each(logins, (login) => {
         let personalDetail = personalDetails[login];
-
         if (!personalDetail) {
             personalDetail = {
                 login,
                 displayName: login,
                 avatar: ReportUtils.getDefaultAvatar(login),
             };
         }
-
-        return personalDetail;
+        personalDetailsForLogins[login] = personalDetail;
     });
+    return personalDetailsForLogins;
 }
 
 /**
@@ -220,7 +220,7 @@ function createOption(logins, personalDetails, report, {
 }) {
     const isChatRoom = ReportUtils.isChatRoom(report);
     const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(report);
-    const personalDetailList = getPersonalDetailsForLogins(logins, personalDetails);
+    const personalDetailList = _.values(getPersonalDetailsForLogins(logins, personalDetails));
     const isArchivedRoom = ReportUtils.isArchivedRoom(report);
     const hasMultipleParticipants = personalDetailList.length > 1 || isChatRoom || isPolicyExpenseChat;
     const personalDetail = personalDetailList[0];
@@ -242,7 +242,7 @@ function createOption(logins, personalDetails, report, {
     if (isPolicyExpenseChat && isArchivedRoom) {
         const archiveReason = lodashGet(lastReportActions[report.reportID], 'originalMessage.reason', CONST.REPORT.ARCHIVE_REASON.DEFAULT);
         lastMessageText = Localize.translate(preferredLocale, `reportArchiveReasons.${archiveReason}`, {
-            displayName: lastActorDetails.displayName,
+            displayName: lodashGet(lastActorDetails, 'displayName', report.lastActorEmail),
             policyName: ReportUtils.getPolicyName(report, policies),
         });
     }
@@ -252,7 +252,8 @@ function createOption(logins, personalDetails, report, {
     let text;
     let alternateText;
     if (isChatRoom || isPolicyExpenseChat) {
-        text = lodashGet(report, ['reportName'], '');
+        text = lodashGet(report, 'reportName')
+            || lodashGet(report, 'oldPolicyName', '');
         alternateText = (showChatPreviewLine && !forcePolicyNamePreview && lastMessageText)
             ? lastMessageText
             : subtitle;

src/libs/reportUtils.js → src/libs/ReportUtils.js

@@ -5,6 +5,7 @@ import Onyx from 'react-native-onyx';
 import ONYXKEYS from '../ONYXKEYS';
 import CONST from '../CONST';
 import * as Localize from './Localize';
+import * as LocalePhoneNumber from './LocalePhoneNumber';
 import * as Expensicons from '../components/Icon/Expensicons';
 import md5 from './md5';
 
@@ -14,6 +15,17 @@ Onyx.connect({
     callback: val => sessionEmail = val ? val.email : null,
 });
 
+let preferredLocale = CONST.DEFAULT_LOCALE;
+Onyx.connect({
+    key: ONYXKEYS.NVP_PREFERRED_LOCALE,
+    callback: (val) => {
+        if (!val) {
+            return;
+        }
+        preferredLocale = val;
+    },
+});
+
 /**
  * Returns the concatenated title for the PrimaryLogins of a report
  *
@@ -363,6 +375,96 @@ function getIcons(report, personalDetails, policies, defaultIcon = null) {
     return _.map(sortedParticipants, item => item.avatar);
 }
 
+/**
+ * Get the displayName for a single report participant.
+ *
+ * @param {Object} participant
+ * @param {String} participant.displayName
+ * @param {String} participant.firstName
+ * @param {String} participant.login
+ * @param {Boolean} [shouldUseShortForm]
+ * @returns {String}
+ */
+function getDisplayNameForParticipant(participant, shouldUseShortForm = false) {
+    if (!participant) {
+        return '';
+    }
+
+    const loginWithoutSMSDomain = Str.removeSMSDomain(participant.login);
+    let longName = participant.displayName || loginWithoutSMSDomain;
+    if (Str.isSMSLogin(longName)) {
+        longName = LocalePhoneNumber.toLocalPhone(preferredLocale, longName);
+    }
+    const shortName = participant.firstName || longName;
+
+    return shouldUseShortForm ? shortName : longName;
+}
+
+/**
+ * @param {Object} participants
+ * @param {Boolean} isMultipleParticipantReport
+ * @returns {Array}
+ */
+function getDisplayNamesWithTooltips(participants, isMultipleParticipantReport) {
+    return _.map(participants, (participant) => {
+        const displayName = getDisplayNameForParticipant(participant, isMultipleParticipantReport);
+        const tooltip = Str.removeSMSDomain(participant.login);
+
+        let pronouns = participant.pronouns;
+        if (pronouns && pronouns.startsWith(CONST.PRONOUNS.PREFIX)) {
+            const pronounTranslationKey = pronouns.replace(CONST.PRONOUNS.PREFIX, '');
+            pronouns = Localize.translateLocal(`pronouns.${pronounTranslationKey}`);
+        }
+
+        return {
+            displayName,
+            tooltip,
+            pronouns,
+        };
+    });
+}
+
+/**
+ * Get the title for a report.
+ *
+ * @param {Object} report
+ * @param {Object} [personalDetailsForParticipants]
+ * @param {Object} [policies]
+ * @returns {String}
+ */
+function getReportName(report, personalDetailsForParticipants = {}, policies = {}) {
+    if (lodashGet(report, 'reportNameValuePairs.type') !== 'chat') {
+        return report.reportName || '';
+    }
+
+    let formattedName;
+    if (isChatRoom(report)) {
+        formattedName = `#${report.reportName}`;
+    }
+
+    if (isPolicyExpenseChat(report)) {
+        const reportOwnerPersonalDetails = lodashGet(personalDetailsForParticipants, report.ownerEmail);
+        const reportOwnerDisplayName = getDisplayNameForParticipant(reportOwnerPersonalDetails) || report.reportName;
+        formattedName = report.isOwnPolicyExpenseChat ? getPolicyName(report, policies) : reportOwnerDisplayName;
+    }
+
+    if (isArchivedRoom(report)) {
+        formattedName += ` (${Localize.translateLocal('common.archived')})`;
+    }
+
+    if (formattedName) {
+        return formattedName;
+    }
+
+    // Not a room or PolicyExpenseChat, generate title from participants
+    const participants = _.without(lodashGet(report, 'participants', []), sessionEmail);
+    const displayNamesWithTooltips = getDisplayNamesWithTooltips(
+        _.isEmpty(personalDetailsForParticipants) ? participants : personalDetailsForParticipants,
+        participants.length > 1,
+    );
+    return _.map(displayNamesWithTooltips, ({displayName}) => displayName).join(', ');
+}
+
 export {
     getReportParticipantsTitle,
     isReportMessageAttachment,
@@ -387,4 +489,6 @@ export {
     getDefaultAvatar,
     getIcons,
     getRoomWelcomeMessage,
+    getDisplayNamesWithTooltips,
+    getReportName,
 };

src/libs/actions/PersonalDetails.js

@@ -8,7 +8,7 @@ import CONST from '../../CONST';
 import * as API from '../API';
 import NameValuePair from './NameValuePair';
 import * as LoginUtils from '../LoginUtils';
-import * as ReportUtils from '../reportUtils';
+import * as ReportUtils from '../ReportUtils';
 import Growl from '../Growl';
 import * as Localize from '../Localize';
 import Timing from './Timing';

src/libs/actions/Report.js

@@ -22,7 +22,7 @@ import CONFIG from '../../CONFIG';
 import CONST from '../../CONST';
 import Log from '../Log';
 import * as LoginUtils from '../LoginUtils';
-import * as ReportUtils from '../reportUtils';
+import * as ReportUtils from '../ReportUtils';
 import Timers from '../Timers';
 import * as ReportActions from './ReportActions';
 import Growl from '../Growl';

src/libs/actions/ReportActions.js

@@ -4,7 +4,7 @@ import lodashGet from 'lodash/get';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as CollectionUtils from '../CollectionUtils';
 import CONST from '../../CONST';
-import * as ReportUtils from '../reportUtils';
+import * as ReportUtils from '../ReportUtils';
 import * as ReportActionsUtils from '../ReportActionsUtils';
 
 /**

src/libs/actions/Welcome.js

@@ -2,7 +2,7 @@ import Onyx from 'react-native-onyx';
 import _ from 'underscore';
 import lodashGet from 'lodash/get';
 import Navigation from '../Navigation/Navigation';
-import * as ReportUtils from '../reportUtils';
+import * as ReportUtils from '../ReportUtils';
 import ROUTES from '../../ROUTES';
 import * as Policy from './Policy';
 import ONYXKEYS from '../../ONYXKEYS';

src/pages/DetailsPage.js

@@ -16,7 +16,7 @@ import compose from '../libs/compose';
 import CommunicationsLink from '../components/CommunicationsLink';
 import Tooltip from '../components/Tooltip';
 import CONST from '../CONST';
-import * as ReportUtils from '../libs/reportUtils';
+import * as ReportUtils from '../libs/ReportUtils';
 import DateUtils from '../libs/DateUtils';
 import * as Expensicons from '../components/Icon/Expensicons';
 import MenuItem from '../components/MenuItem';

src/pages/ReportDetailsPage.js

@@ -1,7 +1,6 @@
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
 import {withOnyx} from 'react-native-onyx';
-import Str from 'expensify-common/lib/str';
 import _ from 'underscore';
 import {View, ScrollView} from 'react-native';
 import lodashGet from 'lodash/get';
@@ -15,7 +14,7 @@ import HeaderWithCloseButton from '../components/HeaderWithCloseButton';
 import styles from '../styles/styles';
 import DisplayNames from '../components/DisplayNames';
 import * as OptionsListUtils from '../libs/OptionsListUtils';
-import * as ReportUtils from '../libs/reportUtils';
+import * as ReportUtils from '../libs/ReportUtils';
 import participantPropTypes from '../components/participantPropTypes';
 import * as Expensicons from '../components/Icon/Expensicons';
 import ROUTES from '../ROUTES';
@@ -108,16 +107,9 @@ class ReportDetailsPage extends Component {
         const chatRoomSubtitle = ReportUtils.getChatRoomSubtitle(this.props.report, this.props.policies);
         const participants = lodashGet(this.props.report, 'participants', []);
         const isMultipleParticipant = participants.length > 1;
-        const displayNamesWithTooltips = _.map(
+        const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(
             OptionsListUtils.getPersonalDetailsForLogins(participants, this.props.personalDetails),
-            ({displayName, firstName, login}) => {
-                const displayNameTrimmed = Str.isSMSLogin(login) ? this.props.toLocalPhone(displayName) : displayName;
-
-                return {
-                    displayName: (isMultipleParticipant ? firstName : displayNameTrimmed) || Str.removeSMSDomain(login),
-                    tooltip: Str.removeSMSDomain(login),
-                };
-            },
+            isMultipleParticipant,
         );
         return (
             <ScreenWrapper>

src/pages/ReportParticipantsPage.js

@@ -16,7 +16,7 @@ import ROUTES from '../ROUTES';
 import personalDetailsPropType from './personalDetailsPropType';
 import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
 import compose from '../libs/compose';
-import * as ReportUtils from '../libs/reportUtils';
+import * as ReportUtils from '../libs/ReportUtils';
 
 const propTypes = {
     /* Onyx Props */