aboutsummaryrefslogtreecommitdiffstats
path: root/src/containers/layout
diff options
context:
space:
mode:
authorLibravatar vantezzen <properly@protonmail.com>2019-09-07 15:50:23 +0200
committerLibravatar vantezzen <properly@protonmail.com>2019-09-07 15:50:23 +0200
commite7a74514c1e7c3833dfdcf5900cb87f9e6e8354e (patch)
treeb8314e4155503b135dcb07e8b4a0e847e25c19cf /src/containers/layout
parentUpdate CHANGELOG.md (diff)
parentUpdate CHANGELOG.md (diff)
downloadferdium-app-e7a74514c1e7c3833dfdcf5900cb87f9e6e8354e.tar.gz
ferdium-app-e7a74514c1e7c3833dfdcf5900cb87f9e6e8354e.tar.zst
ferdium-app-e7a74514c1e7c3833dfdcf5900cb87f9e6e8354e.zip
Merge branch 'master' of https://github.com/meetfranz/franz into franz-5.3.0
Diffstat (limited to 'src/containers/layout')
-rw-r--r--src/containers/layout/AppLayoutContainer.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/containers/layout/AppLayoutContainer.js b/src/containers/layout/AppLayoutContainer.js
index 38ed85986..95fbd109f 100644
--- a/src/containers/layout/AppLayoutContainer.js
+++ b/src/containers/layout/AppLayoutContainer.js
@@ -10,6 +10,7 @@ import FeaturesStore from '../../stores/FeaturesStore';
10import UIStore from '../../stores/UIStore'; 10import UIStore from '../../stores/UIStore';
11import NewsStore from '../../stores/NewsStore'; 11import NewsStore from '../../stores/NewsStore';
12import SettingsStore from '../../stores/SettingsStore'; 12import SettingsStore from '../../stores/SettingsStore';
13import UserStore from '../../stores/UserStore';
13import RequestStore from '../../stores/RequestStore'; 14import RequestStore from '../../stores/RequestStore';
14import GlobalErrorStore from '../../stores/GlobalErrorStore'; 15import GlobalErrorStore from '../../stores/GlobalErrorStore';
15 16
@@ -39,6 +40,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
39 settings, 40 settings,
40 globalError, 41 globalError,
41 requests, 42 requests,
43 user,
42 } = this.props.stores; 44 } = this.props.stores;
43 45
44 const { 46 const {
@@ -125,6 +127,8 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
125 reload={reload} 127 reload={reload}
126 openSettings={openSettings} 128 openSettings={openSettings}
127 update={updateService} 129 update={updateService}
130 userHasCompletedSignup={user.hasCompletedSignup}
131 hasActivatedTrial={user.hasActivatedTrial}
128 /> 132 />
129 ); 133 );
130 134
@@ -150,6 +154,7 @@ export default @inject('stores', 'actions') @observer class AppLayoutContainer e
150 retryRequiredRequests={retryRequiredRequests} 154 retryRequiredRequests={retryRequiredRequests}
151 areRequiredRequestsLoading={requests.areRequiredRequestsLoading} 155 areRequiredRequestsLoading={requests.areRequiredRequestsLoading}
152 isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible} 156 isDelayAppScreenVisible={delayAppState.isDelayAppScreenVisible}
157 hasActivatedTrial={user.hasActivatedTrial}
153 > 158 >
154 {React.Children.count(children) > 0 ? children : null} 159 {React.Children.count(children) > 0 ? children : null}
155 </AppLayout> 160 </AppLayout>
@@ -167,6 +172,7 @@ AppLayoutContainer.wrappedComponent.propTypes = {
167 ui: PropTypes.instanceOf(UIStore).isRequired, 172 ui: PropTypes.instanceOf(UIStore).isRequired,
168 news: PropTypes.instanceOf(NewsStore).isRequired, 173 news: PropTypes.instanceOf(NewsStore).isRequired,
169 settings: PropTypes.instanceOf(SettingsStore).isRequired, 174 settings: PropTypes.instanceOf(SettingsStore).isRequired,
175 user: PropTypes.instanceOf(UserStore).isRequired,
170 requests: PropTypes.instanceOf(RequestStore).isRequired, 176 requests: PropTypes.instanceOf(RequestStore).isRequired,
171 globalError: PropTypes.instanceOf(GlobalErrorStore).isRequired, 177 globalError: PropTypes.instanceOf(GlobalErrorStore).isRequired,
172 }).isRequired, 178 }).isRequired,