Skip to content

Commit 52c99d4

Browse files
Some more adjustments
1 parent dc1c513 commit 52c99d4

5 files changed

Lines changed: 12 additions & 15 deletions

File tree

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
import type { Channel, ChannelMemberResponse, EventType } from 'stream-chat';
1+
import type { Channel, EventType } from 'stream-chat';
22
import { useSelectedChannelState } from './useSelectedChannelState';
33

44
const selector = (c: Channel) => c.state.membership;
55
const keys: EventType[] = ['member.updated'];
66

7-
export function useChannelMembershipState(channel: Channel): ChannelMemberResponse;
8-
export function useChannelMembershipState(
9-
channel?: Channel | undefined,
10-
): ChannelMemberResponse | undefined;
117
export function useChannelMembershipState(channel?: Channel) {
128
return useSelectedChannelState({ channel, selector, stateChangeEventKeys: keys });
139
}

src/components/ChannelListItem/ChannelListItem.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ export const ChannelListItem = (props: ChannelListItemProps) => {
220220
latestMessagePreview={latestMessagePreview}
221221
messageDeliveryStatus={messageDeliveryStatus}
222222
muted={muted}
223-
pinned={!!membership.pinned_at}
223+
pinned={!!membership?.pinned_at}
224224
setActiveChannel={setActiveChannel}
225225
unread={unread}
226226
/>

src/components/ChannelListItem/ChannelListItemActionButtons.defaults.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ const useArchiveAction = (): ChannelActionBehavior => {
8989

9090
const toggle = async () => {
9191
try {
92-
if (membership.archived_at) {
92+
if (membership?.archived_at) {
9393
await channel.unarchive();
9494
addNotification({
9595
context: { channel },
@@ -121,8 +121,8 @@ const useArchiveAction = (): ChannelActionBehavior => {
121121
};
122122

123123
return {
124-
'aria-pressed': typeof membership.archived_at === 'string',
125-
title: membership.archived_at ? t('Unarchive') : t('Archive'),
124+
'aria-pressed': typeof membership?.archived_at === 'string',
125+
title: membership?.archived_at ? t('Unarchive') : t('Archive'),
126126
toggle,
127127
};
128128
};
@@ -288,7 +288,7 @@ const usePinAction = (): ChannelActionBehavior => {
288288

289289
const toggle = async () => {
290290
try {
291-
if (membership.pinned_at) {
291+
if (membership?.pinned_at) {
292292
await channel.unpin();
293293
addNotification({
294294
context: { channel },
@@ -320,8 +320,8 @@ const usePinAction = (): ChannelActionBehavior => {
320320
};
321321

322322
return {
323-
'aria-pressed': !!membership.pinned_at,
324-
title: membership.pinned_at ? t('Unpin') : t('Pin'),
323+
'aria-pressed': !!membership?.pinned_at,
324+
title: membership?.pinned_at ? t('Unpin') : t('Pin'),
325325
toggle,
326326
};
327327
};
@@ -518,7 +518,7 @@ export const useBaseChannelActionSetFilter = (channelActionSet: ChannelActionIte
518518
const { channel } = useChannelListItemContext();
519519
const membership = useChannelMembershipState(channel);
520520
const memberCount = channel.data?.member_count ?? 0;
521-
const connectedUserIsMember = typeof membership.user !== 'undefined';
521+
const connectedUserIsMember = typeof membership?.user !== 'undefined';
522522
const isDirectMessageChannel = connectedUserIsMember && memberCount === 2;
523523

524524
const ownCapabilities = channel.data?.own_capabilities;

src/components/Chat/hooks/useChat.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import type {
1414
EventPayload,
1515
OwnUserResponse,
1616
StreamChat,
17+
TranslationLanguage,
1718
UserMuteResponse,
1819
} from 'stream-chat';
1920

@@ -88,7 +89,7 @@ export const useChat = ({
8889
}, [clientMutes?.length]);
8990

9091
useEffect(() => {
91-
let userLanguage = client.user?.language;
92+
let userLanguage = client.user?.language as TranslationLanguage;
9293

9394
if (!userLanguage) {
9495
const browserLanguage = window.navigator.language.slice(0, 2); // just get language code, not country-specific version

src/plugins/ChannelDetail/Views/ChannelManagementView/ChannelManagementView.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ export const ChannelManagementInfoBody = ({
7777
const userMuted = useIsUserMuted(otherMemberUserId);
7878
const membership = useChannelMembershipState(channel);
7979
const onlineStatusText = useChannelHeaderOnlineStatus({ channel });
80-
const pinned = !!membership.pinned_at;
80+
const pinned = !!membership?.pinned_at;
8181

8282
return (
8383
<Prompt.Body className='str-chat__channel-detail__channel-management-view__body'>

0 commit comments

Comments
 (0)