Merge pull request redacademy#130 from redacademy/no-talks-fix

implemented fix for when user has no talks breaking app
soniasophia · Sep 22, 2017 · fd949e8 · fd949e8
2 parents 67ffa9e + dd615a7
commit fd949e8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/js/scenes/Dashboard/DashboardContainer.js b/js/scenes/Dashboard/DashboardContainer.js
@@ -30,7 +30,7 @@ const DashboardContainer = ({ userData, talksData }) => {
     >
       <Dashboard stats={currUser.speakerStats} />
       <MyTalks 
-        talks={findTalks(currUser.myTalks, talks)} 
+        talks={(currUser.myTalks) && findTalks(currUser.myTalks, talks)} 
         userName={currUser.fullName}
       />
     </Swiper>

diff --git a/js/scenes/Dashboard/Pages/MyTalks.js b/js/scenes/Dashboard/Pages/MyTalks.js
@@ -37,6 +37,10 @@ const MyTalks = ({ talks, userName }) => (
 
 export default MyTalks;
 
+MyTalks.defaultProps = {
+  talks: null
+};
+
 MyTalks.propTypes = {
   talks: PropTypes.arrayOf(PropTypes.shape({
     eventCode: PropTypes.string,
@@ -50,5 +54,5 @@ MyTalks.propTypes = {
     })),
     talk_id: PropTypes.string,
     title: PropTypes.string
-  })).isRequired
+  }))
 }
diff --git a/js/scenes/Home/HomeComponents.js b/js/scenes/Home/HomeComponents.js
@@ -26,7 +26,7 @@ export const EventInfo = ({ nextEvent }) => (
       {Moment.unix(nextEvent.date).format('MMMM Do YYYY')}
     </Text>
     <Text style={styles.eventDate}>
-      {Moment.unix(nextEvent.startTime).format('hh:mm a')} - {Moment.unix(nextEvent.endTime).format('hh:mm a')}
+      {Moment.unix(nextEvent.startTime).format('hh:mm a')} - {Moment.unix(nextEvent.endTime).local().format('hh:mm a')}
     </Text>
   </View>
 )