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

Make links clickable #1730

Merged
merged 8 commits into from
Feb 20, 2020
Merged

Make links clickable #1730

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d0af3c0
Merge pull request #1 from RocketChat/develop
Prateek93a Oct 29, 2019
5eeb5ce
Merge pull request #2 from RocketChat/develop
Prateek93a Dec 5, 2019
7663d37
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Feb 11, 2020
07483d7
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat.R…
Prateek93a Feb 14, 2020
f4d9af4
made-links-clickable
Prateek93a Feb 15, 2020
6b1bf42
display-italics-when-no-text
Prateek93a Feb 15, 2020
3361a0c
removed-commented-code
Prateek93a Feb 15, 2020
84587ad
Merge branch 'develop' into make-links-clickable
diegolmello Feb 20, 2020
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
13 changes: 7 additions & 6 deletions app/views/RoomInfoView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { themes } from '../../constants/colors';
import { withTheme } from '../../theme';
import { themedHeader } from '../../utils/navigation';
import { getUserSelector } from '../../selectors/login';
import Markdown from '../../containers/markdown';

const PERMISSION_EDIT_ROOM = 'edit-room';
const camelize = str => str.replace(/^(.)/, (match, chr) => chr.toUpperCase());
Expand Down Expand Up @@ -172,12 +173,12 @@ class RoomInfoView extends React.Component {
const { theme } = this.props;
return (
<View style={styles.item}>
<Text style={[styles.itemLabel, { color: themes[theme].titleText }]}>{I18n.t(camelize(key))}</Text>
<Text
style={[styles.itemContent, !room[key] && styles.itemContent__empty, { color: themes[theme].auxiliaryText }]}
testID={`room-info-view-${ key }`}
>{ room[key] ? room[key] : I18n.t(`No_${ key }_provided`) }
</Text>
<Text style={[styles.itemLabel, { color: themes[theme].auxiliaryText }]}>{I18n.t(camelize(key))}</Text>
<Markdown
useMarkdown
msg={room[key] ? room[key] : `__${ I18n.t(`No_${ key }_provided`) }__`}
theme={theme}
/>
</View>
);
}
Expand Down