Progress

app/javascript/gabsocial/features/home_timeline/index.js

@@ -1,18 +1,15 @@
-import { defineMessages, injectIntl, FormattedMessage } from 'react-intl';
-import { expandHomeTimeline } from '../../actions/timelines';
-import StatusListContainer from '../../containers/status_list_container';
-import ColumnSettings from './components/column_settings';
-import Column from '../../components/column';
-import { HomeColumnHeader } from '../../components/column_header';
+import { defineMessages, injectIntl } from 'react-intl'
+import { expandHomeTimeline } from '../../actions/timelines'
+import StatusListContainer from '../../containers/status_list_container'
 
 const messages = defineMessages({
   title: { id: 'column.home', defaultMessage: 'Home' },
-});
+  empty: { id: 'empty_column.home', defaultMessage: 'Your home timeline is empty. Start following other users to recieve their content here.' },
+})
 
 const mapStateToProps = state => ({
-  hasUnread: state.getIn(['timelines', 'home', 'unread']) > 0,
   isPartial: state.getIn(['timelines', 'home', 'isPartial']),
-});
+})
 
 export default @connect(mapStateToProps)
 @injectIntl
@@ -21,60 +18,57 @@ class HomeTimeline extends PureComponent {
   static propTypes = {
     dispatch: PropTypes.func.isRequired,
     intl: PropTypes.object.isRequired,
-    hasUnread: PropTypes.bool,
     isPartial: PropTypes.bool,
-  };
+  }
 
   handleLoadMore = maxId => {
-    this.props.dispatch(expandHomeTimeline({ maxId }));
+    this.props.dispatch(expandHomeTimeline({ maxId }))
   }
 
   componentDidMount () {
-    this._checkIfReloadNeeded(false, this.props.isPartial);
+    this._checkIfReloadNeeded(false, this.props.isPartial)
   }
 
   componentDidUpdate (prevProps) {
-    this._checkIfReloadNeeded(prevProps.isPartial, this.props.isPartial);
+    this._checkIfReloadNeeded(prevProps.isPartial, this.props.isPartial)
   }
 
   componentWillUnmount () {
-    this._stopPolling();
+    this._stopPolling()
   }
 
   _checkIfReloadNeeded (wasPartial, isPartial) {
-    const { dispatch } = this.props;
+    const { dispatch } = this.props
 
-    if (wasPartial === isPartial) {
-      return;
-    } else if (!wasPartial && isPartial) {
+    if (!wasPartial && isPartial) {
       this.polling = setInterval(() => {
-        dispatch(expandHomeTimeline());
-      }, 3000);
+        dispatch(expandHomeTimeline())
+      }, 3000)
     } else if (wasPartial && !isPartial) {
-      this._stopPolling();
+      this._stopPolling()
     }
   }
 
   _stopPolling () {
     if (this.polling) {
-      clearInterval(this.polling);
-      this.polling = null;
+      clearInterval(this.polling)
+      this.polling = null
     }
   }
 
   render () {
-    const { intl, hasUnread } = this.props;
+    const { intl } = this.props
+
+    const emptyMessage = intl.formatMessage(messages.empty)
 
     return (
-      <Column heading={intl.formatMessage(messages.title)}>
-        <StatusListContainer
-          scrollKey='home_timeline'
-          onLoadMore={this.handleLoadMore}
-          timelineId='home'
-          emptyMessage={<FormattedMessage id='empty_column.home' defaultMessage='Your home timeline is empty. Start following other users to recieve their content here.'/>}
-        />
-      </Column>
-    );
+      <StatusListContainer
+        scrollKey='home_timeline'
+        onLoadMore={this.handleLoadMore}
+        timelineId='home'
+        emptyMessage={emptyMessage}
+      />
+    )
   }
 
 }