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

 Conflicts:

	src/components/views/messages/TextualBody.js

	src/components/views/right_panel/UserInfo.tsx

	src/dispatcher/actions.ts

src/dispatcher/actions.ts

@@ -139,6 +139,21 @@ export enum Action {
      */
     UploadCanceled = "upload_canceled",
 
+    /**
+     * Fired when requesting to join a room
+     */
+    JoinRoom = "join_room",
+
+    /**
+     * Fired when successfully joining a room
+     */
+    JoinRoomReady = "join_room_ready",
+
+    /**
+     * Fired when joining a room failed
+     */
+    JoinRoomError = "join_room",
+
     /**
      * Inserts content into the active composer. Should be used with ComposerInsertPayload
      */