fix merge conflicts

Author: hawkrives

source/views/building-hours/detail/building.js

@@ -33,10 +33,10 @@ const styles = StyleSheet.create({
 })
 
 export class BuildingDetail extends React.PureComponent {
-  props: {info: BuildingType, now: moment}
+  props: {info: BuildingType, now: moment, onProblemReport: () => any}
 
   render() {
-    const {info, now} = this.props
+    const {info, now, onProblemReport} = this.props
 
     const headerImage = info.image && buildingImages.hasOwnProperty(info.image)
       ? buildingImages[info.image]
@@ -55,7 +55,11 @@ export class BuildingDetail extends React.PureComponent {
 
           <Badge status={openStatus} />
 
-          <ScheduleTable schedules={schedules} now={now} />
+          <ScheduleTable
+            schedules={schedules}
+            now={now}
+            onProblemReport={onProblemReport}
+          />
         </View>
       </ParallaxView>
     )

source/views/building-hours/detail/index.js

@@ -7,10 +7,10 @@
 
 import React from 'react'
 import type {BuildingType} from '../types'
-import type momentT from 'moment'
 import moment from 'moment-timezone'
 import {BuildingDetail} from './building'
 import {CENTRAL_TZ} from '../lib'
+import type {TopLevelViewPropsType} from '../../types'
 
 export class BuildingHoursDetailView extends React.PureComponent {
   static navigationOptions = ({navigation}) => {
@@ -19,7 +19,7 @@ export class BuildingHoursDetailView extends React.PureComponent {
     }
   }
 
-  state: {intervalId: number, now: momentT} = {
+  state: {intervalId: number, now: moment} = {
     intervalId: 0,
     // now: moment.tz('Wed 7:25pm', 'ddd h:mma', null, CENTRAL_TZ),
     now: moment.tz(CENTRAL_TZ),
@@ -35,7 +35,9 @@ export class BuildingHoursDetailView extends React.PureComponent {
     clearTimeout(this.state.intervalId)
   }
 
-  props: {navigation: {state: {params: {building: BuildingType}}}}
+  props: TopLevelViewPropsType & {
+    navigation: {state: {params: {building: BuildingType}}},
+  }
 
   updateTime = () => {
     this.setState({now: moment.tz(CENTRAL_TZ)})
@@ -51,6 +53,12 @@ export class BuildingHoursDetailView extends React.PureComponent {
     const info = this.props.navigation.state.params.building
     const {now} = this.state
 
-    return <BuildingDetail info={info} now={now} />
+    return (
+      <BuildingDetail
+        info={info}
+        now={now}
+        onProblemReport={this.reportProblem}
+      />
+    )
   }
 }

source/views/building-hours/detail/schedule-table.android.js

@@ -16,6 +16,7 @@ export class ScheduleTable extends React.PureComponent {
   props: {
     now: moment,
     schedules: NamedBuildingScheduleType[],
+    onProblemReport: () => any,
   }
 
   render() {
@@ -39,7 +40,7 @@ export class ScheduleTable extends React.PureComponent {
                 isActive={
                   schedule.isPhysicallyOpen !== false &&
                   set.days.includes(dayOfWeek) &&
-                  isBuildingOpenAtMoment(set, this.state.now)
+                  isScheduleOpenAtMoment(set, this.state.now)
                 }
               />,
             )}

source/views/building-hours/detail/schedule-table.ios.js

@@ -5,7 +5,7 @@
  */
 
 import React from 'react'
-import {TableView, Section} from 'react-native-tableview-simple'
+import {TableView, Section, Cell} from 'react-native-tableview-simple'
 import moment from 'moment-timezone'
 import type {NamedBuildingScheduleType} from '../types'
 import {isScheduleOpenAtMoment, getDayOfWeek} from '../lib'
@@ -15,10 +15,11 @@ export class ScheduleTable extends React.PureComponent {
   props: {
     now: moment,
     schedules: NamedBuildingScheduleType[],
+    onProblemReport: () => any,
   }
 
   render() {
-    const {now, schedules} = this.props
+    const {now, schedules, onProblemReport} = this.props
     const dayOfWeek = getDayOfWeek(now)
 
     return (
@@ -37,13 +38,13 @@ export class ScheduleTable extends React.PureComponent {
                 isActive={
                   schedule.isPhysicallyOpen !== false &&
                   set.days.includes(dayOfWeek) &&
-                  isBuildingOpenAtMoment(set, now)
+                  isScheduleOpenAtMoment(set, now)
                 }
               />,
             )}
           </Section>,
         )}
-        
+
         <Section>
           <Cell
             accessory="DisclosureIndicator"

source/views/building-hours/report/overview.js

@@ -193,10 +193,7 @@ export class BuildingHoursProblemReportView extends React.PureComponent {
           </Section>
 
           <Section footer="Thanks for reporting!">
-            <ButtonCell
-              title="Submit Report"
-              onPress={this.submit}
-            />
+            <ButtonCell title="Submit Report" onPress={this.submit} />
           </Section>
         </TableView>
       </ScrollView>