diff --git a/client/ui/chat/ChatFragment.tsx b/client/ui/chat/ChatFragment.tsx index eae0c26..bd07d03 100644 --- a/client/ui/chat/ChatFragment.tsx +++ b/client/ui/chat/ChatFragment.tsx @@ -567,7 +567,7 @@ export default function ChatFragment({ target, showReturnButton, onReturnButtonC flexDirection: "column", height: "100%", }}> - {tabItemSelected == "GroupMembers" && } + } { @@ -576,7 +576,7 @@ export default function ChatFragment({ target, showReturnButton, onReturnButtonC flexDirection: "column", height: "100%", }}> - {tabItemSelected == "NewMemberRequests" && } + } { + React.useEffect(() => { async function updateMembers() { const re = await Client.invoke("Chat.getMembers", { token: data.access_token, @@ -38,8 +38,11 @@ export default function GroupMembersList({ } updateMembers() EventBus.on('GroupMembersList.updateMembers', () => updateMembers()) - setTimeout(() => updateMembers(), 15 * 1000) - }) + const id = setTimeout(() => updateMembers(), 15 * 1000) + return () => { + clearTimeout(id) + } + }, [target]) return { + React.useEffect(() => { async function updateJoinRequests() { const re = await Client.invoke("Chat.getJoinRequests", { token: data.access_token, @@ -41,8 +41,11 @@ export default function JoinRequestsList({ } updateJoinRequests() EventBus.on('JoinRequestsList.updateJoinRequests', () => updateJoinRequests()) - setTimeout(() => updateJoinRequests(), 15 * 1000) - }) + const id = setTimeout(() => updateJoinRequests(), 15 * 1000) + return () => { + clearTimeout(id) + } + }, [target]) async function removeJoinRequest(userId: string) { const re = await Client.invoke("Chat.processJoinRequest", {