From d67b7a2debbc42163de6653583f7369676bd2b0b Mon Sep 17 00:00:00 2001 From: Mattermost Build Date: Fri, 25 Sep 2020 04:22:47 -0400 Subject: [PATCH] [MM-23909] better error message if url is empty (#4821) (#4842) (cherry picked from commit b6fbcf2e7cbfff9d11295340cbdc406ad2b5cdd1) Co-authored-by: Ashish Bhate --- app/screens/select_server/select_server.js | 13 +++++++++++++ assets/base/i18n/en.json | 1 + 2 files changed, 14 insertions(+) diff --git a/app/screens/select_server/select_server.js b/app/screens/select_server/select_server.js index e77688307..dbb2e31b6 100644 --- a/app/screens/select_server/select_server.js +++ b/app/screens/select_server/select_server.js @@ -206,6 +206,19 @@ export default class SelectServer extends PureComponent { return; } + if (!this.state.url || this.state.url.trim() === '') { + this.setState({ + error: { + intl: { + id: t('mobile.server_url.empty'), + defaultMessage: 'Please enter a valid server URL', + }, + }, + }); + + return; + } + if (!isValidUrl(this.sanitizeUrl(this.state.url))) { this.setState({ error: { diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json index 8d709b8a6..01fdaf879 100644 --- a/assets/base/i18n/en.json +++ b/assets/base/i18n/en.json @@ -479,6 +479,7 @@ "mobile.server_upgrade.dismiss": "Dismiss", "mobile.server_upgrade.learn_more": "Learn More", "mobile.server_upgrade.title": "Server upgrade required", + "mobile.server_url.empty": "Please enter a valid server URL", "mobile.server_url.invalid_format": "URL must start with http:// or https://", "mobile.session_expired": "Session Expired: Please log in to continue receiving notifications. Sessions for {siteName} are configured to expire every {daysCount, number} {daysCount, plural, one {day} other {days}}.", "mobile.set_status.away": "Away",