diff options
Diffstat (limited to 'src/components/layout/AppLayout.js')
-rw-r--r-- | src/components/layout/AppLayout.js | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index dbf7d3c21..941e60bfd 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -17,6 +17,7 @@ import { isWindows } from '../../environment'; | |||
17 | import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator'; | 17 | import WorkspaceSwitchingIndicator from '../../features/workspaces/components/WorkspaceSwitchingIndicator'; |
18 | import { workspaceStore } from '../../features/workspaces'; | 18 | import { workspaceStore } from '../../features/workspaces'; |
19 | import AppUpdateInfoBar from '../AppUpdateInfoBar'; | 19 | import AppUpdateInfoBar from '../AppUpdateInfoBar'; |
20 | import TrialActivationInfoBar from '../TrialActivationInfoBar'; | ||
20 | import Todos from '../../features/todos/containers/TodosScreen'; | 21 | import Todos from '../../features/todos/containers/TodosScreen'; |
21 | 22 | ||
22 | function createMarkup(HTMLString) { | 23 | function createMarkup(HTMLString) { |
@@ -70,6 +71,7 @@ class AppLayout extends Component { | |||
70 | retryRequiredRequests: PropTypes.func.isRequired, | 71 | retryRequiredRequests: PropTypes.func.isRequired, |
71 | areRequiredRequestsLoading: PropTypes.bool.isRequired, | 72 | areRequiredRequestsLoading: PropTypes.bool.isRequired, |
72 | isDelayAppScreenVisible: PropTypes.bool.isRequired, | 73 | isDelayAppScreenVisible: PropTypes.bool.isRequired, |
74 | hasActivatedTrial: PropTypes.bool.isRequired, | ||
73 | }; | 75 | }; |
74 | 76 | ||
75 | static defaultProps = { | 77 | static defaultProps = { |
@@ -89,7 +91,6 @@ class AppLayout extends Component { | |||
89 | sidebar, | 91 | sidebar, |
90 | services, | 92 | services, |
91 | children, | 93 | children, |
92 | // isOnline, | ||
93 | news, | 94 | news, |
94 | showServicesUpdatedInfoBar, | 95 | showServicesUpdatedInfoBar, |
95 | appUpdateIsDownloaded, | 96 | appUpdateIsDownloaded, |
@@ -102,6 +103,7 @@ class AppLayout extends Component { | |||
102 | retryRequiredRequests, | 103 | retryRequiredRequests, |
103 | areRequiredRequestsLoading, | 104 | areRequiredRequestsLoading, |
104 | isDelayAppScreenVisible, | 105 | isDelayAppScreenVisible, |
106 | hasActivatedTrial, | ||
105 | } = this.props; | 107 | } = this.props; |
106 | 108 | ||
107 | const { intl } = this.context; | 109 | const { intl } = this.context; |
@@ -126,17 +128,20 @@ class AppLayout extends Component { | |||
126 | <span dangerouslySetInnerHTML={createMarkup(item.message)} /> | 128 | <span dangerouslySetInnerHTML={createMarkup(item.message)} /> |
127 | </InfoBar> | 129 | </InfoBar> |
128 | ))} | 130 | ))} |
131 | {hasActivatedTrial && ( | ||
132 | <TrialActivationInfoBar /> | ||
133 | )} | ||
129 | {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( | 134 | {!areRequiredRequestsSuccessful && showRequiredRequestsError && ( |
130 | <InfoBar | 135 | <InfoBar |
131 | type="danger" | 136 | type="danger" |
132 | ctaLabel="Try again" | 137 | ctaLabel="Try again" |
133 | ctaLoading={areRequiredRequestsLoading} | 138 | ctaLoading={areRequiredRequestsLoading} |
134 | sticky | 139 | sticky |
135 | onClick={retryRequiredRequests} | 140 | onClick={retryRequiredRequests} |
136 | > | 141 | > |
137 | <span className="mdi mdi-flash" /> | 142 | <span className="mdi mdi-flash" /> |
138 | {intl.formatMessage(messages.requiredRequestsFailed)} | 143 | {intl.formatMessage(messages.requiredRequestsFailed)} |
139 | </InfoBar> | 144 | </InfoBar> |
140 | )} | 145 | )} |
141 | {showServicesUpdatedInfoBar && ( | 146 | {showServicesUpdatedInfoBar && ( |
142 | <InfoBar | 147 | <InfoBar |