Add null types and guards

matrix-org · Mar 28, 2022 · f3e09a1 · f3e09a1
1 parent 31de269
commit f3e09a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/components/views/rooms/RoomTile.tsx b/src/components/views/rooms/RoomTile.tsx
@@ -592,7 +592,7 @@ export default class RoomTile extends React.PureComponent<IProps, IState> {
         this.setState({ jitsiParticipants: participants });
     };
 
-    private renderVoiceChannel(): React.ReactElement {
+    private renderVoiceChannel(): React.ReactElement | null {
         let faces;
         if (this.state.voiceConnectionState === VoiceConnectionState.Connected) {
             faces = this.state.jitsiParticipants.map(p =>

diff --git a/src/stores/VoiceChannelStore.ts b/src/stores/VoiceChannelStore.ts
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import { EventEmitter } from "events";
+import { logger } from "matrix-js-sdk/src/logger";
 import { ClientWidgetApi, IWidgetApiRequest } from "matrix-widget-api";
 
 import { MatrixClientPeg } from "../MatrixClientPeg";
@@ -192,6 +193,11 @@ export default class VoiceChannelStore extends EventEmitter {
     };
 
     private updateDevices = async (fn: (devices: string[]) => string[]) => {
+        if (!this.roomId) {
+            logger.error("Tried to update devices while disconnected");
+            return;
+        }
+
         const devices = this.cli.getRoom(this.roomId)
             .currentState.getStateEvents(VOICE_CHANNEL_MEMBER, this.cli.getUserId())
             ?.getContent<IVoiceChannelMemberContent>()?.devices ?? [];