Skip to content

Commit 0fa1caf

Browse files
committed
fix(App): App mute now disables notifications as well
1 parent 0ca3912 commit 0fa1caf

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

Diff for: src/components/layout/Sidebar.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ const messages = defineMessages({
1717
defaultMessage: '!!!Add new service',
1818
},
1919
mute: {
20-
id: 'sidebar.mute',
21-
defaultMessage: '!!!Disable audio',
20+
id: 'sidebar.muteApp',
21+
defaultMessage: '!!!Disable notifications & audio',
2222
},
2323
unmute: {
24-
id: 'sidebar.unmute',
25-
defaultMessage: '!!!Enable audio',
24+
id: 'sidebar.unmuteApp',
25+
defaultMessage: '!!!Enable notifications & audio',
2626
},
2727
});
2828

Diff for: src/i18n/locales/en-US.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@
6262
"infobar.requiredRequestsFailed": "Could not load services and user information",
6363
"sidebar.settings": "Settings",
6464
"sidebar.addNewService": "Add new service",
65-
"sidebar.mute": "Disable audio",
66-
"sidebar.unmute": "Enable audio",
65+
"sidebar.muteApp": "Disable notifications & audio",
66+
"sidebar.unmuteApp": "Enable notifications & audio",
6767
"services.welcome": "Welcome to Franz",
6868
"services.getStarted": "Get started",
6969
"settings.account.headline": "Account",

Diff for: src/stores/AppStore.js

+2
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,8 @@ export default class AppStore extends Store {
150150

151151
// Actions
152152
@action _notify({ title, options, notificationId, serviceId = null }) {
153+
if (this.stores.settings.all.isAppMuted) return;
154+
153155
const notification = new window.Notification(title, options);
154156
notification.onclick = (e) => {
155157
if (serviceId) {

0 commit comments

Comments
 (0)