diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-07-23 17:48:39 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-07-23 17:48:39 +0200 |
| commit | 5cafc4510eb2a1998d910647d39518a5048b9e18 (patch) | |
| tree | 8a74b8a486b0f6b1a074b923c155d6aa0f4e8f6b /app/components/HeaderBar.js | |
| parent | d258c7614f6c41c6f78939e9d47edff2d44af19f (diff) | |
| parent | c33954384aaad13fbc8610e46431b4d041ce0a31 (diff) | |
| download | mullvadvpn-5cafc4510eb2a1998d910647d39518a5048b9e18.tar.xz mullvadvpn-5cafc4510eb2a1998d910647d39518a5048b9e18.zip | |
Merge branch 'remove-headerbar-hidden'
Diffstat (limited to 'app/components/HeaderBar.js')
| -rw-r--r-- | app/components/HeaderBar.js | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/app/components/HeaderBar.js b/app/components/HeaderBar.js index fcd7d40733..a46856eb46 100644 --- a/app/components/HeaderBar.js +++ b/app/components/HeaderBar.js @@ -10,7 +10,6 @@ import platformStyles from './HeaderBarPlatformStyles'; export type HeaderBarStyle = 'default' | 'defaultDark' | 'error' | 'success'; export type HeaderBarProps = { style: HeaderBarStyle, - hidden: boolean, showSettings: boolean, onSettings: ?() => void, }; @@ -18,7 +17,6 @@ export type HeaderBarProps = { export default class HeaderBar extends Component<HeaderBarProps> { static defaultProps: HeaderBarProps = { style: 'default', - hidden: false, showSettings: false, onSettings: null, }; @@ -30,18 +28,12 @@ export default class HeaderBar extends Component<HeaderBarProps> { styles['style_' + this.props.style], ]; - if (this.props.hidden) { - containerClass.push(styles['hidden']); - } - return ( <View style={containerClass}> - {!this.props.hidden ? ( - <View style={styles.container} testName="headerbar__container"> - <Img height={50} width={50} source="logo-icon" /> - <Text style={styles.title}>MULLVAD VPN</Text> - </View> - ) : null} + <View style={styles.container} testName="headerbar__container"> + <Img height={50} width={50} source="logo-icon" /> + <Text style={styles.title}>MULLVAD VPN</Text> + </View> {this.props.showSettings ? ( <Button |