Merge pull request #2208 from mattermost/client-upgrades

Updating some client deps + eslint

3 files changed, 13 insertions, 7 deletions

diff --git a/web/react/components/user_settings/user_settings_integrations.jsx b/web/react/components/user_settings/user_settings_integrations.jsx
index 07d5230d1..e4f460a6d 100644
--- a/web/react/components/user_settings/user_settings_integrations.jsx
+++ b/web/react/components/user_settings/user_settings_integrations.jsx
@@ -57,7 +57,7 @@ class UserSettingsIntegrationsTab extends React.Component {
         if (global.window.mm_config.EnableIncomingWebhooks === 'true') {
             if (this.props.activeSection === 'incoming-hooks') {
                 inputs.push(
-                    <ManageIncomingHooks key='incoming-hook-ui' />
+                    <ManageIncomingHooks key='incoming-hook-ui'/>
                 );
 
                 incomingHooksSection = (
@@ -88,7 +88,7 @@ class UserSettingsIntegrationsTab extends React.Component {
         if (global.window.mm_config.EnableOutgoingWebhooks === 'true') {
             if (this.props.activeSection === 'outgoing-hooks') {
                 inputs.push(
-                    <ManageOutgoingHooks key='outgoing-hook-ui' />
+                    <ManageOutgoingHooks key='outgoing-hook-ui'/>
                 );
 
                 outgoingHooksSection = (
@@ -119,7 +119,7 @@ class UserSettingsIntegrationsTab extends React.Component {
         if (global.window.mm_config.EnableCommands === 'true') {
             if (this.props.activeSection === 'command-hooks') {
                 inputs.push(
-                    <ManageCommandHooks key='command-hook-ui' />
+                    <ManageCommandHooks key='command-hook-ui'/>
                 );
 
                 commandHooksSection = (
diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx
index 5442f7ac4..80d03d88e 100644
--- a/web/react/components/user_settings/user_settings_modal.jsx
+++ b/web/react/components/user_settings/user_settings_modal.jsx
@@ -111,12 +111,13 @@ class UserSettingsModal extends React.Component {
             this.afterConfirm = () => this.handleHide();
             this.showConfirmModal();
 
-            return false;
+            return;
         }
 
         this.resetTheme();
         this.deactivateTab();
         this.props.onModalDismissed();
+        return;
     }
 
     // called after the dialog is fully hidden and faded out
@@ -295,7 +296,12 @@ class UserSettingsModal extends React.Component {
                                 closeModal={this.closeModal}
                                 collapseModal={this.collapseModal}
                                 setEnforceFocus={(enforceFocus) => this.setState({enforceFocus})}
-                                setRequireConfirm={(requireConfirm) => this.requireConfirm = requireConfirm}
+                                setRequireConfirm={
+                                    (requireConfirm) => {
+                                        this.requireConfirm = requireConfirm;
+                                        return;
+                                    }
+                                }
                             />
                         </div>
                     </div>
diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx
index 786e53f10..ee9febb8e 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -445,7 +445,7 @@ class NotificationsTab extends React.Component {
                     title={formatMessage(holders.desktopSounds)}
                     describe={describe}
                     updateSection={handleUpdateSoundSection}
-                    disableOpen = {!this.state.soundNeeded}
+                    disableOpen={!this.state.soundNeeded}
                 />
             );
         }
@@ -826,4 +826,4 @@ NotificationsTab.propTypes = {
     collapseModal: React.PropTypes.func.isRequired
 };
 
-export default injectIntl(NotificationsTab);
\ No newline at end of file
+export default injectIntl(NotificationsTab);