Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/18091

 Conflicts:

	src/components/structures/SpaceRoomView.tsx

src/components/structures/SpaceRoomView.tsx

@@ -111,12 +111,14 @@ export const SpaceFeedbackPrompt = ({ onClick }: { onClick?: () => void }) => {
         <hr />
         <div>
             <span className="mx_SpaceFeedbackPrompt_text">{ _t("Spaces are a beta feature.") }</span>
-            <AccessibleButton kind="link" onClick={() => {
-                if (onClick) onClick();
-                Modal.createTrackedDialog("Beta Feedback", "feature_spaces", BetaFeedbackDialog, {
+            <AccessibleButton
+                kind="link"
+                onClick={() => {
+                    if (onClick) onClick();
+                    Modal.createTrackedDialog("Beta Feedback", "feature_spaces", BetaFeedbackDialog, {
                     featureId: "feature_spaces",
-                });
-            }}>
+                    });
+                }}>
                 { _t("Feedback") }
             </AccessibleButton>
         </div>
@@ -581,7 +583,6 @@ const SpaceAddExistingRooms = ({ space, onFinished }) => {
             spacesRenderer={defaultSpacesRenderer}
             dmsRenderer={defaultDmsRenderer}
         />
-
         <SpaceFeedbackPrompt />
     </div>;
 };