diff options
| author |  Vijay A <vraravam@users.noreply.github.com> | 2021-11-07 15:37:33 +0530 |
|---|---|---|
| committer | Vijay A <vraravam@users.noreply.github.com> | 2021-11-07 15:37:33 +0530 |
| commit | 13ba4ed3489181d4ba8fd14eda6a0ffe75b34056 (patch) | |
| tree | cc1661068073fc6edd7954268152a86437d025f8 /src/containers/layout/AppLayoutContainer.js | |
| parent | chore: upgraded ferdi to '5.6.3-beta.3' (diff) | |
| parent | update 'recipes' submodule (diff) | |
| download | ferdium-app-13ba4ed3489181d4ba8fd14eda6a0ffe75b34056.tar.gz ferdium-app-13ba4ed3489181d4ba8fd14eda6a0ffe75b34056.tar.zst ferdium-app-13ba4ed3489181d4ba8fd14eda6a0ffe75b34056.zip | |
Merge branch 'develop' into release
Diffstat (limited to 'src/containers/layout/AppLayoutContainer.js')
| -rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 6b6f97e46..50a28803f 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
| @@ -122,9 +122,7 @@ class AppLayoutContainer extends Component { | |||
| 122 | showMessageBadgeWhenMutedSetting={ | 122 | showMessageBadgeWhenMutedSetting={ |
| 123 | settings.all.app.showMessageBadgeWhenMuted | 123 | settings.all.app.showMessageBadgeWhenMuted |
| 124 | } | 124 | } |
| 125 | showServiceNameSetting={ | 125 | showServiceNameSetting={settings.all.app.showServiceName} |
| 126 | settings.all.app.showServiceName | ||
| 127 | } | ||
| 128 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} | 126 | showMessageBadgesEvenWhenMuted={ui.showMessageBadgesEvenWhenMuted} |
| 129 | isTodosServiceActive={services.isTodosServiceActive || false} | 127 | isTodosServiceActive={services.isTodosServiceActive || false} |
| 130 | /> | 128 | /> |
| @@ -192,6 +190,7 @@ AppLayoutContainer.wrappedComponent.propTypes = { | |||
| 192 | app: PropTypes.instanceOf(AppStore).isRequired, | 190 | app: PropTypes.instanceOf(AppStore).isRequired, |
| 193 | requests: PropTypes.instanceOf(RequestStore).isRequired, | 191 | requests: PropTypes.instanceOf(RequestStore).isRequired, |
| 194 | }).isRequired, | 192 | }).isRequired, |
| 193 | // eslint-disable-next-line react/require-default-props | ||
| 195 | children: oneOrManyChildElements, | 194 | children: oneOrManyChildElements, |
| 196 | }; | 195 | }; |
| 197 | 196 | ||