From 4a1dc5567341c478fefd275010dabf81329f3efb Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Wed, 13 Nov 2019 12:11:06 +0100
Subject: [PATCH] fixup: rearrange openDMForUser

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

diff --git a/src/components/views/right_panel/UserInfo.js b/src/components/views/right_panel/UserInfo.js
index c61746293e..e7277a52e2 100644
--- a/src/components/views/right_panel/UserInfo.js
+++ b/src/components/views/right_panel/UserInfo.js
@@ -75,6 +75,29 @@ async function unverifyUser(matrixClient, userId) {
     }
 }
 
+function openDMForUser(matrixClient, userId) {
+    const dmRooms = DMRoomMap.shared().getDMRoomsForUserId(userId);
+    const lastActiveRoom = dmRooms.reduce((lastActiveRoom, roomId) => {
+        const room = matrixClient.getRoom(roomId);
+        if (!room || room.getMyMembership() === "leave") {
+            return lastActiveRoom;
+        }
+        if (!lastActiveRoom || lastActiveRoom.getLastActiveTimestamp() < room.getLastActiveTimestamp()) {
+            return room;
+        }
+        return lastActiveRoom;
+    }, null);
+
+    if (lastActiveRoom) {
+        dis.dispatch({
+            action: 'view_room',
+            room_id: lastActiveRoom.roomId,
+        });
+    } else {
+        createRoom({dmUserId: userId});
+    }
+}
+
 function useIsEncrypted(cli, room) {
     const [isEncrypted, setIsEncrypted] = useState(cli.isRoomEncrypted(room.roomId));
 
@@ -112,29 +135,6 @@ const DevicesSection = ({devices, userId, loading}) => {
     );
 };
 
-function openDMForUser(cli, userId) {
-    const dmRooms = DMRoomMap.shared().getDMRoomsForUserId(userId);
-    const lastActiveRoom = dmRooms.reduce((lastActiveRoom, roomId) => {
-        const room = cli.getRoom(roomId);
-        if (!room || room.getMyMembership() === "leave") {
-            return lastActiveRoom;
-        }
-        if (!lastActiveRoom || lastActiveRoom.getLastActiveTimestamp() < room.getLastActiveTimestamp()) {
-            return room;
-        }
-        return lastActiveRoom;
-    }, null);
-
-    if (lastActiveRoom) {
-        dis.dispatch({
-            action: 'view_room',
-            room_id: lastActiveRoom.roomId,
-        });
-    } else {
-        createRoom({dmUserId: userId});
-    }
-}
-
 const UserOptionsSection = withLegacyMatrixClient(({matrixClient: cli, member, isIgnored, canInvite, devices}) => {
     let ignoreButton = null;
     let insertPillButton = null;