Skip to content

Commit

Permalink
Merge pull request #6766 from sidferreira/sidferreira/issue_6390
Browse files Browse the repository at this point in the history
  • Loading branch information
roryabraham authored Dec 16, 2021
2 parents 2a16ee5 + 8925786 commit f6b139c
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/pages/ReportDetailsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ class ReportDetailsPage extends Component {
styles.sidebarLinkText,
styles.optionAlternateText,
styles.textLabelSupporting,
styles.mb6,
styles.mb5,
]}
numberOfLines={1}
>
Expand Down
3 changes: 1 addition & 2 deletions src/pages/home/HeaderView.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ const HeaderView = (props) => {
>
<Pressable
onPress={() => {
if (ReportUtils.isDefaultRoom(props.report)) {
if (isDefaultChatRoom) {
return Navigation.navigate(ROUTES.getReportDetailsRoute(props.report.reportID));
}
if (participants.length === 1) {
Expand Down Expand Up @@ -154,7 +154,6 @@ const HeaderView = (props) => {
styles.sidebarLinkText,
styles.optionAlternateText,
styles.textLabelSupporting,
styles.mt1,
]}
numberOfLines={1}
>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/home/sidebar/OptionRow.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const OptionRow = (props) => {
: [styles.optionDisplayName, ...textUnreadStyle];
const alternateTextStyle = props.mode === 'compact'
? [textStyle, styles.optionAlternateText, styles.textLabelSupporting, styles.optionAlternateTextCompact]
: [textStyle, styles.optionAlternateText, styles.textLabelSupporting, styles.mt1];
: [textStyle, styles.optionAlternateText, styles.textLabelSupporting];
const contentContainerStyles = props.mode === 'compact'
? [styles.flex1, styles.flexRow, styles.overflowHidden, styles.alignItemsCenter]
: [styles.flex1];
Expand Down
2 changes: 0 additions & 2 deletions src/styles/optionAlternateTextPlatformStyles/index.ios.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
export default {
height: 20,
lineHeight: 20,
paddingTop: 1,
};
4 changes: 2 additions & 2 deletions src/styles/styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -1111,8 +1111,8 @@ const styles = {
},

optionAlternateText: {
height: 16,
lineHeight: 16,
height: 20,
lineHeight: 20,
},

optionAlternateTextCompact: {
Expand Down

0 comments on commit f6b139c

Please sign in to comment.