Skip to content

Fix reportDetails icons for chatrooms #8011

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

Merged
danieldoglas merged 3 commits into from
Mar 4, 2022
Merged

Fix reportDetails icons for chatrooms #8011

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2991c4
Fix reportdetails view for chatrooms and policyExpenseChats
Mar 3, 2022
407ec96
Remove unused style
Mar 3, 2022
803ee08
Use isPolicyExpenseChat and fix style
Mar 4, 2022
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
14 changes: 8 additions & 6 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,11 +132,12 @@ class ReportDetailsPage extends Component {
<View
style={styles.reportDetailsTitleContainer}
>
<Avatar
containerStyles={[styles.singleAvatarLarge, styles.mb4]}
imageStyles={[styles.singleAvatarLarge]}
source={_.first(OptionsListUtils.getAvatarSources(this.props.report))}
/>
<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
10 changes: 1 addition & 9 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1503,14 +1503,6 @@ const styles = {
borderRadius: 18,
},

singleAvatarLarge: {
height: 64,
width: 64,
backgroundColor: themeColors.icon,
borderRadius: 64,
overflow: 'hidden',
},

secondAvatar: {
position: 'absolute',
right: -18,
Expand Down Expand Up @@ -1789,7 +1781,7 @@ const styles = {
...flex.flexColumn,
...flex.alignItemsCenter,
...spacing.mt4,
height: 150,
height: 170,
},

reportDetailsRoomInfo: {
Expand Down