Skip to content

Fix - ReportDetail Styling Inconsistency #19731

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
bondydaa merged 3 commits into from
Jun 1, 2023
Merged

Fix - ReportDetail Styling Inconsistency #19731

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
0e17512
Style cleanup
dhairyasenjaliya May 25, 2023
094774d
Remove lineHeight from subTitle text and add marginTop
dhairyasenjaliya May 30, 2023
a1e9f4b
Merge branch 'main' of https://github.com/dhairyasenjaliya/Expensify …
dhairyasenjaliya Jun 1, 2023
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
58 changes: 28 additions & 30 deletions src/pages/ReportDetailsPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ const ReportDetailsPage = (props) => {
return ReportUtils.getDisplayNamesWithTooltips(OptionsListUtils.getPersonalDetailsForLogins(participants, props.personalDetails), hasMultipleParticipants);
}, [participants, props.personalDetails]);

const chatRoomSubtitleText = (
const chatRoomSubtitleText = chatRoomSubtitle ? (
<Text
style={[styles.sidebarLinkText, styles.optionAlternateText, styles.textLabelSupporting, styles.mb2, styles.pre]}
style={[styles.sidebarLinkText, styles.textLabelSupporting, styles.pre, styles.mt1]}
numberOfLines={1}
>
{chatRoomSubtitle}
</Text>
);
) : null;

return (
<ScreenWrapper>
Expand All @@ -143,34 +143,32 @@ const ReportDetailsPage = (props) => {
onCloseButtonPress={() => Navigation.dismissModal()}
/>
<ScrollView style={[styles.flex1]}>
<View style={[styles.m5]}>
<View style={styles.reportDetailsTitleContainer}>
<View style={styles.mb4}>
<RoomHeaderAvatars icons={ReportUtils.getIcons(props.report, props.personalDetails, props.policies)} />
</View>
<View style={[styles.reportDetailsRoomInfo, styles.mw100]}>
<View style={[styles.alignSelfCenter, styles.w100]}>
<DisplayNames
fullTitle={ReportUtils.getReportName(props.report)}
displayNamesWithTooltips={displayNamesWithTooltips}
tooltipEnabled
numberOfLines={1}
textStyles={[styles.textHeadline, styles.mb2, styles.textAlignCenter, styles.pre]}
shouldUseFullTitle={isChatRoom || isPolicyExpenseChat || isThread}
/>
</View>
{isPolicyAdmin ? (
<Pressable
onPress={() => {
Navigation.navigate(ROUTES.getWorkspaceInitialRoute(props.report.policyID));
}}
>
{chatRoomSubtitleText}
</Pressable>
) : (
chatRoomSubtitleText
)}
<View style={styles.reportDetailsTitleContainer}>
<View style={styles.mb3}>
<RoomHeaderAvatars icons={ReportUtils.getIcons(props.report, props.personalDetails, props.policies)} />
</View>
<View style={[styles.reportDetailsRoomInfo, styles.mw100]}>
<View style={[styles.alignSelfCenter, styles.w100, styles.mt1]}>
<DisplayNames
fullTitle={ReportUtils.getReportName(props.report)}
displayNamesWithTooltips={displayNamesWithTooltips}
tooltipEnabled
numberOfLines={1}
textStyles={[styles.textHeadline, styles.textAlignCenter, styles.pre]}
shouldUseFullTitle={isChatRoom || isPolicyExpenseChat || isThread}
/>
</View>
{isPolicyAdmin ? (
<Pressable
onPress={() => {
Navigation.navigate(ROUTES.getWorkspaceInitialRoute(props.report.policyID));
}}
>
{chatRoomSubtitleText}
</Pressable>
) : (
chatRoomSubtitleText
)}
</View>
</View>
{_.map(menuItems, (item) => {
Expand Down
4 changes: 2 additions & 2 deletions src/styles/styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2090,8 +2090,8 @@ const styles = {
...flex.dFlex,
...flex.flexColumn,
...flex.alignItemsCenter,
...spacing.mt4,
height: 170,
paddingHorizontal: 20,
paddingBottom: 20,
},

reportDetailsRoomInfo: {
Expand Down