From b5c6d00afae53dca1b6abd405556d58557ea7e1a Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 17 Oct 2016 01:23:41 +0200 Subject: Fix #99 - public timeline not just reblogs, fix #98 infinite scrolling issues --- app/assets/javascripts/components/actions/accounts.jsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/assets/javascripts/components/actions/accounts.jsx') diff --git a/app/assets/javascripts/components/actions/accounts.jsx b/app/assets/javascripts/components/actions/accounts.jsx index eeec405d1..4847c37e2 100644 --- a/app/assets/javascripts/components/actions/accounts.jsx +++ b/app/assets/javascripts/components/actions/accounts.jsx @@ -1,5 +1,6 @@ -import api from '../api' -import axios from 'axios'; +import api from '../api' +import axios from 'axios'; +import Immutable from 'immutable'; export const ACCOUNT_SET_SELF = 'ACCOUNT_SET_SELF'; @@ -66,7 +67,7 @@ export function fetchAccountTimeline(id) { export function expandAccountTimeline(id) { return (dispatch, getState) => { - const lastId = getState().getIn(['timelines', 'accounts_timelines', id]).last(); + const lastId = getState().getIn(['timelines', 'accounts_timelines', id], Immutable.List()).last(); dispatch(expandAccountTimelineRequest(id)); -- cgit