diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2018-01-02 23:01:33 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-01-02 23:01:33 +0100 |
| commit | bd56e9ed140ad9a5e04a56e6d5ce331b7694432c (patch) | |
| tree | 32777f58c98a6021f4cb6c7197a7408435ec01a8 | |
| parent | fix(App): prevent drag event from bubbling (@melodywei861016) (diff) | |
| parent | Fix indirect message badge being displayed when disabled (diff) | |
| download | ferdium-app-bd56e9ed140ad9a5e04a56e6d5ce331b7694432c.tar.gz ferdium-app-bd56e9ed140ad9a5e04a56e6d5ce331b7694432c.tar.zst ferdium-app-bd56e9ed140ad9a5e04a56e6d5ce331b7694432c.zip | |
fix(Service): Fix indirect message badge being displayed when badge is disabled
| -rw-r--r-- | src/stores/ServicesStore.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/stores/ServicesStore.js b/src/stores/ServicesStore.js index 66f37af26..c48f48a88 100644 --- a/src/stores/ServicesStore.js +++ b/src/stores/ServicesStore.js | |||
| @@ -497,12 +497,13 @@ export default class ServicesStore extends Store { | |||
| 497 | .reduce((a, b) => a + b, 0); | 497 | .reduce((a, b) => a + b, 0); |
| 498 | 498 | ||
| 499 | const unreadIndirectMessageCount = this.allDisplayed | 499 | const unreadIndirectMessageCount = this.allDisplayed |
| 500 | .filter(s => (showMessageBadgeWhenMuted || s.isIndirectMessageBadgeEnabled) && showMessageBadgesEvenWhenMuted && s.isBadgeEnabled) | 500 | .filter(s => (showMessageBadgeWhenMuted && showMessageBadgesEvenWhenMuted) && (s.isBadgeEnabled && s.isIndirectMessageBadgeEnabled)) |
| 501 | .map(s => s.unreadIndirectMessageCount) | 501 | .map(s => s.unreadIndirectMessageCount) |
| 502 | .reduce((a, b) => a + b, 0); | 502 | .reduce((a, b) => a + b, 0); |
| 503 | 503 | ||
| 504 | // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases | 504 | // We can't just block this earlier, otherwise the mobx reaction won't be aware of the vars to watch in some cases |
| 505 | if (showMessageBadgesEvenWhenMuted) { | 505 | if (showMessageBadgesEvenWhenMuted) { |
| 506 | console.log('set badge', unreadDirectMessageCount, unreadIndirectMessageCount); | ||
| 506 | this.actions.app.setBadge({ | 507 | this.actions.app.setBadge({ |
| 507 | unreadDirectMessageCount, | 508 | unreadDirectMessageCount, |
| 508 | unreadIndirectMessageCount, | 509 | unreadIndirectMessageCount, |