From bf60f2898d8c9dcf880bd14c187caf90b9549a2a Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 31 Jan 2017 22:34:33 +0100
Subject: Fix #529 - Make hashtag timelines show conversations, fix hashtag
 loading in the UI

---
 .../javascripts/components/features/account_timeline/index.jsx       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'app/assets/javascripts/components/features/account_timeline/index.jsx')

diff --git a/app/assets/javascripts/components/features/account_timeline/index.jsx b/app/assets/javascripts/components/features/account_timeline/index.jsx
index 6613600cc..349510295 100644
--- a/app/assets/javascripts/components/features/account_timeline/index.jsx
+++ b/app/assets/javascripts/components/features/account_timeline/index.jsx
@@ -11,9 +11,10 @@ import LoadingIndicator from '../../components/loading_indicator';
 import Column from '../ui/components/column';
 import HeaderContainer from './containers/header_container';
 import ColumnBackButton from '../../components/column_back_button';
+import Immutable from 'immutable';
 
 const mapStateToProps = (state, props) => ({
-  statusIds: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'items']),
+  statusIds: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'items'], Immutable.List()),
   isLoading: state.getIn(['timelines', 'accounts_timelines', Number(props.params.accountId), 'isLoading']),
   me: state.getIn(['meta', 'me'])
 });
@@ -49,7 +50,7 @@ const AccountTimeline = React.createClass({
   render () {
     const { statusIds, isLoading, me } = this.props;
 
-    if (!statusIds) {
+    if (!statusIds && isLoading) {
       return (
         <Column>
           <LoadingIndicator />
-- 
cgit 

