From 2693ffc18b255aa32370ead997500b7b3bbc037e Mon Sep 17 00:00:00 2001 From: enahum Date: Mon, 19 Jun 2017 09:10:46 -0400 Subject: [PATCH] RN-202 Fix blank help link to not crash (#630) --- app/screens/settings/settings.js | 42 +++++++++++++++++--------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/app/screens/settings/settings.js b/app/screens/settings/settings.js index abe27932d..934bf5498 100644 --- a/app/screens/settings/settings.js +++ b/app/screens/settings/settings.js @@ -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 ( @@ -164,26 +166,26 @@ class Settings extends PureComponent { theme={theme} /> {showTeams && - preventDoubleTap(this.goToSelectTeam, this)} - separator={true} - theme={theme} - /> + preventDoubleTap(this.goToSelectTeam, this)} + separator={true} + theme={theme} + /> } - {config.HelpLink && - preventDoubleTap(this.openHelp, this)} - separator={true} - theme={theme} - /> + {showHelp && + preventDoubleTap(this.openHelp, this)} + separator={true} + theme={theme} + /> }