diff --git a/app/javascript/gabsocial/components/profile_header.js b/app/javascript/gabsocial/components/profile_header.js index 5e943714..e074a96c 100644 --- a/app/javascript/gabsocial/components/profile_header.js +++ b/app/javascript/gabsocial/components/profile_header.js @@ -142,7 +142,7 @@ class ProfileHeader extends ImmutablePureComponent { } const headerSrc = !!account ? account.get('header') : undefined - const headerMissing = headerSrc.indexOf(PLACEHOLDER_MISSING_HEADER_SRC) > -1 || !headerSrc + const headerMissing = !headerSrc ? true : headerSrc.indexOf(PLACEHOLDER_MISSING_HEADER_SRC) > -1 const avatarSize = headerMissing ? 75 : 150 const top = headerMissing ? -46 : -380 diff --git a/app/javascript/gabsocial/features/account_timeline.js b/app/javascript/gabsocial/features/account_timeline.js index 0a62eef2..2cb127fc 100644 --- a/app/javascript/gabsocial/features/account_timeline.js +++ b/app/javascript/gabsocial/features/account_timeline.js @@ -20,7 +20,7 @@ const mapStateToProps = (state, { account, commentsOnly = false }) => { accountId, statusIds: state.getIn(['timelines', `account:${path}`, 'items'], emptyList), featuredStatusIds: commentsOnly ? ImmutableList() : state.getIn(['timelines', `account:${accountId}:pinned`, 'items'], emptyList), - isLoading: state.getIn(['timelines', `account:${path}`, 'isLoading']), + isLoading: state.getIn(['timelines', `account:${path}`, 'isLoading'], true), hasMore: state.getIn(['timelines', `account:${path}`, 'hasMore']), } } @@ -87,6 +87,7 @@ class AccountTimeline extends ImmutablePureComponent { statusIds={statusIds} featuredStatusIds={featuredStatusIds} isLoading={isLoading} + showLoading={isLoading} hasMore={hasMore} onLoadMore={this.handleLoadMore} emptyMessage={intl.formatMessage(messages.empty)} diff --git a/app/javascript/gabsocial/features/followers.js b/app/javascript/gabsocial/features/followers.js index 8d94e33f..9a4925d6 100644 --- a/app/javascript/gabsocial/features/followers.js +++ b/app/javascript/gabsocial/features/followers.js @@ -19,7 +19,7 @@ const mapStateToProps = (state, { account }) => { accountId, accountIds: state.getIn(['user_lists', 'followers', accountId, 'items']), hasMore: !!state.getIn(['user_lists', 'followers', accountId, 'next']), - isLoading: state.getIn(['user_lists', 'followers', accountId, 'isLoading']), + isLoading: state.getIn(['user_lists', 'followers', accountId, 'isLoading'], true), } } diff --git a/app/javascript/gabsocial/features/following.js b/app/javascript/gabsocial/features/following.js index 34e3e669..286c0a23 100644 --- a/app/javascript/gabsocial/features/following.js +++ b/app/javascript/gabsocial/features/following.js @@ -19,7 +19,7 @@ const mapStateToProps = (state, { account }) => { accountId, accountIds: state.getIn(['user_lists', 'following', accountId, 'items']), hasMore: !!state.getIn(['user_lists', 'following', accountId, 'next']), - isLoading: state.getIn(['user_lists', 'following', accountId, 'isLoading']), + isLoading: state.getIn(['user_lists', 'following', accountId, 'isLoading'], true), } }