From e86ceb986fc913e958c6eb72cb0f237b86ebeb07 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Fri, 15 Nov 2019 15:13:22 +0100
Subject: [PATCH] pass powerlevels state to power level section and admin
 section

---
 src/components/views/right_panel/UserInfo.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index 8931b3ed1f..a0a256e4c8 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -628,13 +628,12 @@ const MuteToggleButton = withLegacyMatrixClient(
 );
 
 const RoomAdminToolsContainer = withLegacyMatrixClient(
-    ({matrixClient: cli, room, children, member, startUpdating, stopUpdating}) => {
+    ({matrixClient: cli, room, children, member, startUpdating, stopUpdating, powerLevels}) => {
         let kickButton;
         let banButton;
         let muteButton;
         let redactButton;
 
-        const powerLevels = useRoomPowerLevels(room);
         const editPowerLevel = (
             (powerLevels.events ? powerLevels.events["m.room.power_levels"] : null) ||
             powerLevels.state_default
@@ -837,8 +836,7 @@ function useRoomPermissions(cli, room, user) {
     return roomPermissions;
 }
 
-const PowerLevelEditor = withLegacyMatrixClient(({matrixClient: cli, user, room, startUpdating, stopUpdating, roomPermissions}) => {
-    const onPowerChange = useCallback(async (powerLevel) => {
+const PowerLevelSection = withLegacyMatrixClient(({matrixClient: cli, user, room, roomPermissions, powerLevels}) => {
         const _applyPowerChange = (roomId, target, powerLevel, powerLevelEvent) => {
             startUpdating();
             cli.setPowerLevel(roomId, target, parseInt(powerLevel), powerLevelEvent).then(
@@ -945,6 +943,7 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
     // only display the devices list if our client supports E2E
     const _enableDevices = cli.isCryptoEnabled();
 
+    const powerLevels = useRoomPowerLevels(cli, room);
     // Load whether or not we are a Synapse Admin
     const isSynapseAdmin = useIsSynapseAdmin(cli);
 
@@ -1040,6 +1039,7 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
     if (room && user.roomId) {
         adminToolsContainer = (
             <RoomAdminToolsContainer
+                powerLevels={powerLevels}
                 member={user}
                 room={room}
                 startUpdating={startUpdating}
@@ -1130,9 +1130,9 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
             title={_t('Close')} />;
     }
 
-    const memberDetails = <PowerLevelEditor
+    const memberDetails = <PowerLevelSection
+        powerLevels={powerLevels}
         user={user} room={room} roomPermissions={roomPermissions}
-        startUpdating={startUpdating} stopUpdating={stopUpdating}
     />;
 
     const isRoomEncrypted = useIsEncrypted(cli, room);