diff options
Diffstat (limited to 'src/containers')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.tsx | 2 | ||||
-rw-r--r-- | src/containers/settings/EditSettingsScreen.tsx | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/src/containers/layout/AppLayoutContainer.tsx b/src/containers/layout/AppLayoutContainer.tsx index 3f8aad0ac..b18aa4690 100644 --- a/src/containers/layout/AppLayoutContainer.tsx +++ b/src/containers/layout/AppLayoutContainer.tsx | |||
@@ -80,6 +80,8 @@ class AppLayoutContainer extends Component<IProps> { | |||
80 | ? workspaceStore.getWorkspaceServices(workspace).map(s => s.name) | 80 | ? workspaceStore.getWorkspaceServices(workspace).map(s => s.name) |
81 | : services.all.map(s => s.name) | 81 | : services.all.map(s => s.name) |
82 | } | 82 | } |
83 | stores={this.props.stores} | ||
84 | actions={this.props.actions} | ||
83 | /> | 85 | /> |
84 | ); | 86 | ); |
85 | 87 | ||
diff --git a/src/containers/settings/EditSettingsScreen.tsx b/src/containers/settings/EditSettingsScreen.tsx index b731ad50a..fdd9bd8bc 100644 --- a/src/containers/settings/EditSettingsScreen.tsx +++ b/src/containers/settings/EditSettingsScreen.tsx | |||
@@ -277,6 +277,10 @@ const messages = defineMessages({ | |||
277 | id: 'settings.app.form.alwaysShowWorkspaces', | 277 | id: 'settings.app.form.alwaysShowWorkspaces', |
278 | defaultMessage: 'Always show workspace drawer', | 278 | defaultMessage: 'Always show workspace drawer', |
279 | }, | 279 | }, |
280 | hideAllServicesWorkspace: { | ||
281 | id: 'settings.app.form.hideAllServicesWorkspace', | ||
282 | defaultMessage: 'Hide "All services" workspace', | ||
283 | }, | ||
280 | accentColor: { | 284 | accentColor: { |
281 | id: 'settings.app.form.accentColor', | 285 | id: 'settings.app.form.accentColor', |
282 | defaultMessage: 'Accent color', | 286 | defaultMessage: 'Accent color', |
@@ -453,6 +457,9 @@ class EditSettingsScreen extends Component< | |||
453 | hideSettingsButton: Boolean(settingsData.hideSettingsButton), | 457 | hideSettingsButton: Boolean(settingsData.hideSettingsButton), |
454 | hideDownloadButton: Boolean(settingsData.hideDownloadButton), | 458 | hideDownloadButton: Boolean(settingsData.hideDownloadButton), |
455 | alwaysShowWorkspaces: Boolean(settingsData.alwaysShowWorkspaces), | 459 | alwaysShowWorkspaces: Boolean(settingsData.alwaysShowWorkspaces), |
460 | hideAllServicesWorkspace: Boolean( | ||
461 | settingsData.hideAllServicesWorkspace, | ||
462 | ), | ||
456 | accentColor: settingsData.accentColor, | 463 | accentColor: settingsData.accentColor, |
457 | progressbarAccentColor: settingsData.progressbarAccentColor, | 464 | progressbarAccentColor: settingsData.progressbarAccentColor, |
458 | showMessageBadgeWhenMuted: Boolean( | 465 | showMessageBadgeWhenMuted: Boolean( |
@@ -1155,6 +1162,15 @@ class EditSettingsScreen extends Component< | |||
1155 | default: DEFAULT_APP_SETTINGS.alwaysShowWorkspaces, | 1162 | default: DEFAULT_APP_SETTINGS.alwaysShowWorkspaces, |
1156 | type: 'checkbox', | 1163 | type: 'checkbox', |
1157 | }, | 1164 | }, |
1165 | hideAllServicesWorkspace: { | ||
1166 | label: intl.formatMessage(messages.hideAllServicesWorkspace), | ||
1167 | value: ifUndefined<boolean>( | ||
1168 | settings.all.app.hideAllServicesWorkspace, | ||
1169 | DEFAULT_APP_SETTINGS.hideAllServicesWorkspace, | ||
1170 | ), | ||
1171 | default: DEFAULT_APP_SETTINGS.hideAllServicesWorkspace, | ||
1172 | type: 'checkbox', | ||
1173 | }, | ||
1158 | accentColor: { | 1174 | accentColor: { |
1159 | label: intl.formatMessage(messages.accentColor), | 1175 | label: intl.formatMessage(messages.accentColor), |
1160 | value: ifUndefined<string>( | 1176 | value: ifUndefined<string>( |