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

# Conflicts:
#	test/components/views/rooms/__snapshots__/RoomHeader-test.tsx.snap

src/stores/RoomViewStore.tsx

@@ -119,7 +119,6 @@ interface State {
     viewingCall: boolean;
 
     promptAskToJoin: boolean;
-    knocked: boolean;
 }
 
 const INITIAL_STATE: State = {
@@ -141,7 +140,6 @@ const INITIAL_STATE: State = {
     wasContextSwitch: false,
     viewingCall: false,
     promptAskToJoin: false,
-    knocked: false,
 };
 
 type Listener = (isActive: boolean) => void;
@@ -775,15 +773,6 @@ export class RoomViewStore extends EventEmitter {
         return this.state.promptAskToJoin;
     }
 
-    /**
-     * Gets the current state of the 'knocked' property.
-     *
-     * @returns {boolean} The value of the 'knocked' property.
-     */
-    public knocked(): boolean {
-        return this.state.knocked;
-    }
-
     /**
      * Submits a request to join a room by sending a knock request.
      *
@@ -793,15 +782,13 @@ export class RoomViewStore extends EventEmitter {
     private submitAskToJoin(payload: SubmitAskToJoinPayload): void {
         MatrixClientPeg.safeGet()
             .knockRoom(payload.roomId, { viaServers: this.state.viaServers, ...payload.opts })
-            .then(() => this.setState({ promptAskToJoin: false, knocked: true }))
-            .catch((err: MatrixError) => {
-                this.setState({ promptAskToJoin: false });
-
+            .catch((err: MatrixError) =>
                 Modal.createDialog(ErrorDialog, {
                     title: _t("Failed to join"),
                     description: err.httpStatus === 403 ? _t("You need an invite to access this room.") : err.message,
-                });
-            });
+                }),
+            )
+            .finally(() => this.setState({ promptAskToJoin: false }));
     }
 
     /**
@@ -813,7 +800,6 @@ export class RoomViewStore extends EventEmitter {
     private cancelAskToJoin(payload: CancelAskToJoinPayload): void {
         MatrixClientPeg.safeGet()
             .leave(payload.roomId)
-            .then(() => this.setState({ knocked: false }))
             .catch((err: MatrixError) =>
                 Modal.createDialog(ErrorDialog, { title: _t("Failed to cancel"), description: err.message }),
             );