From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 5 Mar 2018 23:08:35 +0000 (+0100)
Subject: Fix accounts' display name/bio not being set from initial state (#6644)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=20d1be18af8c10b6f1bc5597643b85ac6dbae9f2;p=mastodon.git

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

diff --git a/app/javascript/mastodon/reducers/accounts.js b/app/javascript/mastodon/reducers/accounts.js
index f77061dfa..47e6d2330 100644
--- 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);