diff --git a/app/javascript/mastodon/features/report/comment.js b/app/javascript/mastodon/features/report/comment.js
index 8d1a4e21fe..cde1564158 100644
--- a/app/javascript/mastodon/features/report/comment.js
+++ b/app/javascript/mastodon/features/report/comment.js
@@ -74,7 +74,7 @@ class Comment extends React.PureComponent {
-
+
);
diff --git a/app/javascript/mastodon/features/report/statuses.js b/app/javascript/mastodon/features/report/statuses.js
index 5999a0e061..d5d86034fb 100644
--- a/app/javascript/mastodon/features/report/statuses.js
+++ b/app/javascript/mastodon/features/report/statuses.js
@@ -6,9 +6,11 @@ import StatusCheckBox from 'mastodon/features/report/containers/status_check_box
import { OrderedSet } from 'immutable';
import { FormattedMessage } from 'react-intl';
import Button from 'mastodon/components/button';
+import LoadingIndicator from 'mastodon/components/loading_indicator';
const mapStateToProps = (state, { accountId }) => ({
availableStatusIds: OrderedSet(state.getIn(['timelines', `account:${accountId}:with_replies`, 'items'])),
+ isLoading: state.getIn(['timelines', `account:${accountId}:with_replies`, 'isLoading']),
});
export default @connect(mapStateToProps)
@@ -19,6 +21,7 @@ class Statuses extends React.PureComponent {
accountId: PropTypes.string.isRequired,
availableStatusIds: ImmutablePropTypes.set.isRequired,
selectedStatusIds: ImmutablePropTypes.set.isRequired,
+ isLoading: PropTypes.bool,
onToggle: PropTypes.func.isRequired,
};
@@ -28,7 +31,7 @@ class Statuses extends React.PureComponent {
};
render () {
- const { availableStatusIds, selectedStatusIds, onToggle } = this.props;
+ const { availableStatusIds, selectedStatusIds, onToggle, isLoading } = this.props;
return (
@@ -36,7 +39,7 @@ class Statuses extends React.PureComponent {
- {availableStatusIds.union(selectedStatusIds).map(statusId => (
+ {isLoading ? : availableStatusIds.union(selectedStatusIds).map(statusId => (