diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-03-06 00:08:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-06 00:08:35 +0100 |
| commit | 20d1be18af8c10b6f1bc5597643b85ac6dbae9f2 (patch) | |
| tree | 1d6b976c34124831efe75d0bf9a86ab8e2adb56b /app/javascript/mastodon/reducers/accounts.js | |
| parent | b0664a5e6cee9be602098fb9a2f98a9e61b2ab9b (diff) | |
Fix accounts' display name/bio not being set from initial state (#6644)
Diffstat (limited to 'app/javascript/mastodon/reducers/accounts.js')
| -rw-r--r-- | app/javascript/mastodon/reducers/accounts.js | 2 |
1 files changed, 1 insertions, 1 deletions
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); |