diff --git a/app/soapbox/features/manage_followers/index.js b/app/soapbox/features/manage_followers/index.js
index 17e0d3618..9c965f6b2 100644
--- a/app/soapbox/features/manage_followers/index.js
+++ b/app/soapbox/features/manage_followers/index.js
@@ -7,18 +7,26 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { debounce } from 'lodash';
import LoadingIndicator from '../../components/loading_indicator';
import Column from '../ui/components/column';
-import AccountAuthorizeContainer from './containers/account_authorize_container';
-import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
+import AccountContainer from '../../containers/account_container';
import ScrollableList from '../../components/scrollable_list';
+import {
+ fetchFollowers,
+ expandFollowers,
+} from '../../actions/accounts';
const messages = defineMessages({
heading: { id: 'column.manage_followers', defaultMessage: 'Manage followers' },
});
-const mapStateToProps = state => ({
- accountIds: state.getIn(['user_lists', 'follow_requests', 'items']),
- hasMore: !!state.getIn(['user_lists', 'follow_requests', 'next']),
-});
+const mapStateToProps = state => {
+ const accountId = state.get('me');
+
+ return {
+ accountId,
+ accountIds: state.getIn(['user_lists', 'followers', accountId, 'items']),
+ hasMore: !!state.getIn(['user_lists', 'followers', accountId, 'next']),
+ };
+};
export default @connect(mapStateToProps)
@injectIntl
@@ -33,11 +41,18 @@ class ManageFollowers extends ImmutablePureComponent {
};
componentDidMount() {
- this.props.dispatch(fetchFollowRequests());
+ const { accountId } = this.props;
+ this.props.dispatch(fetchFollowers(accountId));
+ }
+
+ componentDidUpdate(prevProps) {
+ const { accountId } = this.props;
+ this.props.dispatch(fetchFollowers(accountId));
}
handleLoadMore = debounce(() => {
- this.props.dispatch(expandFollowRequests());
+ const { accountId } = this.props;
+ this.props.dispatch(expandFollowers(accountId));
}, 300, { leading: true });
render() {
@@ -51,18 +66,18 @@ class ManageFollowers extends ImmutablePureComponent {
);
}
- const emptyMessage = ;
+ const emptyMessage = ;
return (
- {accountIds.map(id =>
-
+ {accountIds && accountIds.map(id =>
+
)}
diff --git a/app/soapbox/features/manage_follows/index.js b/app/soapbox/features/manage_follows/index.js
index 4ca0e654d..99e756e50 100644
--- a/app/soapbox/features/manage_follows/index.js
+++ b/app/soapbox/features/manage_follows/index.js
@@ -7,18 +7,26 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
import { debounce } from 'lodash';
import LoadingIndicator from '../../components/loading_indicator';
import Column from '../ui/components/column';
-import AccountAuthorizeContainer from './containers/account_authorize_container';
-import { fetchFollowRequests, expandFollowRequests } from '../../actions/accounts';
+import AccountContainer from '../../containers/account_container';
import ScrollableList from '../../components/scrollable_list';
+import {
+ fetchFollowing,
+ expandFollowing,
+} from '../../actions/accounts';
const messages = defineMessages({
- heading: { id: 'column.manage_follows', defaultMessage: 'Manage follows' },
+ heading: { id: 'column.manage_follows', defaultMessage: 'Manage who you follow' },
});
-const mapStateToProps = state => ({
- accountIds: state.getIn(['user_lists', 'follow_requests', 'items']),
- hasMore: !!state.getIn(['user_lists', 'follow_requests', 'next']),
-});
+const mapStateToProps = state => {
+ const accountId = state.get('me');
+
+ return {
+ accountId,
+ accountIds: state.getIn(['user_lists', 'following', accountId, 'items']),
+ hasMore: !!state.getIn(['user_lists', 'following', accountId, 'next']),
+ };
+};
export default @connect(mapStateToProps)
@injectIntl
@@ -33,11 +41,18 @@ class ManageFollows extends ImmutablePureComponent {
};
componentDidMount() {
- this.props.dispatch(fetchFollowRequests());
+ const { accountId } = this.props;
+ this.props.dispatch(fetchFollowing(accountId));
+ }
+
+ componentDidUpdate(prevProps) {
+ const { accountId } = this.props;
+ this.props.dispatch(fetchFollowing(accountId));
}
handleLoadMore = debounce(() => {
- this.props.dispatch(expandFollowRequests());
+ const { accountId } = this.props;
+ this.props.dispatch(expandFollowing(accountId));
}, 300, { leading: true });
render() {
@@ -51,18 +66,18 @@ class ManageFollows extends ImmutablePureComponent {
);
}
- const emptyMessage = ;
+ const emptyMessage = ;
return (
- {accountIds.map(id =>
-
+ {accountIds && accountIds.map(id =>
+
)}