diff options
| author |  Stefan Malzner <stefan@adlk.io> | 2018-01-08 10:34:00 +0100 |
|---|---|---|
| committer | Stefan Malzner <stefan@adlk.io> | 2018-01-08 10:34:00 +0100 |
| commit | 91540e15eb2484a097587a38440b05897bb87638 (patch) | |
| tree | dba412401da044ba203fcacb56018bfd7ed193eb /src/components/services/tabs/TabItem.js | |
| parent | Sort languages by name (diff) | |
| parent | Add color to service icons (diff) | |
| download | ferdium-app-91540e15eb2484a097587a38440b05897bb87638.tar.gz ferdium-app-91540e15eb2484a097587a38440b05897bb87638.tar.zst ferdium-app-91540e15eb2484a097587a38440b05897bb87638.zip | |
Merge branch 'develop' into i18n
# Conflicts:
# src/i18n/languages.js
Diffstat (limited to 'src/components/services/tabs/TabItem.js')
| -rw-r--r-- | src/components/services/tabs/TabItem.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 8403d9462..7aed8fda7 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
| @@ -126,7 +126,7 @@ class TabItem extends Component { | |||
| 126 | const menu = Menu.buildFromTemplate(menuTemplate); | 126 | const menu = Menu.buildFromTemplate(menuTemplate); |
| 127 | 127 | ||
| 128 | let notificationBadge = null; | 128 | let notificationBadge = null; |
| 129 | if ((showMessageBadgeWhenMutedSetting || service.isNotificationEnabled) && showMessageBadgesEvenWhenMuted) { | 129 | if ((showMessageBadgeWhenMutedSetting || service.isNotificationEnabled) && showMessageBadgesEvenWhenMuted && service.isBadgeEnabled) { |
| 130 | notificationBadge = ( | 130 | notificationBadge = ( |
| 131 | <span> | 131 | <span> |
| 132 | {service.unreadDirectMessageCount > 0 && ( | 132 | {service.unreadDirectMessageCount > 0 && ( |