From 4cf7cfd9e0e3b7eed60e14dd042b6a9a2031a158 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Mon, 30 Jul 2018 14:07:04 +0200 Subject: [Glitch] Fix accounts' display name/bio not being set from initial state Port 20d1be18af8c10b6f1bc5597643b85ac6dbae9f2 to glitch-soc --- app/javascript/flavours/glitch/reducers/accounts.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript/flavours/glitch') diff --git a/app/javascript/flavours/glitch/reducers/accounts.js b/app/javascript/flavours/glitch/reducers/accounts.js index 2156de029..c38b3cc95 100644 --- a/app/javascript/flavours/glitch/reducers/accounts.js +++ b/app/javascript/flavours/glitch/reducers/accounts.js @@ -122,7 +122,7 @@ const initialState = ImmutableMap(); export default function accounts(state = initialState, action) { switch(action.type) { case STORE_HYDRATE: - return state.merge(action.state.get('accounts')); + return normalizeAccounts(state, Object.values(action.state.get('accounts').toJS())); case ACCOUNT_FETCH_SUCCESS: case NOTIFICATIONS_UPDATE: return normalizeAccount(state, action.account); -- cgit