diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-02-16 11:56:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-16 11:56:09 +0100 |
commit | ea7ad59af20af2aa6817b3b40dca34c8fba3373a (patch) | |
tree | 0291a5c71612e11197a56dfca6b655f1495e6fc1 /app/javascript/mastodon/features/blocks | |
parent | cc84a407f4cf8096b08bcd26b7ab4f61e9a47694 (diff) |
Fix mutes, blocks, domain blocks and follow requests not paginating (#10057)
Regression from #9581
Diffstat (limited to 'app/javascript/mastodon/features/blocks')
-rw-r--r-- | app/javascript/mastodon/features/blocks/index.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/javascript/mastodon/features/blocks/index.js b/app/javascript/mastodon/features/blocks/index.js index ca7ce6f8e..96a219c94 100644 --- a/app/javascript/mastodon/features/blocks/index.js +++ b/app/javascript/mastodon/features/blocks/index.js @@ -18,6 +18,7 @@ const messages = defineMessages({ const mapStateToProps = state => ({ accountIds: state.getIn(['user_lists', 'blocks', 'items']), + hasMore: !!state.getIn(['user_lists', 'blocks', 'next']), }); export default @connect(mapStateToProps) @@ -29,6 +30,7 @@ class Blocks extends ImmutablePureComponent { dispatch: PropTypes.func.isRequired, shouldUpdateScroll: PropTypes.func, accountIds: ImmutablePropTypes.list, + hasMore: PropTypes.bool, intl: PropTypes.object.isRequired, }; @@ -41,7 +43,7 @@ class Blocks extends ImmutablePureComponent { }, 300, { leading: true }); render () { - const { intl, accountIds, shouldUpdateScroll } = this.props; + const { intl, accountIds, shouldUpdateScroll, hasMore } = this.props; if (!accountIds) { return ( @@ -59,6 +61,7 @@ class Blocks extends ImmutablePureComponent { <ScrollableList scrollKey='blocks' onLoadMore={this.handleLoadMore} + hasMore={hasMore} shouldUpdateScroll={shouldUpdateScroll} emptyMessage={emptyMessage} > |