Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore/Fix: Ensure members list updates simultaneously when a new member is added #865

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion packages/react/src/hooks/useFetchChatData.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const useFetchChatData = (showRoles) => {
const setViewUserInfoPermissions = useUserStore(
(state) => state.setViewUserInfoPermissions
);
const setMembersHandler = useMemberStore((state) => state.setMembersHandler);

const getMessagesAndRoles = useCallback(
async (anonymousMode) => {
Expand Down Expand Up @@ -107,7 +108,24 @@ const useFetchChatData = (showRoles) => {
[isUserAuthenticated, RCInstance, setStarredMessages]
);

return { getMessagesAndRoles, getStarredMessages };
const getChannelMembers = useCallback(
async (anonymousMode) => {
if (isUserAuthenticated) {
try {
if (!isUserAuthenticated && !anonymousMode) {
return;
}
const { members } = await RCInstance.getChannelMembers();
setMembersHandler(members);
} catch (e) {
console.error(e);
}
}
},
[RCInstance, setMembersHandler, isUserAuthenticated]
);

return { getMessagesAndRoles, getStarredMessages, getChannelMembers };
};

export default useFetchChatData;
7 changes: 6 additions & 1 deletion packages/react/src/views/Message/MessageHeader.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { useEffect } from 'react';
import PropTypes from 'prop-types';
import { format } from 'date-fns';
import {
Expand All @@ -13,6 +13,7 @@ import { useMemberStore, useUserStore } from '../../store';
import { getMessageHeaderStyles } from './Message.styles';
import useDisplayNameColor from '../../hooks/useDisplayNameColor';
import { useRCContext } from '../../context/RCInstance';
import useFetchChatData from '../../hooks/useFetchChatData';

const MessageHeader = ({
message,
Expand All @@ -33,6 +34,10 @@ const MessageHeader = ({
const showName = ECOptions?.showName;
const channelLevelRoles = useMemberStore((state) => state.memberRoles);
const admins = useMemberStore((state) => state.admins);
const { getChannelMembers } = useFetchChatData();
useEffect(() => {
getChannelMembers();
}, [getChannelMembers]);

const isPinned = message.pinned;
const isStarred =
Expand Down
Loading