Fix #634 - Only include innermost-level statuses in report UI

Fix #635 - Include the initially-reported status in report UI even if it's not
among the user's most recent statuses

2 files changed, 5 insertions, 1 deletions

diff --git a/app/assets/javascripts/components/features/report/components/status_check_box.jsx b/app/assets/javascripts/components/features/report/components/status_check_box.jsx
index df4a31457..6d976582b 100644
--- a/app/assets/javascripts/components/features/report/components/status_check_box.jsx
+++ b/app/assets/javascripts/components/features/report/components/status_check_box.jsx
@@ -18,6 +18,10 @@ const StatusCheckBox = React.createClass({
     const { status, checked, onToggle, disabled } = this.props;
     const content = { __html: emojify(status.get('content')) };
 
+    if (status.get('reblog')) {
+      return null;
+    }
+
     return (
       <div className='status-check-box' style={{ display: 'flex' }}>
         <div
diff --git a/app/assets/javascripts/components/features/report/index.jsx b/app/assets/javascripts/components/features/report/index.jsx
index eb8d28fe8..3177d28b1 100644
--- a/app/assets/javascripts/components/features/report/index.jsx
+++ b/app/assets/javascripts/components/features/report/index.jsx
@@ -27,7 +27,7 @@ const makeMapStateToProps = () => {
       isSubmitting: state.getIn(['reports', 'new', 'isSubmitting']),
       account: getAccount(state, accountId),
       comment: state.getIn(['reports', 'new', 'comment']),
-      statusIds: state.getIn(['timelines', 'accounts_timelines', accountId, 'items'], Immutable.List())
+      statusIds: Immutable.OrderedSet(state.getIn(['timelines', 'accounts_timelines', accountId, 'items'])).union(state.getIn(['reports', 'new', 'status_ids']))
     };
   };