diff options
author | ThibG <thib@sitedethib.com> | 2020-01-28 19:38:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-28 19:38:37 +0100 |
commit | abe2cc489bf421b5bfdf9d804104bb5ba2d1faa6 (patch) | |
tree | df4b6abe95f0e4c9a422eee52ccc03a8571655fe /app/javascript/flavours/glitch/reducers/announcements.js | |
parent | 67b8af34b3df55ba74a53af731f275d0a4c6d9f8 (diff) | |
parent | 8bb5d1abaad3bec92ac8d9cefcf5b1871429edcb (diff) |
Merge pull request #1272 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/reducers/announcements.js')
-rw-r--r-- | app/javascript/flavours/glitch/reducers/announcements.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/reducers/announcements.js b/app/javascript/flavours/glitch/reducers/announcements.js index 3215c1c2d..1653318ce 100644 --- a/app/javascript/flavours/glitch/reducers/announcements.js +++ b/app/javascript/flavours/glitch/reducers/announcements.js @@ -16,7 +16,7 @@ import { Map as ImmutableMap, List as ImmutableList, Set as ImmutableSet, fromJS const initialState = ImmutableMap({ items: ImmutableList(), isLoading: false, - show: true, + show: false, unread: ImmutableSet(), }); @@ -84,10 +84,11 @@ export default function announcementsReducer(state = initialState, action) { const items = fromJS(action.announcements); map.set('unread', ImmutableSet()); - map.set('items', items); - map.set('isLoading', false); addUnread(map, items); + + map.set('items', items); + map.set('isLoading', false); }); case ANNOUNCEMENTS_FETCH_FAIL: return state.set('isLoading', false); |