Merge branch 'remove-headerbar-hidden'

3 files changed, 4 insertions, 34 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
diff --git a/app/components/HeaderBarStyles.js b/app/components/HeaderBarStyles.js
index 5b869bc36b..7d3c94cdc9 100644
--- a/app/components/HeaderBarStyles.js
+++ b/app/components/HeaderBarStyles.js
@@ -14,12 +14,6 @@ export default {
       justifyContent: 'space-between',
       alignItems: 'center',
     },
-    hidden: {
-      paddingTop: 24,
-      paddingBottom: 0,
-      paddingLeft: 0,
-      paddingRight: 0,
-    },
     style_defaultDark: {
       backgroundColor: colors.darkBlue,
     },
diff --git a/test/components/HeaderBar.spec.js b/test/components/HeaderBar.spec.js
index a8eca00d53..09eab134ad 100644
--- a/test/components/HeaderBar.spec.js
+++ b/test/components/HeaderBar.spec.js
@@ -5,22 +5,6 @@ import { shallow } from 'enzyme';
 import HeaderBar from '../../app/components/HeaderBar';
 
 describe('components/HeaderBar', () => {
-  it('should display headerbar', () => {
-    const component = render({
-      hidden: false,
-    });
-    const hasChildMatching = hasChild(component, 'headerbar__container');
-    expect(hasChildMatching).to.be.true;
-  });
-
-  it('should not display headerbar', () => {
-    const component = render({
-      hidden: true,
-    });
-    const hasChildMatching = hasChild(component, 'headerbar__container');
-    expect(hasChildMatching).to.be.false;
-  });
-
   it('should display settings button', () => {
     const component = render({
       showSettings: true,