diff options
author | 2021-08-13 00:45:01 +0530 | |
---|---|---|
committer | 2021-08-13 00:45:01 +0530 | |
commit | 2d27d5e66649d4f5baf127a53ee5ae524eae3a59 (patch) | |
tree | c592ea219ac8cd987fc367f57b54034c450ab2ab /src/containers/layout/AppLayoutContainer.js | |
parent | Ferdi v5.6.0 (diff) | |
parent | 5.6.1-nightly.24 [skip ci] (diff) | |
download | ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.gz ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.tar.zst ferdium-app-2d27d5e66649d4f5baf127a53ee5ae524eae3a59.zip |
chore: merge from nightly branch into release branch in prep for next beta
Diffstat (limited to 'src/containers/layout/AppLayoutContainer.js')
-rw-r--r-- | src/containers/layout/AppLayoutContainer.js | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js index 7a12aee83..32b1f1cf7 100644 --- a/src/containers/layout/AppLayoutContainer.js +++ b/src/containers/layout/AppLayoutContainer.js | |||
@@ -20,7 +20,6 @@ import Sidebar from '../../components/layout/Sidebar'; | |||
20 | import Services from '../../components/services/content/Services'; | 20 | import Services from '../../components/services/content/Services'; |
21 | import AppLoader from '../../components/ui/AppLoader'; | 21 | import AppLoader from '../../components/ui/AppLoader'; |
22 | 22 | ||
23 | import { state as delayAppState } from '../../features/delayApp'; | ||
24 | import { workspaceActions } from '../../features/workspaces/actions'; | 23 | import { workspaceActions } from '../../features/workspaces/actions'; |
25 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; | 24 | import WorkspaceDrawer from '../../features/workspaces/components/WorkspaceDrawer'; |
26 | import { workspaceStore } from '../../features/workspaces'; | 25 | import { workspaceStore } from '../../features/workspaces'; |
@@ -55,8 +54,11 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
55 | reload, | 54 | reload, |
56 | toggleNotifications, | 55 | toggleNotifications, |
57 | toggleAudio, | 56 | toggleAudio, |
57 | toggleDarkMode, | ||
58 | deleteService, | 58 | deleteService, |
59 | updateService, | 59 | updateService, |
60 | hibernate, | ||
61 | awake, | ||
60 | } = this.props.actions.service; | 62 | } = this.props.actions.service; |
61 | 63 | ||
62 | const { hide } = this.props.actions.news; | 64 | const { hide } = this.props.actions.news; |
@@ -91,10 +93,9 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
91 | 93 | ||
92 | const workspacesDrawer = ( | 94 | const workspacesDrawer = ( |
93 | <WorkspaceDrawer | 95 | <WorkspaceDrawer |
94 | getServicesForWorkspace={workspace => ( | 96 | getServicesForWorkspace={(workspace) => ( |
95 | workspace ? workspaceStore.getWorkspaceServices(workspace).map(s => s.name) : services.all.map(s => s.name) | 97 | workspace ? workspaceStore.getWorkspaceServices(workspace).map((s) => s.name) : services.all.map((s) => s.name) |
96 | )} | 98 | )} |
97 | onUpgradeAccountClick={() => openSettings({ path: 'user' })} | ||
98 | /> | 99 | /> |
99 | ); | 100 | ); |
100 | 101 | ||
@@ -109,8 +110,11 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
109 | reload={reload} | 110 | reload={reload} |
110 | toggleNotifications={toggleNotifications} | 111 | toggleNotifications={toggleNotifications} |
111 | toggleAudio={toggleAudio} | 112 | toggleAudio={toggleAudio} |
113 | toggleDarkMode={toggleDarkMode} | ||
112 | deleteService={deleteService} | 114 | deleteService={deleteService} |
113 | updateService={updateService} | 115 | updateService={updateService} |
116 | hibernateService={hibernate} | ||
117 | wakeUpService={awake} | ||
114 | toggleMuteApp={toggleMuteApp} | 118 | toggleMuteApp={toggleMuteApp} |
115 | toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer} | 119 | toggleWorkspaceDrawer={workspaceActions.toggleWorkspaceDrawer} |
116 | isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen} | 120 | isWorkspaceDrawerOpen={workspaceStore.isWorkspaceDrawerOpen} |
@@ -131,7 +135,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
131 | openSettings={openSettings} | 135 | openSettings={openSettings} |
132 | update={updateService} | 136 | update={updateService} |
133 | userHasCompletedSignup={user.hasCompletedSignup} | 137 | userHasCompletedSignup={user.hasCompletedSignup} |
134 | hasActivatedTrial={user.hasActivatedTrial} | ||
135 | isSpellcheckerEnabled={settings.app.enableSpellchecking} | 138 | isSpellcheckerEnabled={settings.app.enableSpellchecking} |
136 | /> | 139 | /> |
137 | ); | 140 | ); |
@@ -157,8 +160,6 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e | |||
157 | areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful} | 160 | areRequiredRequestsSuccessful={requests.areRequiredRequestsSuccessful} |
158 | retryRequiredRequests={retryRequiredRequests} | 161 | retryRequiredRequests={retryRequiredRequests} |
159 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} | 162 | areRequiredRequestsLoading={requests.areRequiredRequestsLoading} |
160 | isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible} | ||
161 | hasActivatedTrial={user.hasActivatedTrial} | ||
162 | > | 163 | > |
163 | {React.Children.count(children) > 0 ? children : null} | 164 | {React.Children.count(children) > 0 ? children : null} |
164 | </AppLayout> | 165 | </AppLayout> |