Merge pull request #2534 from hmhealey/plt2184

PLT-2184 Moved theme reset code to componentWillUnmount

1 files changed, 6 insertions, 7 deletions

diff --git a/webapp/components/user_settings/user_settings_theme.jsx b/webapp/components/user_settings/user_settings_theme.jsx
index 3414fe2e2..14991037d 100644
--- a/webapp/components/user_settings/user_settings_theme.jsx
+++ b/webapp/components/user_settings/user_settings_theme.jsx
@@ -40,7 +40,6 @@ export default class ThemeSetting extends React.Component {
         this.onChange = this.onChange.bind(this);
         this.submitTheme = this.submitTheme.bind(this);
         this.updateTheme = this.updateTheme.bind(this);
-        this.deactivate = this.deactivate.bind(this);
         this.resetFields = this.resetFields.bind(this);
         this.handleImportModal = this.handleImportModal.bind(this);
 
@@ -62,12 +61,17 @@ export default class ThemeSetting extends React.Component {
         }
     }
     componentWillReceiveProps(nextProps) {
-        if (!this.props.selected && nextProps.selected) {
+        if (this.props.selected && !nextProps.selected) {
             this.resetFields();
         }
     }
     componentWillUnmount() {
         UserStore.removeChangeListener(this.onChange);
+
+        if (this.props.selected) {
+            const state = this.getStateFromStores();
+            Utils.applyTheme(state.theme);
+        }
     }
     getStateFromStores() {
         const user = UserStore.getCurrentUser();
@@ -147,11 +151,6 @@ export default class ThemeSetting extends React.Component {
     updateType(type) {
         this.setState({type});
     }
-    deactivate() {
-        const state = this.getStateFromStores();
-
-        Utils.applyTheme(state.theme);
-    }
     resetFields() {
         const state = this.getStateFromStores();
         state.serverError = null;