toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

RN-202 Fix blank help link to not crash (#630)

Browse source
This commit is contained in:
enahum 2017-06-19 09:10:46 -04:00 committed by GitHub
parent 1a17f2970f
commit 2693ffc18b
1 changed files with 22 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
app/screens/settings/settings.js
View file

@ -16,6 +16,7 @@ import DeviceInfo from 'react-native-device-info';
import StatusBar from 'app/components/status_bar';
import {preventDoubleTap} from 'app/utils/tap';
import {changeOpacity, makeStyleSheetFromTheme} from 'app/utils/theme';
import {isValidUrl} from 'app/utils/url';
import SettingsItem from './settings_item';
@ -142,13 +143,14 @@ class Settings extends PureComponent {
openHelp = () => {
const {config} = this.props;
Linking.openURL(config.HelpLink);
Linking.openURL(config.HelpLink.toLowerCase());
};
render() {
const {config, joinableTeams, theme} = this.props;
const style = getStyleSheet(theme);
const showTeams = Object.keys(joinableTeams).length > 0;
const showHelp = isValidUrl(config.HelpLink);
return (
<View style={style.container}>
@ -164,26 +166,26 @@ class Settings extends PureComponent {
theme={theme}
/>
{showTeams &&
<SettingsItem
defaultMessage='Open teams you can join'
i18nId='mobile.select_team.join_open'
iconName='group'
iconType='material'
onPress={() => preventDoubleTap(this.goToSelectTeam, this)}
separator={true}
theme={theme}
/>
<SettingsItem
defaultMessage='Open teams you can join'
i18nId='mobile.select_team.join_open'
iconName='group'
iconType='material'
onPress={() => preventDoubleTap(this.goToSelectTeam, this)}
separator={true}
theme={theme}
/>
}
{config.HelpLink &&
<SettingsItem
defaultMessage='Help'
i18nId='mobile.help.title'
iconName='help'
iconType='material'
onPress={() => preventDoubleTap(this.openHelp, this)}
separator={true}
theme={theme}
/>
{showHelp &&
<SettingsItem
defaultMessage='Help'
i18nId='mobile.help.title'
iconName='help'
iconType='material'
onPress={() => preventDoubleTap(this.openHelp, this)}
separator={true}
theme={theme}
/>
}
<SettingsItem
defaultMessage='Report a Problem'