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

app/javascript/mastodon/actions/compose.js

@@ -383,7 +383,10 @@ export function initMediaEditModal(id) {
       id,
     });
 
-    dispatch(openModal('FOCAL_POINT', { id }));
+    dispatch(openModal({
+      modalType: 'FOCAL_POINT',
+      modalProps: { id },
+    }));
   };
 }