diff --git a/app/screens/settings/about/about.tsx b/app/screens/settings/about/about.tsx index cead5bdae..e569be624 100644 --- a/app/screens/settings/about/about.tsx +++ b/app/screens/settings/about/about.tsx @@ -118,15 +118,11 @@ const About = ({config, license}: AboutProps) => { }, []); const handleAboutTeam = useCallback(preventDoubleTap(() => { - return openURL(Config.AboutTeamURL); - }), []); - - const handleAboutEnterprise = useCallback(preventDoubleTap(() => { - return openURL(Config.AboutEnterpriseURL); + return openURL(Config.WebsiteURL); }), []); const handlePlatformNotice = useCallback(preventDoubleTap(() => { - return openURL(Config.PlatformNoticeURL); + return openURL(Config.ServerNoticeURL); }), []); const handleMobileNotice = useCallback(preventDoubleTap(() => { @@ -256,8 +252,7 @@ const About = ({config, license}: AboutProps) => { )} {!MATTERMOST_BUNDLE_IDS.includes(DeviceInfo.getBundleId()) && { type LearnMoreProps = { config: ClientConfig; - onHandleAboutEnterprise: () => void; - onHandleAboutTeam: () => void; + onPress: () => void; }; -const LearnMore = ({config, onHandleAboutEnterprise, onHandleAboutTeam}: LearnMoreProps) => { +const LearnMore = ({config, onPress}: LearnMoreProps) => { const theme = useTheme(); const style = getStyleSheet(theme); let id = t('about.teamEditionLearn'); let defaultMessage = 'Join the Mattermost community at '; - let onPress = onHandleAboutTeam; - let url = Config.TeamEditionLearnURL; + const url = Config.WebsiteURL; if (config.BuildEnterpriseReady === 'true') { id = t('about.enterpriseEditionLearn'); defaultMessage = 'Learn more about Enterprise Edition at '; - onPress = onHandleAboutEnterprise; - url = Config.EELearnURL; } return ( diff --git a/assets/base/config.json b/assets/base/config.json index 5aded61ad..701aeda8b 100644 --- a/assets/base/config.json +++ b/assets/base/config.json @@ -2,14 +2,12 @@ "DefaultServerUrl": "", "DefaultServerName": "", "TestServerUrl": "http://localhost:8065", - "DefaultTheme": "default", - "ShowErrorsList": false, - "EELearnURL": "about.mattermost.com", - "TeamEditionLearnURL": "mattermost.org", - "AboutTeamURL": "http://www.mattermost.org/", - "AboutEnterpriseURL": "http://about.mattermost.com/", - "PlatformNoticeURL": "https://about.mattermost.com/platform-notice-txt/", - "MobileNoticeURL": "https://about.mattermost.com/mobile-notice-txt/", + "AutoSelectServerUrl": false, + + "WebsiteURL": "https://mattermost.com", + "ServerNoticeURL": "https://github.com/mattermost/mattermost-server/blob/master/NOTICE.txt", + "MobileNoticeURL": "https://github.com/mattermost/mattermost-mobile/blob/master/NOTICE.txt", + "RudderApiKey": "", "SentryEnabled": false, @@ -23,19 +21,9 @@ } }, - "ExperimentalNormalizeMarkdownLinks": false, - - "AutoSelectServerUrl": false, - - "EnableMobileClientUpgrade": false, - "EnableMobileClientUpgradeUserSetting": false, - "EnableForceMobileClientUpgrade": false, - "MobileClientUpgradeAndroidApkLink": "https://about.mattermost.com/mattermost-android-app/", - "MobileClientUpgradeIosIpaLink": "https://about.mattermost.com/mattermost-ios-app/", - - "ShowSentryDebugOptions": false, - - "CustomRequestHeaders": {}, "ShowReview": false, - "ShowOnboarding": false + "ShowOnboarding": false, + + "ExperimentalNormalizeMarkdownLinks": false, + "CustomRequestHeaders": {} }