PLT-5173 fixing javascript error when creating DM on Android (matterm…

…ost#5077)
stevepartridge · Jan 16, 2017 · 026c975 · 026c975
1 parent 7f5cf30
commit 026c975
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/components/post_view/post_view_controller.jsx b/components/post_view/post_view_controller.jsx
@@ -229,8 +229,16 @@ export default class PostViewController extends React.Component {
 
  onPostListScroll(atBottom) {
  if (atBottom) {
+ let lastViewedBottom;
  const lastPost = PostStore.getLatestPost(this.state.channel.id);
- this.setState({scrollType: ScrollTypes.BOTTOM, lastViewedBottom: lastPost.create_at || new Date().getTime()});
+
+ if (lastPost && lastPost.create_at) {
+ lastViewedBottom = lastPost.create_at;
+ } else {
+ lastViewedBottom = new Date().getTime();
+ }
+
+ this.setState({scrollType: ScrollTypes.BOTTOM, lastViewedBottom});
  } else {
  this.setState({scrollType: ScrollTypes.FREE});
  }