diff options
| author | enahum <nahumhbl@gmail.com> | 2016-12-06 12:22:19 -0300 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-12-06 10:22:19 -0500 |
| commit | 4df1ad2b28a660b1a0b96869701ffb0b9f0a6219 (patch) | |
| tree | d9c5377b31d92e01a840e987051d22fb2f44ac24 | |
| parent | b477e384d86e9233aed55448598352d2c42a1525 (diff) | |
| download | chat-4df1ad2b28a660b1a0b96869701ffb0b9f0a6219.tar.gz chat-4df1ad2b28a660b1a0b96869701ffb0b9f0a6219.tar.bz2 chat-4df1ad2b28a660b1a0b96869701ffb0b9f0a6219.zip | |
PLT-4859 Email notifications sent when email notifications set to never (#4711)
| -rw-r--r-- | webapp/components/create_comment.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/user_settings/email_notification_setting.jsx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/webapp/components/create_comment.jsx b/webapp/components/create_comment.jsx index 543aef202..a235691b4 100644 --- a/webapp/components/create_comment.jsx +++ b/webapp/components/create_comment.jsx @@ -490,5 +490,5 @@ export default class CreateComment extends React.Component { CreateComment.propTypes = { channelId: React.PropTypes.string.isRequired, rootId: React.PropTypes.string.isRequired, - latestPostId: React.PropTypes.string.isRequired + latestPostId: React.PropTypes.string }; diff --git a/webapp/components/user_settings/email_notification_setting.jsx b/webapp/components/user_settings/email_notification_setting.jsx index cc81c2faf..a8319de29 100644 --- a/webapp/components/user_settings/email_notification_setting.jsx +++ b/webapp/components/user_settings/email_notification_setting.jsx @@ -64,7 +64,7 @@ export default class EmailNotificationSetting extends React.Component { if (this.props.activeSection !== 'email') { let description; - if (this.props.enableEmail === 'true') { + if (this.props.enableEmail) { switch (this.state.emailInterval) { case INTERVAL_IMMEDIATE: description = ( @@ -119,7 +119,7 @@ export default class EmailNotificationSetting extends React.Component { <input type='radio' name='emailNotifications' - checked={this.props.enableEmail === 'true' && this.state.emailInterval === INTERVAL_FIFTEEN_MINUTES} + checked={this.props.enableEmail && this.state.emailInterval === INTERVAL_FIFTEEN_MINUTES} onChange={this.handleChange.bind(this, 'true', INTERVAL_FIFTEEN_MINUTES)} /> <FormattedMessage @@ -134,7 +134,7 @@ export default class EmailNotificationSetting extends React.Component { <input type='radio' name='emailNotifications' - checked={this.props.enableEmail === 'true' && this.state.emailInterval === INTERVAL_HOUR} + checked={this.props.enableEmail && this.state.emailInterval === INTERVAL_HOUR} onChange={this.handleChange.bind(this, 'true', INTERVAL_HOUR)} /> <FormattedMessage @@ -170,7 +170,7 @@ export default class EmailNotificationSetting extends React.Component { <input type='radio' name='emailNotifications' - checked={this.props.enableEmail === 'true' && this.state.emailInterval === INTERVAL_IMMEDIATE} + checked={this.props.enableEmail && this.state.emailInterval === INTERVAL_IMMEDIATE} onChange={this.handleChange.bind(this, 'true', INTERVAL_IMMEDIATE)} /> <FormattedMessage @@ -185,7 +185,7 @@ export default class EmailNotificationSetting extends React.Component { <input type='radio' name='emailNotifications' - checked={this.props.enableEmail === 'false'} + checked={!this.props.enableEmail} onChange={this.handleChange.bind(this, 'false', INTERVAL_IMMEDIATE)} /> <FormattedMessage |