mastofe

commit: 20d1be18af8c10b6f1bc5597643b85ac6dbae9f2
parent: b0664a5e6cee9be602098fb9a2f98a9e61b2ab9b
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Tue,  6 Mar 2018 00:08:35 +0100

Fix accounts' display name/bio not being set from initial state (#6644)


Diffstat:
M
app/javascript/mastodon/reducers/accounts.js
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/javascript/mastodon/reducers/accounts.js b/app/javascript/mastodon/reducers/accounts.js
@@ -102,7 +102,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);