diff options
Diffstat (limited to 'src/components')
-rw-r--r-- | src/components/layout/AppLayout.js | 2 | ||||
-rw-r--r-- | src/components/ui/FeatureList.js | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index fe81b1911..9b110262a 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js | |||
@@ -20,6 +20,7 @@ import AppUpdateInfoBar from '../AppUpdateInfoBar'; | |||
20 | import TrialActivationInfoBar from '../TrialActivationInfoBar'; | 20 | import TrialActivationInfoBar from '../TrialActivationInfoBar'; |
21 | import Todos from '../../features/todos/containers/TodosScreen'; | 21 | import Todos from '../../features/todos/containers/TodosScreen'; |
22 | import PlanSelection from '../../features/planSelection/containers/PlanSelectionScreen'; | 22 | import PlanSelection from '../../features/planSelection/containers/PlanSelectionScreen'; |
23 | import TrialStatusBar from '../../features/trialStatusBar/containers/TrialStatusBarScreen'; | ||
23 | 24 | ||
24 | function createMarkup(HTMLString) { | 25 | function createMarkup(HTMLString) { |
25 | return { __html: HTMLString }; | 26 | return { __html: HTMLString }; |
@@ -174,6 +175,7 @@ class AppLayout extends Component { | |||
174 | <ShareFranz /> | 175 | <ShareFranz /> |
175 | {services} | 176 | {services} |
176 | {children} | 177 | {children} |
178 | <TrialStatusBar /> | ||
177 | </div> | 179 | </div> |
178 | <Todos /> | 180 | <Todos /> |
179 | </div> | 181 | </div> |
diff --git a/src/components/ui/FeatureList.js b/src/components/ui/FeatureList.js index 732b40e40..7ba8b54d7 100644 --- a/src/components/ui/FeatureList.js +++ b/src/components/ui/FeatureList.js | |||
@@ -72,12 +72,13 @@ export class FeatureList extends Component { | |||
72 | static propTypes = { | 72 | static propTypes = { |
73 | className: PropTypes.string, | 73 | className: PropTypes.string, |
74 | featureClassName: PropTypes.string, | 74 | featureClassName: PropTypes.string, |
75 | plan: PropTypes.oneOf(PLANS).isRequired, | 75 | plan: PropTypes.oneOf(PLANS), |
76 | }; | 76 | }; |
77 | 77 | ||
78 | static defaultProps = { | 78 | static defaultProps = { |
79 | className: '', | 79 | className: '', |
80 | featureClassName: '', | 80 | featureClassName: '', |
81 | plan: false, | ||
81 | } | 82 | } |
82 | 83 | ||
83 | static contextTypes = { | 84 | static contextTypes = { |