summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings
diff options
context:
space:
mode:
authorRyan Wang <R-Wang97@users.noreply.github.com>2017-04-27 09:40:11 -0400
committerJoram Wilander <jwawilander@gmail.com>2017-04-27 09:40:11 -0400
commit66f538783bfbcb0814bcc7dff3697e84e8554649 (patch)
treedcf2b0911893a1306cfab798bb2c2a922a742008 /webapp/components/user_settings
parentf5d9010f9a2670e09587cd6b0e5b8c3296c8d4b4 (diff)
downloadchat-66f538783bfbcb0814bcc7dff3697e84e8554649.tar.gz
chat-66f538783bfbcb0814bcc7dff3697e84e8554649.tar.bz2
chat-66f538783bfbcb0814bcc7dff3697e84e8554649.zip
Create seperate field for current email (#6197)
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r--webapp/components/user_settings/user_settings_general/user_settings_general.jsx23
1 files changed, 20 insertions, 3 deletions
diff --git a/webapp/components/user_settings/user_settings_general/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general/user_settings_general.jsx
index 79132d929..58f718549 100644
--- a/webapp/components/user_settings/user_settings_general/user_settings_general.jsx
+++ b/webapp/components/user_settings/user_settings_general/user_settings_general.jsx
@@ -365,7 +365,8 @@ class UserSettingsGeneralTab extends React.Component {
lastName: user.last_name,
nickname: user.nickname,
position: user.position,
- email: user.email,
+ originalEmail: user.email,
+ email: '',
confirmEmail: '',
picture: null,
loadingPicture: false,
@@ -424,12 +425,28 @@ class UserSettingsGeneralTab extends React.Component {
if (this.props.user.auth_service === '') {
inputs.push(
+ <div key='currentEmailSetting'>
+ <div className='form-group'>
+ <label className='col-sm-5 control-label'>
+ <FormattedMessage
+ id='user.settings.general.currentEmail'
+ defaultMessage='Current Email'
+ />
+ </label>
+ <div className='col-sm-7'>
+ <label className='control-label'>{this.state.originalEmail}</label>
+ </div>
+ </div>
+ </div>
+ );
+
+ inputs.push(
<div key='emailSetting'>
<div className='form-group'>
<label className='col-sm-5 control-label'>
<FormattedMessage
- id='user.settings.general.primaryEmail'
- defaultMessage='Primary Email'
+ id='user.settings.general.newEmail'
+ defaultMessage='New Email'
/>
</label>
<div className='col-sm-7'>