Merge branch 'remove-auto-login'

1 files changed, 4 insertions, 7 deletions

diff --git a/app/components/Layout.js b/app/components/Layout.js
index 2699b3e43d..1eb6984797 100644
--- a/app/components/Layout.js
+++ b/app/components/Layout.js
@@ -1,19 +1,16 @@
 // @flow
 import * as React from 'react';
-import HeaderBar from './HeaderBar';
 import { View, Component } from 'reactxp';
-
-import type { HeaderBarProps } from './HeaderBar';
-
+import HeaderBar from './HeaderBar';
 import styles from './LayoutStyles';
 
-export class Header extends Component<HeaderBarProps> {
+export class Header extends Component<React.ElementProps<typeof HeaderBar>> {
   static defaultProps = HeaderBar.defaultProps;
 
   render() {
     return (
-      <View style={styles.header}>
-        <HeaderBar {...this.props} />
+      <View style={[styles.header, this.props.style]}>
+        <HeaderBar barStyle={this.props.barStyle}>{this.props.children}</HeaderBar>
       </View>
     );
   }