diff --git a/app/gabsocial/actions/me.js b/app/gabsocial/actions/me.js index 1d0054845..8ee555e0a 100644 --- a/app/gabsocial/actions/me.js +++ b/app/gabsocial/actions/me.js @@ -64,7 +64,6 @@ export function fetchMeFail(error) { return { type: ME_FETCH_FAIL, error, - skipAlert: true, }; }; diff --git a/app/gabsocial/reducers/instance.js b/app/gabsocial/reducers/instance.js index 1976de437..716b7aaa6 100644 --- a/app/gabsocial/reducers/instance.js +++ b/app/gabsocial/reducers/instance.js @@ -15,7 +15,7 @@ const initialState = ImmutableMap({ export default function instance(state = initialState, action) { switch(action.type) { case INSTANCE_IMPORT: - return ImmutableMap(fromJS(action.instance)); + return initialState.merge(fromJS(action.instance)); default: return state; } diff --git a/app/gabsocial/reducers/meta.js b/app/gabsocial/reducers/meta.js index 68f318526..024103d23 100644 --- a/app/gabsocial/reducers/meta.js +++ b/app/gabsocial/reducers/meta.js @@ -12,8 +12,11 @@ export default function meta(state = initialState, action) { return state.merge(action.state.get('meta')); case ME_FETCH_SUCCESS: const me = fromJS(action.me); - const pleroPrefs = me.get('pleroma').delete('settings_store'); - return state.mergeIn(['pleroma'], pleroPrefs); + if (me.has('pleroma')) { + const pleroPrefs = me.get('pleroma').delete('settings_store'); + return state.mergeIn(['pleroma'], pleroPrefs); + } + return state; default: return state; }