diff --git a/components/app.js b/components/app.js index fc8f7e3..da47365 100644 --- a/components/app.js +++ b/components/app.js @@ -94,9 +94,7 @@ export default class App extends Component { isDefaultView() { const { currentPage } = this.state - return currentPage !== CYCLE_DAY_PAGE && - !this.isSymptomView() && - !this.isInfoSymptomView() + return this.isMenuItem(currentPage) || currentPage === SETTINGS_MENU_PAGE } render() { @@ -114,16 +112,19 @@ export default class App extends Component { } const page = pages[currentPage] const title = headerTitlesLowerCase[currentPage] - const isSymptomView = this.isSymptomView() return ( {this.isDefaultView() &&
} - {this.isInfoSymptomView() && -
+ {(this.isInfoSymptomView() || this.isSettingsView()) && +
} - {isSymptomView && + {this.isSymptomView() &&
} diff --git a/components/header/info-symptom.js b/components/header/back-button.js similarity index 94% rename from components/header/info-symptom.js rename to components/header/back-button.js index 3a0d490..6196106 100644 --- a/components/header/info-symptom.js +++ b/components/header/back-button.js @@ -8,7 +8,7 @@ import styles, { iconStyles } from '../../styles' import NavigationArrow from './navigation-arrow' import Icon from 'react-native-vector-icons/Entypo' -export default function InfoSymptomHeader(props) { +export default function BackButtonHeader(props) { return ( ) } - else if (props.title === 'info') { - return () + else if (props.showBackButton) { + return () } else { return ()