diff options
| author | ThibG <thib@sitedethib.com> | 2020-12-19 02:17:02 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-19 02:17:02 +0100 |
| commit | 79c57810b7fea1962c9746d74c90235ad4e3e899 (patch) | |
| tree | 6ec332dd20fa4ce8de954d8e260cce3f2dc67aee /app/javascript/flavours/glitch/features/notifications/index.js | |
| parent | 92cfcf168cae094ece281b3cb6d0f5b1539a8c25 (diff) | |
| parent | 5c966bef8b6aa116cfa2102e83e42d0fe421f3fc (diff) | |
Merge pull request #1477 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/notifications/index.js')
| -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 73d969517..5ceda9a91 100644 --- a/app/javascript/flavours/glitch/features/notifications/index.js +++ b/app/javascript/flavours/glitch/features/notifications/index.js @@ -69,7 +69,7 @@ const mapStateToProps = state => ({ notifCleaningActive: state.getIn(['notifications', 'cleaningMode']), lastReadId: state.getIn(['local_settings', 'notifications', 'show_unread']) ? state.getIn(['notifications', 'readMarkerId']) : '0', canMarkAsRead: state.getIn(['local_settings', 'notifications', 'show_unread']) && state.getIn(['notifications', 'readMarkerId']) !== '0' && getNotifications(state).some(item => item !== null && compareId(item.get('id'), state.getIn(['notifications', 'readMarkerId'])) > 0), - needsNotificationPermission: state.getIn(['settings', 'notifications', 'alerts']).includes(true) && state.getIn(['notifications', 'browserSupport']) && state.getIn(['notifications', 'browserPermission']) === 'default', + needsNotificationPermission: state.getIn(['settings', 'notifications', 'alerts']).includes(true) && state.getIn(['notifications', 'browserSupport']) && state.getIn(['notifications', 'browserPermission']) === 'default' && !state.getIn(['settings', 'notifications', 'dismissPermissionBanner']), }); /* glitch */ |