Finished with changes

src/Types/SleepClockState.ts

@@ -17,7 +17,7 @@ export interface SleepClockState {
   sleepDataUpdated: string
   today: string
   current_day: Day
-  selectedDay: Day
+  selectedDay: string
   activeIndex: number | null
   ratings: []
   days: Day[] | []

src/actions/coaching/content-actions.ts

@@ -28,7 +28,7 @@ const getFieldValue = (
   entry: Entry<any>,
   fieldToGet: string,
   object: any,
-  callback?: () => void,
+  callback?: (args: any) => void,
   fieldToSet?: string
 ) => {
   if (entry.fields[fieldToGet]) {
@@ -51,7 +51,7 @@ export const getAllWeeks = (): Thunk => async (dispatch: Dispatch) => {
     const coachingWeeks: any = await client.getEntries({
       locale,
       content_type: 'coachingWeek',
-      'fields.slug[ne]': 'introduction',
+      // 'fields.slug[ne]': 'introduction',
       include: 3
     })
 

src/actions/manual-sleep/manual-sleep-actions.ts

@@ -10,6 +10,7 @@ import {
 import { GetState } from '../../Types/GetState'
 import { Day, Value, Night } from '../../Types/Sleepdata'
 import { updateSleepData } from '../sleep/sleep-data-actions'
+import { Dispatch, Thunk } from 'Types/ReduxActions'
 
 export const SET_VALUES = 'SET_VALUES'
 export const TOGGLE_EDIT_MODE = 'TOGGLE_EDIT_MODE'
@@ -30,7 +31,7 @@ export const addManualDataToNight = (
   date: string,
   nightStart: { h: number; m: number },
   nightEnd: { h: number; m: number }
-) => async (dispatch: Function, getState: GetState) => {
+): Thunk => async (dispatch: Dispatch, getState: GetState) => {
   const {
     sleepclock: { days, nights }
   } = getState()
@@ -102,21 +103,36 @@ export const createNight = async (
       value: Value.Asleep
     }
 
-    await AppleHealthKit.saveSleep(
-      newNightBed,
-      (error: any, response: any) => {}
-    )
+    await AppleHealthKit.saveSleep(newNightBed, (error: any, response: any) => {
+      if (error) {
+        throw error
+      } else {
+        return response
+      }
+    })
 
     await AppleHealthKit.saveSleep(
       newNightSleep,
-      (error: any, response: any) => {}
+      (error: any, response: any) => {
+        if (error) {
+          throw error
+        } else {
+          return response
+        }
+      }
     )
   } else {
     const newNight = {
       value,
       startDate: startTime,
       endDate: endTime
     }
-    await AppleHealthKit.saveSleep(newNight, (error: any, response: any) => {})
+    await AppleHealthKit.saveSleep(newNight, (error: any, response: any) => {
+      if (error) {
+        throw error
+      } else {
+        return response
+      }
+    })
   }
 }

src/actions/sleep/sleep-data-actions.ts

@@ -61,7 +61,10 @@ export const updateDay = (day: Day) => ({
   payload: day
 })
 
-export const updateSleepData = (data: { days: Day[]; nights: Night[] }) => ({
+export const updateSleepData = (data: {
+  days: Day[]
+  nights: Night[]
+}): ReduxAction => ({
   type: UPDATE_SLEEP_DATA,
   payload: data
 })

src/components/Charts/SleepChart.tsx

@@ -67,7 +67,6 @@ const SleepTimeChart: FC = () => {
   const yTicks = scaleY.ticks(5)
   const xTicks = scaleX.ticks(days.length)
 
-  console.log(normalizedSleepData, bedtimeWindow)
   return (
     <Card>
       <Title>Sleep Goal Trend</Title>

src/helpers/time.ts

@@ -215,9 +215,7 @@ export const getFormattedDateOrPlaceholder = (
   formatter: string
 ): string => {
   if (value) {
-    const asdasd = parseISO(value)
-    console.log(asdasd)
-    return format(asdasd, formatter)
+    return format(parseISO(value), formatter)
   }
 
   return '-'

src/store/Reducers/sleepclockReducer.ts

@@ -1,6 +1,3 @@
-import { CREATE_SUCCESS } from '@actions/sleep/sleep-to-cloud-actions'
-import moment from 'moment'
-import ReduxAction from 'Types/ReduxActions'
 import { RESET_APP } from '@actions/shared'
 import {
   CREATE_NEW_CALENDAR,
@@ -14,8 +11,10 @@ import {
   UPDATE_DAY,
   UPDATE_SLEEP_DATA
 } from '@actions/sleep/sleep-data-actions'
+import { CREATE_SUCCESS } from '@actions/sleep/sleep-to-cloud-actions'
+import moment from 'moment'
+import ReduxAction from 'Types/ReduxActions'
 import { sortDays } from '../../helpers/sleep'
-import { sameDay } from '../../helpers/time'
 import { SleepClockState } from '../../Types/SleepClockState'
 import { Day } from '../../Types/Sleepdata'
 import { initialState } from '../InitialStates/SleepClock'
@@ -36,12 +35,7 @@ const reducer = (
     }
 
     case SET_TODAY_AS_SELECTED: {
-      const selectedDay = state.days.find((day: Day) =>
-        sameDay(payload, day.date)
-      )
-      const day = selectedDay || state.selectedDay
-
-      return { ...state, selectedDay: day }
+      return { ...state, selectedDay: payload }
     }
 
     case CREATE_NEW_CALENDAR:
@@ -78,9 +72,12 @@ const reducer = (
 
     case RATE_NIGHT: {
       const filteredDays = state.days.filter(
-        (item: Day) => item.date !== state.selectedDay.date
+        (item: Day) => item.date !== state.selectedDay
+      )
+      const day = state.days.find(
+        (item: Day) => item.date === state.selectedDay
       )
-      const newDay = { ...state.selectedDay, rating: payload }
+      const newDay = { ...(day as Day), rating: payload }
       const daysArray = [...filteredDays, newDay]
       const sorted = sortDays(daysArray)
       return { ...state, days: sorted }

src/store/Selectors/SleepDataSelectors.ts

@@ -3,7 +3,7 @@ import { clockTimeToAngle } from 'helpers/geometry'
 import Moment from 'moment'
 import { createSelector } from 'reselect'
 import { SleepClockState } from '../../Types/SleepClockState'
-import { Day } from '../../Types/Sleepdata'
+import { Day, Days } from '../../Types/Sleepdata'
 import { State } from '../../Types/State'
 
 const getState = (state: State) => state.sleepclock
@@ -209,7 +209,7 @@ const dummyDay: Day = {
 }
 
 const getSday = (state: State) =>
-  state.sleepclock.selectedDay ? state.sleepclock.selectedDay : dummyDay
+  state.sleepclock.selectedDay ? state.sleepclock.selectedDay : dummyDay.date
 
 const getSleepclock = (state: State) => state.sleepclock
 
@@ -219,18 +219,22 @@ export const getSleepTrackerName = createSelector(
 )
 
 export const getSelectedDay = createSelector(
-  (state: State) => state.sleepclock.selectedDay,
-  (selectedDay) => selectedDay
+  [getDays, getSday],
+  (days, selectedDay) => {
+    const fromState = days.find((day) => day.date === selectedDay)
+    const day = fromState ?? { ...dummyDay, date: selectedDay }
+    return day
+  }
 )
 
 export const getSelectedDayInBedDuration = createSelector(
-  getSday,
-  (selectedDay) => selectedDay.inBedDuration
+  getSelectedDay,
+  (selectedDay) => (selectedDay ? selectedDay.inBedDuration : 0)
 )
 
 export const getSelectedDayAsleepDuration = createSelector(
-  getSday,
-  (selectedDay) => selectedDay.asleepDuration
+  getSelectedDay,
+  (selectedDay) => (selectedDay ? selectedDay.asleepDuration : 0)
 )
 
 export const getSleepDataUpdated = createSelector(
@@ -249,13 +253,13 @@ export const getStartDate = createSelector(
 )
 
 export const getNightInAngles = createSelector(getSelectedDay, (day) => {
-  if (day.bedEnd && day.bedStart) {
+  if (day?.bedEnd && day?.bedStart) {
     return {
       startAngle: clockTimeToAngle(day.bedStart),
       endAngle: clockTimeToAngle(day.bedEnd)
     }
   }
-  if (day.sleepEnd && day.sleepStart) {
+  if (day?.sleepEnd && day?.sleepStart) {
     return {
       startAngle: clockTimeToAngle(day.sleepStart),
       endAngle: clockTimeToAngle(day.sleepEnd)

src/styles/themes.ts

@@ -34,11 +34,11 @@ export const lightTheme: DefaultTheme = {
   SECONDARY_BUTTON_COLOR: colors.radiantBlue,
   HAIRLINE_COLOR: '#C9C9CB',
   GRADIENT: [
-    'rgba(255,255,255,0)',
-    'rgba(255,255,255,0)',
-    'rgba(255,255,255,1)'
+    'rgba(246,246,249,0)',
+    'rgba(246,246,249,0)',
+    'rgba(246,246,249,1)'
   ],
-  SHADOW: ` 1px 1px 5px rgba(32, 33, 37, 0.1)`,
+  SHADOW: `1px 1px 5px rgba(32, 33, 37, 0.1)`,
 
   FONT_REGULAR: 'Montserrat-Regular',
   FONT_MEDIUM: 'Montserrat-Medium',

src/translations/en.json

@@ -79,7 +79,7 @@
   "Time asleep": "Time asleep",
 
   "ClockNotLoading": "Something went wrong in loading data",
-  "Sleep Goal Trend": "Sleep Goal Trend",
+  "Sleep Goal Trend": "Sleep Trend",
 
   "NEED_HELP": {
     "TITLE": "Need Help?",
@@ -602,7 +602,10 @@
 
     "HABITS": "Habits",
     "ACTIVE": "Active Habits",
+    "ACTIVE_SUBTITLE": "Habits that are currently active.",
     "ARCHIVED": "Archived Habits",
+    "ARCHIVED_SUBTITLE": "Habits that have been archived previously.",
+
     "COMPLETED_HABITS": "{{completedCount}}/{{taskCount}} habits completed",
     "NEW_HABIT": "New Habit",
     "HABIT_STREAK": "{{dayStreak}}-day streak",
@@ -618,9 +621,10 @@
     "DESCRIPTION_FIELD": "Description",
     "LONGEST_STREAK": "Longest streak",
     "CURRENT_STREAK": "Current streak",
+
     "WARNING_TITLE_EXISTS": "Habit with this title already exists.",
-    "EXPLANATION_1": "TODO",
-    "EXPLANATION_2": "TODO",
+    "EXPLANATION_1": "Here you manage your Habits. You can  create new ones from the top right corner. By swiping left or right on the Habit card, you can mark it as completed, archive it, or delete it.",
+    "EXPLANATION_2": "",
 
     "MORNING": "Morning",
     "AFTERNOON": "Afternoon",