From 409d36d375ceba0bcb6a43116d4a503d70d0e5de Mon Sep 17 00:00:00 2001 From: Daniel Schalla Date: Fri, 1 Feb 2019 23:34:57 +0100 Subject: [PATCH] [MM-13839] Remove possibility to change eMail within mobile app (#2540) * Make eMail setting read only * Add translation entry, change wording * Update wording --- app/screens/edit_profile/edit_profile.js | 16 ++++++---------- assets/base/i18n/en.json | 1 + 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/screens/edit_profile/edit_profile.js b/app/screens/edit_profile/edit_profile.js index c3334fb66..21674b5df 100644 --- a/app/screens/edit_profile/edit_profile.js +++ b/app/screens/edit_profile/edit_profile.js @@ -354,21 +354,17 @@ export default class EditProfile extends PureComponent { renderEmailSettings = () => { const {formatMessage} = this.context.intl; - const {config, currentUser, theme} = this.props; + const {currentUser, theme} = this.props; const {email} = this.state; let helpText; - let disabled = false; - if (config.SendEmailNotifications !== 'true') { - disabled = true; + if (currentUser.auth_service === '') { helpText = formatMessage({ - id: 'user.settings.general.emailHelp1', - defaultMessage: 'Email is used for sign-in, notifications, and password reset. Email requires verification if changed.', + id: 'user.settings.general.emailCantUpdate', + defaultMessage: 'Email must be updated using a web client or desktop application.', }); - } else if (currentUser.auth_service !== '') { - disabled = true; - + } else { switch (currentUser.auth_service) { case 'gitlab': helpText = formatMessage({ @@ -406,7 +402,7 @@ export default class EditProfile extends PureComponent { return (