diff options
author | ThibG <thib@sitedethib.com> | 2020-04-12 17:58:25 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-12 17:58:25 +0200 |
commit | 615073df33b9a4317ac5c93fdef83c9cd34567fa (patch) | |
tree | 8bf82214f7e10e6fdff6c331f20b621e35650d60 /app/javascript/flavours/glitch/features/follow_requests | |
parent | 51bbf0b68dc504c441cb929e4fbf8d8c6e04df42 (diff) | |
parent | a08a2130f0adec653be22b09140f8b502785a13e (diff) |
Merge pull request #1316 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/features/follow_requests')
-rw-r--r-- | app/javascript/flavours/glitch/features/follow_requests/index.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/features/follow_requests/index.js b/app/javascript/flavours/glitch/features/follow_requests/index.js index efbe1a23c..36a57d1d6 100644 --- a/app/javascript/flavours/glitch/features/follow_requests/index.js +++ b/app/javascript/flavours/glitch/features/follow_requests/index.js @@ -19,6 +19,7 @@ const messages = defineMessages({ const mapStateToProps = state => ({ accountIds: state.getIn(['user_lists', 'follow_requests', 'items']), + isLoading: state.getIn(['user_lists', 'follow_requests', 'isLoading'], true), hasMore: !!state.getIn(['user_lists', 'follow_requests', 'next']), locked: !!state.getIn(['accounts', me, 'locked']), domain: state.getIn(['meta', 'domain']), @@ -32,6 +33,7 @@ class FollowRequests extends ImmutablePureComponent { params: PropTypes.object.isRequired, dispatch: PropTypes.func.isRequired, hasMore: PropTypes.bool, + isLoading: PropTypes.bool, accountIds: ImmutablePropTypes.list, locked: PropTypes.bool, domain: PropTypes.string, @@ -48,7 +50,7 @@ class FollowRequests extends ImmutablePureComponent { }, 300, { leading: true }); render () { - const { intl, accountIds, hasMore, multiColumn, locked, domain } = this.props; + const { intl, accountIds, hasMore, multiColumn, locked, domain, isLoading } = this.props; if (!accountIds) { return ( @@ -77,6 +79,7 @@ class FollowRequests extends ImmutablePureComponent { scrollKey='follow_requests' onLoadMore={this.handleLoadMore} hasMore={hasMore} + isLoading={isLoading} emptyMessage={emptyMessage} bindToDocument={!multiColumn} prepend={unlockedPrependMessage} |