diff options
author | Stefan Malzner <stefan@adlk.io> | 2017-11-30 00:12:16 +0100 |
---|---|---|
committer | Stefan Malzner <stefan@adlk.io> | 2017-11-30 00:12:16 +0100 |
commit | 3045b47d869da4e62e9403c63652baeb7b349e1d (patch) | |
tree | ae579477cd09b4683b78eb473ebc7abbb88ffc20 /src/containers | |
parent | fix(App): App mute now disables notifications as well (diff) | |
download | ferdium-app-3045b47d869da4e62e9403c63652baeb7b349e1d.tar.gz ferdium-app-3045b47d869da4e62e9403c63652baeb7b349e1d.tar.zst ferdium-app-3045b47d869da4e62e9403c63652baeb7b349e1d.zip |
fix(App): Allow to turn on notifications when system dnd is enabled
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 7c6ceccd6..da0896844 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -73,13 +73,11 @@ export default class AppLayoutContainer extends Component { | |||
73 | ); | 73 | ); |
74 | } | 74 | } |
75 | 75 | ||
76 | const isMuted = settings.all.isAppMuted || app.isSystemMuted; | ||
77 | |||
78 | const sidebar = ( | 76 | const sidebar = ( |
79 | <Sidebar | 77 | <Sidebar |
80 | services={services.allDisplayed} | 78 | services={services.allDisplayed} |
81 | setActive={setActive} | 79 | setActive={setActive} |
82 | isAppMuted={isMuted} | 80 | isAppMuted={settings.all.isAppMuted} |
83 | openSettings={openSettings} | 81 | openSettings={openSettings} |
84 | closeSettings={closeSettings} | 82 | closeSettings={closeSettings} |
85 | reorder={reorder} | 83 | reorder={reorder} |
@@ -99,7 +97,7 @@ export default class AppLayoutContainer extends Component { | |||
99 | setWebviewReference={setWebviewReference} | 97 | setWebviewReference={setWebviewReference} |
100 | openWindow={openWindow} | 98 | openWindow={openWindow} |
101 | reload={reload} | 99 | reload={reload} |
102 | isAppMuted={isMuted} | 100 | isAppMuted={settings.all.isAppMuted} |
103 | update={updateService} | 101 | update={updateService} |
104 | /> | 102 | /> |
105 | ); | 103 | ); |