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/index.js b/components/header/index.js
index 5ee9009..9792d03 100644
--- a/components/header/index.js
+++ b/components/header/index.js
@@ -15,7 +15,7 @@ export default function Header(p) {
else if (props.isSymptomView) {
return ()
}
- else if (props.title === 'info') {
+ else if (props.showBackButton) {
return ()
}
else {