fix JS errors in saving preferences - for user's display (including custom theme vector) and advanced settings (#6764)

3 files changed, 3 insertions, 16 deletions

diff --git a/webapp/actions/user_actions.jsx b/webapp/actions/user_actions.jsx
index b28bc71c0..5ebec3efb 100644
--- a/webapp/actions/user_actions.jsx
+++ b/webapp/actions/user_actions.jsx
@@ -391,7 +391,7 @@ export function saveTheme(teamId, theme, cb) {
         value: JSON.stringify(theme)
     }];
 
-    savePreferences(currentUserId, preference)(dispatch, getState).then(
+    savePreferencesRedux(currentUserId, preference)(dispatch, getState).then(
         () => {
             onThemeSaved(teamId, theme, cb);
         }
@@ -793,17 +793,10 @@ export function loadMyTeamMembers() {
     );
 }
 
-export function savePreferences(prefs, success, error) {
+export function savePreferences(prefs, callback) {
     const currentUserId = UserStore.getCurrentId();
     savePreferencesRedux(currentUserId, prefs)(dispatch, getState).then(
-        (data) => {
-            if (data && success) {
-                success(data);
-            } else if (data == null && error) {
-                const serverError = getState().requests.preferences.savePreferences.error;
-                error({id: serverError.server_error_id, ...serverError});
-            }
-        }
+        () => callback()
     );
 }
 
diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx
index 1e2ae2386..cc5824589 100644
--- a/webapp/components/user_settings/user_settings_advanced.jsx
+++ b/webapp/components/user_settings/user_settings_advanced.jsx
@@ -137,9 +137,6 @@ export default class AdvancedSettingsDisplay extends React.Component {
             preferences,
             () => {
                 this.updateSection('');
-            },
-            (err) => {
-                this.setState({serverError: err.message});
             }
         );
     }
diff --git a/webapp/components/user_settings/user_settings_display.jsx b/webapp/components/user_settings/user_settings_display.jsx
index ccc70a108..9311f6b45 100644
--- a/webapp/components/user_settings/user_settings_display.jsx
+++ b/webapp/components/user_settings/user_settings_display.jsx
@@ -94,9 +94,6 @@ export default class UserSettingsDisplay extends React.Component {
         savePreferences([timePreference, namePreference, fontPreference, channelDisplayModePreference, messageDisplayPreference, collapseDisplayPreference],
             () => {
                 this.updateSection('');
-            },
-            (err) => {
-                this.setState({serverError: err.message});
             }
         );
     }