diff options
| author | Starfall <us@starfall.systems> | 2020-12-24 13:36:25 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-12-24 13:36:25 -0600 |
| commit | 6ed4e874c5ace36344f77b3f096c4089d9b11e01 (patch) | |
| tree | 83b2675d297f56a75b5e5dec33c644bc19f6cf1b /app/javascript/flavours/glitch/reducers | |
| parent | ab127fd7941b7c84e6d6fe3071d41f52affb143c (diff) | |
| parent | 225c934a1b66e2fcbedbda7936666c1ca3c9a04b (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/javascript/flavours/glitch/reducers')
| -rw-r--r-- | app/javascript/flavours/glitch/reducers/notifications.js | 3 | ||||
| -rw-r--r-- | app/javascript/flavours/glitch/reducers/settings.js | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js index c630cc7e3..b4c5ef71a 100644 --- a/app/javascript/flavours/glitch/reducers/notifications.js +++ b/app/javascript/flavours/glitch/reducers/notifications.js @@ -19,7 +19,6 @@ import { NOTIFICATIONS_MARK_AS_READ, NOTIFICATIONS_SET_BROWSER_SUPPORT, NOTIFICATIONS_SET_BROWSER_PERMISSION, - NOTIFICATIONS_DISMISS_BROWSER_PERMISSION, } from 'flavours/glitch/actions/notifications'; import { ACCOUNT_BLOCK_SUCCESS, @@ -284,8 +283,6 @@ export default function notifications(state = initialState, action) { return state.set('browserSupport', action.value); case NOTIFICATIONS_SET_BROWSER_PERMISSION: return state.set('browserPermission', action.value); - case NOTIFICATIONS_DISMISS_BROWSER_PERMISSION: - return state.set('browserPermission', 'denied'); case NOTIFICATION_MARK_FOR_DELETE: return markForDelete(state, action.id, action.yes); diff --git a/app/javascript/flavours/glitch/reducers/settings.js b/app/javascript/flavours/glitch/reducers/settings.js index bf0545c48..091b8feec 100644 --- a/app/javascript/flavours/glitch/reducers/settings.js +++ b/app/javascript/flavours/glitch/reducers/settings.js @@ -48,6 +48,8 @@ const initialState = ImmutableMap({ advanced: false, }), + dismissPermissionBanner: false, + shows: ImmutableMap({ follow: true, follow_request: false, |