From f52186bc0139d75ee9b734eff49a5bd68c03977f Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Wed, 26 Aug 2020 00:37:55 -0500 Subject: [PATCH] Don't write settings back to Redux after PATCH, prevents race conditions --- app/soapbox/reducers/settings.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/soapbox/reducers/settings.js b/app/soapbox/reducers/settings.js index 2134c4cdc..1066716d7 100644 --- a/app/soapbox/reducers/settings.js +++ b/app/soapbox/reducers/settings.js @@ -3,7 +3,7 @@ import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications'; import { STORE_HYDRATE } from '../actions/store'; import { EMOJI_USE } from '../actions/emojis'; import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists'; -import { ME_FETCH_SUCCESS, ME_PATCH_SUCCESS } from 'soapbox/actions/me'; +import { ME_FETCH_SUCCESS } from 'soapbox/actions/me'; import { Map as ImmutableMap, fromJS } from 'immutable'; import uuid from '../uuid'; @@ -32,13 +32,8 @@ export default function settings(state = initialState, action) { case STORE_HYDRATE: return hydrate(state, action.state.get('settings')); case ME_FETCH_SUCCESS: - case ME_PATCH_SUCCESS: const me = fromJS(action.me); let fePrefs = me.getIn(['pleroma', 'settings_store', FE_NAME], ImmutableMap()); - // Spinster migration hotfix - if (fePrefs.get('locale') === '') { - fePrefs = fePrefs.delete('locale'); - } return state.merge(fePrefs); case NOTIFICATIONS_FILTER_SET: case SETTING_CHANGE: