Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reapply RoomHeaderAvatars Logic to fix regression correctly this time #8058

Merged
merged 1 commit into from
Mar 11, 2022
Merged

Reapply RoomHeaderAvatars Logic to fix regression correctly this time #8058

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/pages/ReportDetailsPage.js
View file
Open in desktop
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 @@ -103,6 +103,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 @@ -131,13 +132,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