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

 Conflicts:

	src/dispatcher/actions.ts

src/dispatcher/actions.ts

@@ -100,6 +100,12 @@ export enum Action {
      */
     OpenDialPad = "open_dial_pad",
 
+    /**
+     * Dial the phone number in the payload
+     * payload: DialNumberPayload
+     */
+    DialNumber = "dial_number",
+
     /**
      * Fired when CallHandler has checked for PSTN protocol support
      * payload: none
@@ -139,6 +145,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_error",
+
     /**
      * Switches space. Should be used with SwitchSpacePayload.
      */