diff --git a/components/cycle-day/symptom-page-title.js b/components/cycle-day/symptom-page-title.js
index ec47427..6203c1c 100644
--- a/components/cycle-day/symptom-page-title.js
+++ b/components/cycle-day/symptom-page-title.js
@@ -8,12 +8,7 @@ import AppText from '../common/app-text'
import { connect } from 'react-redux'
import { getDate, setDate } from '../../slices/date'
-import {
- nextDate,
- prevDate,
- isTomorrowInFuture,
- isYesterdayInFuture,
-} from '../helpers/cycle-day'
+import { nextDate, prevDate } from '../helpers/cycle-day'
import { Colors, Containers, Spacing, Typography } from '../../styles'
import { HIT_SLOP } from '../../config'
@@ -24,8 +19,6 @@ const SymptomPageTitle = ({
subtitle,
title,
}) => {
- const rightArrowColor = isTomorrowInFuture(date) ? Colors.grey : Colors.orange
- const leftArrowColor = isYesterdayInFuture(date) ? Colors.grey : Colors.orange
const navigate = (isForward) => {
const nextDay = isForward ? nextDate(date) : prevDate(date)
reloadSymptomData(nextDay)
@@ -35,14 +28,14 @@ const SymptomPageTitle = ({
return (
navigate(false)} hitSlop={HIT_SLOP}>
-
+
{title}
{subtitle && {subtitle}}
navigate(true)} hitSlop={HIT_SLOP}>
-
+
)
diff --git a/components/helpers/cycle-day.js b/components/helpers/cycle-day.js
index 653765a..aae8a3f 100644
--- a/components/helpers/cycle-day.js
+++ b/components/helpers/cycle-day.js
@@ -425,13 +425,3 @@ export const nextDate = (dateString) => {
export const isDateInFuture = (dateString) => {
return LocalDate.now().isBefore(LocalDate.parse(dateString))
}
-
-export const isTomorrowInFuture = (dateString) => {
- const tomorrow = nextDate(dateString)
- return LocalDate.now().isBefore(LocalDate.parse(tomorrow))
-}
-
-export const isYesterdayInFuture = (dateString) => {
- const yesterday = prevDate(dateString)
- return LocalDate.now().isBefore(LocalDate.parse(yesterday))
-}
\ No newline at end of file
diff --git a/components/helpers/format-date.js b/components/helpers/format-date.js
index 88e4ec4..f9e2cc3 100644
--- a/components/helpers/format-date.js
+++ b/components/helpers/format-date.js
@@ -20,5 +20,5 @@ export function dateToTitle(dateString) {
const dateToDisplay = LocalDate.parse(dateString)
return today.equals(dateToDisplay) ?
labels.today :
- moment(dateString).format('MMMM Do')
+ moment(dateString).format('dddd, Do MMM YYYY')
}
\ No newline at end of file
diff --git a/components/home.js b/components/home.js
index eaf0b72..a1d5e87 100644
--- a/components/home.js
+++ b/components/home.js
@@ -80,11 +80,15 @@ class Home extends Component {
{!this.cycleDayNumber && {cycleDayText}}
- {!phase && {phaseText}}
+ {!phase &&
+ {phaseText}
+ }
{phase && (
{phaseText}
- {labels.cyclePhase}
+
+ {labels.cyclePhase}
+
{status}
@@ -99,7 +103,9 @@ class Home extends Component {
{phase && (
- {statusText}
+
+ {statusText}
+
)}