about summary refs log tree commit diff
path: root/app/javascript
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-07-30 14:07:04 +0200
committerThibG <thib@sitedethib.com>2018-07-30 14:24:24 +0200
commit4cf7cfd9e0e3b7eed60e14dd042b6a9a2031a158 (patch)
tree4abc9a803e126e7542877dde2d3e3e9c97ebcf1d /app/javascript
parentd8544e7003f2952b7738bfd6659df498986bc26e (diff)
[Glitch] Fix accounts' display name/bio not being set from initial state
Port 20d1be18af8c10b6f1bc5597643b85ac6dbae9f2 to glitch-soc
Diffstat (limited to 'app/javascript')
-rw-r--r--app/javascript/flavours/glitch/reducers/accounts.js2
1 files changed, 1 insertions, 1 deletions
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);