From 4033dcba39e4e55363ee07ff5d99a27663d6abda Mon Sep 17 00:00:00 2001
From: wwu <wwu@wenbinwu.com>
Date: Sat, 27 Jan 2018 01:19:03 +0100
Subject: [PATCH] Issue #1623 Fix console errors

---
 package.json                                             | 2 +-
 src/projects/detail/containers/FeedContainer.js          | 4 ++--
 .../components/Projects/ProjectListTimeSortColHeader.jsx | 9 ++++++---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 7e3ae5c4f..9ff16ced2 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "react-redux": "^4.4.5",
     "react-router-dom": "^4.2.2",
     "react-s-alert": "^1.1.4",
-    "react-scroll": "^1.5.4",
+    "react-scroll": "^1.7.6",
     "react-scroll-lock-component": "^1.1.2",
     "react-select": "^0.9.1",
     "react-stickynode": "^1.2.1",
diff --git a/src/projects/detail/containers/FeedContainer.js b/src/projects/detail/containers/FeedContainer.js
index 633fffc3f..342419e51 100644
--- a/src/projects/detail/containers/FeedContainer.js
+++ b/src/projects/detail/containers/FeedContainer.js
@@ -20,10 +20,10 @@ import ProjectSpecification from '../../../components/ProjectSpecification/Proje
 import { loadDashboardFeeds, createProjectTopic, saveProjectTopic, deleteProjectTopic, loadFeedComments, addFeedComment, saveFeedComment, deleteFeedComment, getFeedComment } from '../../actions/projectTopics'
 import spinnerWhileLoading from '../../../components/LoadingSpinner'
 
-import { Helpers, scroller } from 'react-scroll'
+import { ScrollElement, scroller } from 'react-scroll'
 
 /*eslint-disable new-cap */
-const ScrollableFeed = Helpers.Element(Feed)
+const ScrollableFeed = ScrollElement(Feed)
 
 const SYSTEM_USER = {
   firstName: CODER_BOT_USER_FNAME,
diff --git a/src/projects/list/components/Projects/ProjectListTimeSortColHeader.jsx b/src/projects/list/components/Projects/ProjectListTimeSortColHeader.jsx
index ccf9fd629..4f8c78053 100644
--- a/src/projects/list/components/Projects/ProjectListTimeSortColHeader.jsx
+++ b/src/projects/list/components/Projects/ProjectListTimeSortColHeader.jsx
@@ -34,9 +34,12 @@ class ProjectListTimeSortColHeader extends React.Component {
       return
     }
 
-    this.setState({
-      focused: false
-    })
+    if (this.refs.myRef) {
+      this.setState({
+        focused: false
+      })
+    }
+
   }
 
   componentDidMount() {