diff options
author | beatrix <beatrix.bitrot@gmail.com> | 2018-05-07 09:45:13 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-07 09:45:13 -0400 |
commit | 919e2098cb7c2ff30e19ab4f4e4c8ec9506d230d (patch) | |
tree | 0dd0ccf54c9def4b941adf684d01be66cf48fd35 /app/javascript/flavours/glitch/features/ui | |
parent | 2eb924c00ca9fdf4cd37e7be339337a7fdf4ea23 (diff) | |
parent | 658ac4396cf1b7cab034701082645747c39f7af2 (diff) |
Merge pull request #468 from ThibG/glitch-soc/features/reports-improvements
Various improvements to the reports modal
Diffstat (limited to 'app/javascript/flavours/glitch/features/ui')
-rw-r--r-- | app/javascript/flavours/glitch/features/ui/components/report_modal.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/javascript/flavours/glitch/features/ui/components/report_modal.js b/app/javascript/flavours/glitch/features/ui/components/report_modal.js index b5fc33d03..3b7a5ff20 100644 --- a/app/javascript/flavours/glitch/features/ui/components/report_modal.js +++ b/app/javascript/flavours/glitch/features/ui/components/report_modal.js @@ -30,7 +30,7 @@ const makeMapStateToProps = () => { account: getAccount(state, accountId), comment: state.getIn(['reports', 'new', 'comment']), forward: state.getIn(['reports', 'new', 'forward']), - statusIds: OrderedSet(state.getIn(['timelines', `account:${accountId}`, 'items'])).union(state.getIn(['reports', 'new', 'status_ids'])), + statusIds: OrderedSet(state.getIn(['timelines', `account:${accountId}:with_replies`, 'items'])).union(state.getIn(['reports', 'new', 'status_ids'])), }; }; @@ -64,12 +64,12 @@ export default class ReportModal extends ImmutablePureComponent { } componentDidMount () { - this.props.dispatch(refreshAccountTimeline(this.props.account.get('id'))); + this.props.dispatch(refreshAccountTimeline(this.props.account.get('id'), true)); } componentWillReceiveProps (nextProps) { if (this.props.account !== nextProps.account && nextProps.account) { - this.props.dispatch(refreshAccountTimeline(nextProps.account.get('id'))); + this.props.dispatch(refreshAccountTimeline(nextProps.account.get('id'), true)); } } |