Skip to content

Commit

Permalink
Merge pull request #8058 from Expensify/amal-reapply-pr-correctly
Browse files Browse the repository at this point in the history
Reapply RoomHeaderAvatars Logic to fix regression correctly this time

(cherry picked from commit 1d44ed3)
  • Loading branch information
Amal Nazeem authored and OSBotify committed Mar 11, 2022
1 parent b6a36a1 commit 8b59a8f
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions src/pages/ReportDetailsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Str from 'expensify-common/lib/str';
import _ from 'underscore';
import {View, ScrollView} from 'react-native';
import lodashGet from 'lodash/get';
import Avatar from '../components/Avatar';
import RoomHeaderAvatars from '../components/RoomHeaderAvatars';
import compose from '../libs/compose';
import withLocalize, {withLocalizePropTypes} from '../components/withLocalize';
import ONYXKEYS from '../ONYXKEYS';
Expand Down Expand Up @@ -108,6 +108,7 @@ class ReportDetailsPage extends Component {
}

render() {
const isPolicyExpenseChat = ReportUtils.isPolicyExpenseChat(this.props.report);
const isChatRoom = ReportUtils.isChatRoom(this.props.report);
const chatRoomSubtitle = ReportUtils.getChatRoomSubtitle(this.props.report, this.props.policies);
const participants = lodashGet(this.props.report, 'participants', []);
Expand Down Expand Up @@ -136,13 +137,12 @@ class ReportDetailsPage extends Component {
<View
style={styles.reportDetailsTitleContainer}
>
<Avatar
isChatRoom={isChatRoom}
isArchivedRoom={ReportUtils.isArchivedRoom(this.props.report)}
containerStyles={[styles.singleAvatarLarge, styles.mb4]}
imageStyles={[styles.singleAvatarLarge]}
source={this.props.report.icons[0]}
/>
<View style={styles.mb4}>
<RoomHeaderAvatars
avatarIcons={OptionsListUtils.getAvatarSources(this.props.report)}
shouldShowLargeAvatars={isPolicyExpenseChat}
/>
</View>
<View style={[styles.reportDetailsRoomInfo, styles.mw100]}>
<View style={[styles.alignSelfCenter, styles.w100]}>
<DisplayNames
Expand Down

0 comments on commit 8b59a8f

Please sign in to comment.