kopia lustrzana https://gitlab.com/soapbox-pub/soapbox
Don't import frontend settings on VERIFY_CREDENTIALS_SUCCESS
rodzic
1e531f472e
commit
47dd4287d0
|
@ -3,7 +3,6 @@ import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications';
|
||||||
import { EMOJI_USE } from '../actions/emojis';
|
import { EMOJI_USE } from '../actions/emojis';
|
||||||
import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
|
import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
|
||||||
import { ME_FETCH_SUCCESS } from 'soapbox/actions/me';
|
import { ME_FETCH_SUCCESS } from 'soapbox/actions/me';
|
||||||
import { VERIFY_CREDENTIALS_SUCCESS } from 'soapbox/actions/auth';
|
|
||||||
import { Map as ImmutableMap, fromJS } from 'immutable';
|
import { Map as ImmutableMap, fromJS } from 'immutable';
|
||||||
|
|
||||||
// Default settings are in action/settings.js
|
// Default settings are in action/settings.js
|
||||||
|
@ -28,8 +27,6 @@ export default function settings(state = initialState, action) {
|
||||||
switch(action.type) {
|
switch(action.type) {
|
||||||
case ME_FETCH_SUCCESS:
|
case ME_FETCH_SUCCESS:
|
||||||
return importSettings(state, action.me);
|
return importSettings(state, action.me);
|
||||||
case VERIFY_CREDENTIALS_SUCCESS:
|
|
||||||
return importSettings(state, action.account);
|
|
||||||
case NOTIFICATIONS_FILTER_SET:
|
case NOTIFICATIONS_FILTER_SET:
|
||||||
case SETTING_CHANGE:
|
case SETTING_CHANGE:
|
||||||
return state
|
return state
|
||||||
|
|
Ładowanie…
Reference in New Issue