From fc286b408718d6efef4ec3e81dae8294e655bcf7 Mon Sep 17 00:00:00 2001 From: grahhnt <46821216+grahhnt@users.noreply.github.com> Date: Thu, 20 Jan 2022 12:30:36 -0700 Subject: [PATCH] [FIX] openUserInfo not working after changing room types (#24098) --- .../views/room/providers/ToolboxProvider.tsx | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/client/views/room/providers/ToolboxProvider.tsx b/client/views/room/providers/ToolboxProvider.tsx index 53cf2b34be9..d8e1ee41c65 100644 --- a/client/views/room/providers/ToolboxProvider.tsx +++ b/client/views/room/providers/ToolboxProvider.tsx @@ -1,5 +1,5 @@ import { useDebouncedState, useMutableCallback, useSafely } from '@rocket.chat/fuselage-hooks'; -import React, { ReactNode, useContext, useMemo, useState, useCallback, useLayoutEffect, MouseEventHandler } from 'react'; +import React, { ReactNode, useContext, useMemo, useState, useLayoutEffect, MouseEventHandler } from 'react'; import { IRoom } from '../../../../definition/IRoom'; import { useCurrentRoute, useRoute } from '../../../contexts/RouterContext'; @@ -65,22 +65,19 @@ const ToolboxProvider = ({ children, room }: { children: ReactNode; room: IRoom }); }); - const openUserInfo = useCallback( - (username) => { - switch (room.t) { - case 'l': - open('room-info', username); - break; - case 'd': - open('user-info', username); - break; - default: - open('members-list', username); - break; - } - }, - [room.t, open], - ); + const openUserInfo = useMutableCallback((username) => { + switch (room.t) { + case 'l': + open('room-info', username); + break; + case 'd': + room.uids?.length > 2 ? open('user-info-group', username) : open('user-info', username); + break; + default: + open('members-list', username); + break; + } + }); useLayoutEffect(() => { if (!tab) {