From 76559f2895012803aed3256ce521b9cfff2f63b8 Mon Sep 17 00:00:00 2001 From: Stefan Malzner Date: Mon, 5 Aug 2019 13:24:35 +0200 Subject: WIP: add option to activate trial --- src/components/layout/AppLayout.js | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) (limited to 'src/components/layout') diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index ebb9849ea..1976f5a50 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js @@ -17,6 +17,7 @@ import { isWindows } from '../../environment'; import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator'; import { workspaceStore } from '../../features/workspaces'; import AppUpdateInfoBar from '../AppUpdateInfoBar'; +import TrialActivationInfoBar from '../TrialActivationInfoBar'; function createMarkup(HTMLString) { return { __html: HTMLString }; @@ -57,7 +58,6 @@ class AppLayout extends Component { services: PropTypes.element.isRequired, children: PropTypes.element, news: MobxPropTypes.arrayOrObservableArray.isRequired, - // isOnline: PropTypes.bool.isRequired, showServicesUpdatedInfoBar: PropTypes.bool.isRequired, appUpdateIsDownloaded: PropTypes.bool.isRequired, nextAppReleaseVersion: PropTypes.string, @@ -69,6 +69,7 @@ class AppLayout extends Component { retryRequiredRequests: PropTypes.func.isRequired, areRequiredRequestsLoading: PropTypes.bool.isRequired, isDelayAppScreenVisible: PropTypes.bool.isRequired, + hasActivatedTrial: PropTypes.bool.isRequired, }; static defaultProps = { @@ -88,7 +89,6 @@ class AppLayout extends Component { sidebar, services, children, - // isOnline, news, showServicesUpdatedInfoBar, appUpdateIsDownloaded, @@ -101,6 +101,7 @@ class AppLayout extends Component { retryRequiredRequests, areRequiredRequestsLoading, isDelayAppScreenVisible, + hasActivatedTrial, } = this.props; const { intl } = this.context; @@ -125,26 +126,20 @@ class AppLayout extends Component { ))} - {/* {!isOnline && ( - - - {intl.formatMessage(globalMessages.notConnectedToTheInternet)} - - )} */} + {hasActivatedTrial && ( + + )} {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( - - - {intl.formatMessage(messages.requiredRequestsFailed)} - + + + {intl.formatMessage(messages.requiredRequestsFailed)} + )} {showServicesUpdatedInfoBar && (