Some more type renames

Author: arnautov-anton

src/components/Channel/Channel.tsx

@@ -18,7 +18,6 @@ import type {
   ChannelStateResponseFields,
   DeleteMessageOptions,
   Event,
-  EventAPIResponse,
   GiphyVersions,
   LocalMessage,
   MessageRequest,
@@ -112,7 +111,7 @@ export type ChannelProps = {
   doMarkReadRequest?: (
     channel: StreamChannel,
     setChannelUnreadUiState?: (state: ChannelUnreadUiState) => void,
-  ) => Promise<EventAPIResponse> | void;
+  ) => ReturnType<StreamChannel['markRead']> | void;
   /** Custom action handler to override the default `channel.sendMessage` request function (advanced usage only) */
   doSendMessageRequest?: (
     channel: StreamChannel,

src/components/Channel/__tests__/Channel.test.tsx

@@ -1,7 +1,7 @@
 import { fromPartial } from '@total-typescript/shoehorn';
 import { nanoid } from 'nanoid';
 import React, { useEffect } from 'react';
-import { ErrorFromResponse, SearchController } from 'stream-chat';
+import { SearchController, StreamAPIError } from 'stream-chat';
 import type {
   Channel as ChannelType,
   LocalMessage,
@@ -2053,7 +2053,7 @@ describe('Channel', () => {
         expect(msg.status).toBe('received');
       });
 
-      it('should convert axios network errors to ErrorFromResponse when sending fails', async () => {
+      it('should convert axios network errors to StreamAPIError when sending fails', async () => {
         const messageText = nanoid();
         const messageId = nanoid();
         const axiosNetworkError = Object.assign(new Error('Network Error'), {
@@ -2087,7 +2087,7 @@ describe('Channel', () => {
         const failedMessage = channel.state.findMessage(messageId);
         expect(failedMessage).toBeDefined();
         expect(failedMessage.status).toBe('failed');
-        expect(failedMessage.error).toBeInstanceOf(ErrorFromResponse);
+        expect(failedMessage.error).toBeInstanceOf(StreamAPIError);
         expect(failedMessage.error.message).toBe('Network Error');
         expect(failedMessage.error.status).toBe(0);
         expect(failedMessage.error.code).toBeNull();

src/components/ChannelList/hooks/useChannelMembersState.ts

@@ -1,8 +1,8 @@
-import type { Channel, ChannelMemberResponse, EventTypes } from 'stream-chat';
+import type { Channel, ChannelMemberResponse, EventType } from 'stream-chat';
 import { useSelectedChannelState } from './useSelectedChannelState';
 
 const selector = (c: Channel) => c.state.members;
-const keys: EventTypes[] = [
+const keys: EventType[] = [
   'member.updated',
   'member.added',
   'member.removed',

src/components/ChannelList/hooks/useChannelMembershipState.ts

@@ -1,8 +1,8 @@
-import type { Channel, ChannelMemberResponse, EventTypes } from 'stream-chat';
+import type { Channel, ChannelMemberResponse, EventType } from 'stream-chat';
 import { useSelectedChannelState } from './useSelectedChannelState';
 
 const selector = (c: Channel) => c.state.membership;
-const keys: EventTypes[] = ['member.updated'];
+const keys: EventType[] = ['member.updated'];
 
 export function useChannelMembershipState(channel: Channel): ChannelMemberResponse;
 export function useChannelMembershipState(

src/components/ChannelList/hooks/useSelectedChannelState.ts

@@ -1,19 +1,19 @@
 import { useCallback } from 'react';
 import { useSyncExternalStore } from 'use-sync-external-store/shim';
-import type { Channel, EventTypes } from 'stream-chat';
+import type { Channel, EventType } from 'stream-chat';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
 const noop = () => {};
 
 export function useSelectedChannelState<O>(_: {
   channel: Channel;
   selector: (channel: Channel) => O;
-  stateChangeEventKeys?: EventTypes[];
+  stateChangeEventKeys?: EventType[];
 }): O;
 export function useSelectedChannelState<O>(_: {
   selector: (channel: Channel) => O;
   channel?: Channel | undefined;
-  stateChangeEventKeys?: EventTypes[];
+  stateChangeEventKeys?: EventType[];
 }): O | undefined;
 export function useSelectedChannelState<O>({
   channel,
@@ -22,7 +22,7 @@ export function useSelectedChannelState<O>({
 }: {
   selector: (channel: Channel) => O;
   channel?: Channel;
-  stateChangeEventKeys?: EventTypes[];
+  stateChangeEventKeys?: EventType[];
 }): O | undefined {
   const subscribe = useCallback(
     (onStoreChange: (value: O) => void) => {

src/components/MessageComposer/QuotedMessagePreview.tsx

@@ -29,7 +29,7 @@ import {
   type MessageResponse,
   type PollResponseData,
   type SharedLocationResponseData,
-  type TranslationLanguages,
+  type TranslationLanguage,
   type VoiceRecordingAttachment,
 } from 'stream-chat';
 import { useChannelStateContext } from '../../context/ChannelStateContext';
@@ -338,7 +338,7 @@ export const QuotedMessagePreviewUI = ({
 
   const quotedMessageText = useMemo(
     () =>
-      quotedMessage?.i18n?.[`${userLanguage}_text` as `${TranslationLanguages}_text`] ||
+      quotedMessage?.i18n?.[`${userLanguage}_text` as `${TranslationLanguage}_text`] ||
       quotedMessage?.text,
     [quotedMessage?.i18n, quotedMessage?.text, userLanguage],
   );

src/components/Poll/PollActions/AddCommentPrompt.tsx

@@ -1,12 +1,12 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useStateStore } from '../../../store';
 import { useModalContext, usePollContext, useTranslationContext } from '../../../context';
-import type { PollAnswer, PollState } from 'stream-chat';
+import type { PollState, PollVoteResponseData } from 'stream-chat';
 import { Prompt } from '../../Dialog';
 import { TextInput } from '../../Form';
 import { useFormState } from '../../Form/hooks';
 
-type PollStateSelectorReturnValue = { ownAnswer: PollAnswer | undefined };
+type PollStateSelectorReturnValue = { ownAnswer: PollVoteResponseData | undefined };
 const pollStateSelector = (nextValue: PollState): PollStateSelectorReturnValue => ({
   ownAnswer: nextValue.ownAnswer,
 });

src/components/Poll/PollActions/PollAnswerList.tsx

@@ -13,11 +13,11 @@ import {
   useTranslationContext,
 } from '../../../context';
 
-import type { PollAnswer, PollState } from 'stream-chat';
+import type { PollState, PollVoteResponseData } from 'stream-chat';
 
 type PollStateSelectorReturnValue = {
   is_closed: boolean | undefined;
-  ownAnswer: PollAnswer | undefined;
+  ownAnswer: PollVoteResponseData | undefined;
 };
 const pollStateSelector = (nextValue: PollState): PollStateSelectorReturnValue => ({
   is_closed: nextValue.is_closed,

src/context/MessageTranslationViewContext.tsx

@@ -38,7 +38,7 @@
  */
 
 import React, { createContext, useCallback, useContext, useState } from 'react';
-import type { LocalMessage, TranslationLanguages } from 'stream-chat';
+import type { LocalMessage, TranslationLanguage } from 'stream-chat';
 
 /**
  * Returns the translated message text for a given language from `message.i18n`, or
@@ -51,7 +51,7 @@ export const getTranslatedMessageText = ({
   language: string;
   message?: LocalMessage;
 }): string | undefined =>
-  message?.i18n?.[`${language}_text` as `${TranslationLanguages}_text`];
+  message?.i18n?.[`${language}_text` as `${TranslationLanguage}_text`];
 
 /**
  * Which message text to show.

src/context/TranslationContext.tsx

@@ -4,7 +4,7 @@ import calendar from 'dayjs/plugin/calendar.js';
 import localizedFormat from 'dayjs/plugin/localizedFormat.js';
 import type { PropsWithChildren } from 'react';
 import type { TFunction } from 'i18next';
-import type { TranslationLanguages } from 'stream-chat';
+import type { TranslationLanguage } from 'stream-chat';
 
 import { defaultDateTimeParser, defaultTranslatorFunction } from '../i18n/utils';
 import type { TDateTimeParser } from '../i18n/types';
@@ -15,7 +15,7 @@ Dayjs.extend(localizedFormat);
 export type TranslationContextValue = {
   t: TFunction;
   tDateTimeParser: TDateTimeParser;
-  userLanguage: TranslationLanguages;
+  userLanguage: TranslationLanguage;
 };
 
 export const TranslationContext = React.createContext<TranslationContextValue>({