diff --git a/src/components/AvatarWithDisplayName.js b/src/components/AvatarWithDisplayName.js index 318772b83e15..b2644ab0eef9 100644 --- a/src/components/AvatarWithDisplayName.js +++ b/src/components/AvatarWithDisplayName.js @@ -11,7 +11,7 @@ import styles from '../styles/styles'; import themeColors from '../styles/themes/default'; import SubscriptAvatar from './SubscriptAvatar'; import * as ReportUtils from '../libs/ReportUtils'; -import Avatar from './Avatar'; +import MultipleAvatars from './MultipleAvatars'; import DisplayNames from './DisplayNames'; import compose from '../libs/compose'; import * as OptionsListUtils from '../libs/OptionsListUtils'; @@ -53,42 +53,42 @@ const defaultProps = { }; function AvatarWithDisplayName(props) { - const title = props.isAnonymous ? ReportUtils.getReportName(props.report) : ReportUtils.getDisplayNameForParticipant(props.report.ownerAccountID, true); + const title = ReportUtils.getReportName(props.report); const subtitle = ReportUtils.getChatRoomSubtitle(props.report); const parentNavigationSubtitle = ReportUtils.getParentNavigationSubtitle(props.report); - const isExpenseReport = ReportUtils.isExpenseReport(props.report); - const icons = ReportUtils.getIcons(props.report, props.personalDetails, props.policies); + const isMoneyRequestOrReport = ReportUtils.isMoneyRequestReport(props.report) || ReportUtils.isMoneyRequest(props.report); + const icons = ReportUtils.getIcons(props.report, props.personalDetails, props.policies, true); const ownerPersonalDetails = OptionsListUtils.getPersonalDetailsForAccountIDs([props.report.ownerAccountID], props.personalDetails); const displayNamesWithTooltips = ReportUtils.getDisplayNamesWithTooltips(_.values(ownerPersonalDetails), false); - const avatarContainerStyle = StyleUtils.getEmptyAvatarStyle(props.size) || styles.emptyAvatar; + const shouldShowSubscriptAvatar = ReportUtils.shouldReportShowSubscript(props.report); + const isExpenseRequest = ReportUtils.isExpenseRequest(props.report); + const defaultSubscriptSize = isExpenseRequest ? CONST.AVATAR_SIZE.SMALL_NORMAL : props.size; return ( {Boolean(props.report && title) && ( - {isExpenseReport ? ( + {shouldShowSubscriptAvatar ? ( ) : ( - )} - + {!_.isEmpty(parentNavigationSubtitle) && (