From f784500b1c9dbf9c426d36298c50662e2599c153 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 8 Aug 2020 11:28:44 +0100
Subject: [PATCH] Fix Bridge Settings Tab

---
 src/components/views/settings/tabs/room/BridgeSettingsTab.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/views/settings/tabs/room/BridgeSettingsTab.js b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
index a5d20eae33..3309a6bf24 100644
--- a/src/components/views/settings/tabs/room/BridgeSettingsTab.js
+++ b/src/components/views/settings/tabs/room/BridgeSettingsTab.js
@@ -37,7 +37,7 @@ export default class BridgeSettingsTab extends React.Component {
         if (!content || !content.channel || !content.protocol) {
             return null;
         }
-        return <BridgeTile room={room} ev={event}></BridgeTile>;
+        return <BridgeTile key={event.getId()} room={room} ev={event}></BridgeTile>;
     }
 
     static getBridgeStateEvents(roomId) {
@@ -45,7 +45,7 @@ export default class BridgeSettingsTab extends React.Component {
         const roomState = (client.getRoom(roomId)).currentState;
 
         const bridgeEvents = [].concat(...BRIDGE_EVENT_TYPES.map((typeName) =>
-            Object.values(roomState.events[typeName] || {}),
+            Array.from(roomState.events.get(typeName).values()),
         ));
 
         return bridgeEvents;