diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 18:49:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-06 18:49:46 +0100 |
| commit | 54101563bbadbfafd9291a867d7fbea6df3a8b7b (patch) | |
| tree | fcf9a125f6ebc3ad4182fa0edcbd7101b33aebb0 /app/javascript/flavours/glitch/features/notifications | |
| parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
| parent | 21d6bc16893a9dd24c5ef54cf2f554846c8eca5b (diff) | |
Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/notifications')
| -rw-r--r-- | app/javascript/flavours/glitch/features/notifications/index.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/notifications/index.js b/app/javascript/flavours/glitch/features/notifications/index.js index 67b155ced..fc42a4de4 100644 --- a/app/javascript/flavours/glitch/features/notifications/index.js +++ b/app/javascript/flavours/glitch/features/notifications/index.js @@ -64,7 +64,7 @@ const mapStateToProps = state => ({ showFilterBar: state.getIn(['settings', 'notifications', 'quickFilter', 'show']), notifications: getNotifications(state), localSettings: state.get('local_settings'), - isLoading: state.getIn(['notifications', 'isLoading'], true), + isLoading: state.getIn(['notifications', 'isLoading'], 0) > 0, isUnread: state.getIn(['notifications', 'unread']) > 0 || state.getIn(['notifications', 'pendingItems']).size > 0, hasMore: state.getIn(['notifications', 'hasMore']), numPending: state.getIn(['notifications', 'pendingItems'], ImmutableList()).size, |