Merge branch 'main' into glitch-soc/merge-upstream

2022-02-23 21:44:09 +01:00
parent aafe91259a b7cf11d5a9
commit fc2c65d79f
3 changed files with 1 additions and 67 deletions
--- a/app/javascript/mastodon/actions/reports.js
+++ b/app/javascript/mastodon/actions/reports.js
@ -8,7 +8,7 @@ export const REPORT_SUBMIT_FAIL    = 'REPORT_SUBMIT_FAIL';
 export const initReport = (account, status) => dispatch =>
  dispatch(openModal('REPORT', {
    accountId: account.get('id'),
-    statusId: status.get('id'),
+    statusId: status?.get('id'),
  }));

 export const submitReport = (params, onSuccess, onFail) => (dispatch, getState) => {