stream-chat-react-native-core 10.0.0-rc.4 → 10.0.0

package/src/components/Poll/components/PollResults/PollOptionFullResults.tsx

@@ -16,6 +16,7 @@ import { useComponentsContext } from '../../../../contexts/componentsContext/Com
 import { primitives } from '../../../../theme';
 import { usePollOptionVotesPagination } from '../../hooks/usePollOptionVotesPagination';
 import { usePollState } from '../../hooks/usePollState';
+import { usePollTextTranslation } from '../../hooks/usePollTextTranslation';
 
 export type PollOptionFullResultsProps = PollContextValue & {
   option: PollOptionResponseData;
@@ -33,6 +34,8 @@ export const PollOptionFullResultsContent = ({
   const { t } = useTranslationContext();
   const { hasNextPage, loadMore, votes } = usePollOptionVotesPagination({ option });
   const { voteCountsByOption } = usePollState();
+  const translate = usePollTextTranslation();
+  const optionText = translate(option.text, option.text_i18n);
 
   const {
     theme: {
@@ -46,7 +49,7 @@ export const PollOptionFullResultsContent = ({
   const PollOptionFullResultsHeader = useCallback(
     () => (
       <View style={[styles.headerContainer, headerContainer]}>
-        <Text style={[styles.headerTitle, headerTitle]}>{option.text}</Text>
+        <Text style={[styles.headerTitle, headerTitle]}>{optionText}</Text>
         <Text style={[styles.headerText, headerText]}>
           {t('poll.votes.text', {
             count: voteCountsByOption[option.id] ?? 0,
@@ -61,7 +64,7 @@ export const PollOptionFullResultsContent = ({
       headerText,
       headerTitle,
       option.id,
-      option.text,
+      optionText,
       styles.headerContainer,
       styles.headerText,
       styles.headerTitle,

package/src/components/Poll/components/PollResults/PollResultItem.tsx

@@ -20,6 +20,7 @@ import {
 
 import { primitives } from '../../../../theme';
 import { usePollState } from '../../hooks/usePollState';
+import { usePollTextTranslation } from '../../hooks/usePollTextTranslation';
 import { GenericPollButton } from '../Button';
 import { PollModal } from '../PollModal';
 import { PollModalHeader } from '../PollModalHeader';
@@ -97,6 +98,7 @@ const PollResultsVoteItem = (vote: PollVoteClass) => (
 export const PollResultsItem = ({ option, index }: PollResultItemProps) => {
   const { t } = useTranslationContext();
   const { latestVotesByOption, voteCountsByOption } = usePollState();
+  const translate = usePollTextTranslation();
 
   const {
     theme: {
@@ -116,7 +118,7 @@ export const PollResultsItem = ({ option, index }: PollResultItemProps) => {
           {t('poll.results.optionNumber.text', 'Option {{count}}', { count: index + 1 })}
         </Text>
         <View style={[styles.headerContainer, headerContainer]}>
-          <Text style={[styles.title, title]}>{option.text}</Text>
+          <Text style={[styles.title, title]}>{translate(option.text, option.text_i18n)}</Text>
           <Text style={[styles.voteCount, voteCount]}>
             {t('poll.votes.text', {
               count: voteCountsByOption[option.id] ?? 0,

package/src/components/Poll/components/PollResults/PollResults.tsx

@@ -14,6 +14,7 @@ import {
 import { useComponentsContext } from '../../../../contexts/componentsContext/ComponentsContext';
 import { primitives } from '../../../../theme';
 import { usePollState } from '../../hooks/usePollState';
+import { usePollTextTranslation } from '../../hooks/usePollTextTranslation';
 
 export type PollResultsProps = PollContextValue & {
   additionalScrollViewProps?: Partial<ScrollViewProps>;
@@ -22,7 +23,8 @@ export type PollResultsProps = PollContextValue & {
 export const PollResultsContent = ({
   additionalScrollViewProps,
 }: Pick<PollResultsProps, 'additionalScrollViewProps'>) => {
-  const { name, options, voteCountsByOption } = usePollState();
+  const { name, nameI18n, options, voteCountsByOption } = usePollState();
+  const translate = usePollTextTranslation();
 
   const sortedOptions = useMemo(
     () =>
@@ -51,7 +53,7 @@ export const PollResultsContent = ({
     >
       <View style={[styles.container, container]}>
         <Text style={[styles.titleMeta, titleMeta]}>{t('poll.question.label', 'Question')}</Text>
-        <Text style={[styles.title, title]}>{name}</Text>
+        <Text style={[styles.title, title]}>{translate(name, nameI18n)}</Text>
       </View>
       <View style={styles.resultsContainer}>
         {sortedOptions.map((option, index) => (

package/src/components/Poll/hooks/usePollState.ts

@@ -26,6 +26,7 @@ export type UsePollStateSelectorReturnType = {
   maxVotedOptionIds: string[];
   maxVotesAllowed: number;
   name: string;
+  nameI18n: Record<string, string> | undefined;
   options: PollOptionResponseData[];
   ownAnswer: PollVoteResponseData | undefined;
   ownVotesByOptionId: Record<string, PollVoteResponseData>;
@@ -51,6 +52,7 @@ const selector = (nextValue: PollState): UsePollStateSelectorReturnType => ({
   maxVotedOptionIds: nextValue.maxVotedOptionIds,
   maxVotesAllowed: nextValue.max_votes_allowed ?? 0,
   name: nextValue.name,
+  nameI18n: nextValue.name_i18n,
   options: nextValue.options,
   ownAnswer: nextValue.ownAnswer,
   ownVotesByOptionId: nextValue.ownVotesByOptionId,
@@ -72,6 +74,7 @@ export const usePollState = (): UsePollStateReturnType => {
     maxVotedOptionIds,
     maxVotesAllowed,
     name,
+    nameI18n,
     options,
     ownAnswer,
     ownVotesByOptionId,
@@ -106,6 +109,7 @@ export const usePollState = (): UsePollStateReturnType => {
     maxVotedOptionIds,
     maxVotesAllowed,
     name,
+    nameI18n,
     options,
     ownAnswer,
     ownVotesByOptionId,

package/src/components/Poll/hooks/usePollTextTranslation.ts

@@ -0,0 +1,19 @@
+import { useCallback } from 'react';
+
+import { useTranslationContext } from '../../../contexts/translationContext/TranslationContext';
+import { getTranslatedText } from '../../../utils/i18n/getTranslatedText';
+
+/**
+ * Returns `translate(original, i18n)`, which resolves a poll text (question, option or answer)
+ * into the current user's language. Falls back to `original` when there is no translation for it,
+ * the same way auto-translated message text does.
+ */
+export const usePollTextTranslation = () => {
+  const { userLanguage } = useTranslationContext();
+
+  return useCallback(
+    (original: string, i18n: Record<string, string> | undefined): string =>
+      getTranslatedText(i18n, userLanguage) ?? original,
+    [userLanguage],
+  );
+};

package/src/components/Poll/index.ts

@@ -6,3 +6,4 @@ export * from './hooks/usePollState';
 export * from './hooks/usePollStateStore';
 export * from './hooks/usePollAnswersPagination';
 export * from './hooks/usePollOptionVotesPagination';
+export * from './hooks/usePollTextTranslation';

package/src/components/Thread/__tests__/Thread.test.tsx

@@ -1,6 +1,14 @@
 import React from 'react';
 
-import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react-native';
+import {
+  act,
+  cleanup,
+  fireEvent,
+  render,
+  screen,
+  waitFor,
+  within,
+} from '@testing-library/react-native';
 import type {
   Channel as ChannelType,
   MessageResponse,
@@ -212,6 +220,43 @@ describe('Thread', () => {
   // already has its data doesn't.
   // An activation that is never released keeps the thread active for the session, so recovery
   // keeps reloading it and it keeps being read automatically.
+  it.each([
+    ['shows', true],
+    ['does not show', false],
+  ])(
+    '%s the delivery status of the parent message when it is the current user’s',
+    async (_, isOwn) => {
+      const parentMessage = generateMessage({
+        cid: channel.cid,
+        status: 'received',
+        text: 'Parent Message Text',
+        ...(isOwn ? { user: generateUser({ id: chatClient.userId }) } : {}),
+      });
+      const threadInstance = new ThreadClass({ channel, client: chatClient, parentMessage });
+      // A thread with its replies loaded is not reloaded on open (see "metadata reload on open").
+      threadInstance.messagePaginator.setItems({
+        valueOrFactory: [
+          channel.state.formatMessage(
+            generateMessage({
+              cid: channel.cid,
+              parent_id: parentMessage.id,
+            }) as unknown as MessageResponse,
+          ),
+        ],
+        isFirstPage: true,
+        isLastPage: true,
+      });
+
+      renderComponent({ chatClient, thread: threadInstance });
+
+      const header = await screen.findByTestId('thread-footer-component');
+      expect(within(header).getByText('Parent Message Text')).toBeTruthy();
+      expect(within(header).queryByTestId('message-status-sent')).toBe(
+        isOwn ? within(header).getByTestId('message-status-sent') : null,
+      );
+    },
+  );
+
   it('releases its activation of the thread on unmount', async () => {
     const parentMessage = generateMessage({ cid: 'messaging:test-channel', text: 'Parent' });
     const threadInstance = chatClient.threads.ensure({ channel, parentMessage });

package/src/components/Thread/components/ThreadFooterComponent.tsx

@@ -67,7 +67,6 @@ const ThreadFooterComponentWithContext = (props: ThreadFooterComponentPropsWithC
         groupStyles={['single']}
         message={parentMessage}
         preventPress={parentMessagePreventPress}
-        showMessageStatus={false}
       />
       <View style={styles.newThread}>
         <Text style={styles.text}>

package/src/contexts/channelPinnedMessageListContext/ChannelPinnedMessageListContext.tsx

@@ -21,20 +21,11 @@ export const ChannelPinnedMessageListProvider = ({
 }: PropsWithChildren<{ channel: Channel; searchSource?: MessageSearchSource }>) => {
   const { client } = useChatContext();
   const [defaultSearchSource] = useState(() => {
-    const source = new MessageSearchSource(
-      client,
-      { pageSize: 25, allowEmptySearchString: true, resetOnNewSearchQuery: false },
-      {
-        messageSearch: {
-          initialFilterConfig: {
-            $or: {
-              enabled: true,
-              generate: ({ searchQuery }) => (searchQuery ? { text: { $q: searchQuery } } : {}),
-            },
-          },
-        },
-      },
-    );
+    const source = new MessageSearchSource(client, {
+      pageSize: 25,
+      allowEmptySearchString: true,
+      resetOnNewSearchQuery: false,
+    });
     source.messageSearchChannelFilters = { cid: channel.cid, members: undefined };
     source.messageSearchFilters = { pinned: true, type: undefined };
     source.activate();

package/src/contexts/messageContext/MessageContext.tsx

@@ -19,6 +19,7 @@ import type { Rect } from '../../state-store/message-overlay-store';
 import type { ViewRef } from '../../types/react-native-compat';
 
 import type { MessageComposerAPIContextValue } from '../messageComposerContext/MessageComposerAPIContext';
+import type { GoToMessage } from '../messageListItemContext/MessageListItemContext';
 import { DEFAULT_BASE_CONTEXT_VALUE } from '../utils/defaultBaseContextValue';
 
 export type Alignment = 'right' | 'left';
@@ -113,7 +114,7 @@ export type MessageContextValue = {
   showMessageStatus: boolean;
   /** The video attachments of the message. */
   videos: Attachment[];
-  goToMessage?: (messageId: string) => void;
+  goToMessage?: GoToMessage;
   /**
    * Handles a reaction on the message.
    *

package/src/contexts/messageListItemContext/MessageListItemContext.tsx

@@ -1,18 +1,27 @@
 import React, { createContext, PropsWithChildren, useContext } from 'react';
 
+import type { LocalMessage } from 'stream-chat';
+
 import { MessageListProps } from '../../components/MessageList/MessageList';
 
 import { Theme } from '../themeContext/utils/theme';
 import { DEFAULT_BASE_CONTEXT_VALUE } from '../utils/defaultBaseContextValue';
 import { isTestEnvironment } from '../utils/isTestEnvironment';
 
+/**
+ * Goes to a message, used when a quoted message is pressed.
+ *
+ * @param messageId The ID of the message to go to.
+ * @param message The message, when the caller has it (the pressed quote passes its quoted message).
+ */
+export type GoToMessage = (
+  messageId: string,
+  message?: NonNullable<LocalMessage['quoted_message']>,
+) => void;
+
 export type MessageListItemContextValue = {
-  /**
-   * Goes to a message, used when a quoted message is pressed.
-   *
-   * @param messageId The ID of the message to go to.
-   */
-  goToMessage: (messageId: string) => void;
+  /** Goes to a message, used when a quoted message is pressed. */
+  goToMessage: GoToMessage;
   /** The theme of the list items, with `myMessageTheme` merged in. */
   modifiedTheme: Theme;
   /** Turns off grouping of consecutive messages by user. */

package/src/hooks/__tests__/useTranslatedMessage.test.tsx

@@ -59,6 +59,26 @@ describe('useTranslatedMessage', () => {
     });
   });
 
+  it("doesn't translate a deleted message", async () => {
+    const message = {
+      i18n: {
+        no_text: 'Hallo verden!',
+      },
+      text: 'Hello world!',
+      type: 'deleted',
+    } as unknown as MessageResponse;
+
+    render(
+      <TranslationProvider value={{ userLanguage: 'no' } as TranslationContextValue}>
+        <TestComponent message={message} />
+      </TranslationProvider>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getByText('Hello world!')).toBeTruthy();
+    });
+  });
+
   it("returns the original text if the message doesn't contain any translations", async () => {
     const message = {
       text: 'Hello world!',

package/src/hooks/messagePreview/__tests__/useMessagePreviewText.test.tsx

@@ -2,7 +2,7 @@ import React, { PropsWithChildren } from 'react';
 
 import { renderHook } from '@testing-library/react-native';
 
-import type { Attachment } from 'stream-chat';
+import type { Attachment, PollResponseData, StreamChat } from 'stream-chat';
 
 import { Chat } from '../../../components/Chat/Chat';
 import { initiateClientWithChannels } from '../../../mock-builders/api/initiateClientWithChannels';
@@ -15,8 +15,12 @@ import { generateMessage } from '../../../mock-builders/generator/message';
 import { useMessagePreviewText } from '../useMessagePreviewText';
 
 describe('useMessagePreviewText', () => {
-  const render = async (message: ReturnType<typeof generateMessage>) => {
+  const render = async (
+    message: ReturnType<typeof generateMessage>,
+    prepareClient?: (client: StreamChat) => void,
+  ) => {
     const { client } = await initiateClientWithChannels();
+    prepareClient?.(client);
     const wrapper = ({ children }: PropsWithChildren) => <Chat client={client}>{children}</Chat>;
     const { result } = renderHook(() => useMessagePreviewText({ message }), { wrapper });
     return result;
@@ -54,4 +58,35 @@ describe('useMessagePreviewText', () => {
     );
     expect(result.current).toBe('hello');
   });
+
+  describe('poll messages', () => {
+    const poll = {
+      id: 'poll-id',
+      latest_answers: [],
+      latest_votes_by_option: {},
+      name: 'Favourite colour?',
+      name_i18n: { es_text: '¿Color favorito?', language: 'en' },
+      options: [],
+      vote_count: 0,
+      vote_counts_by_option: {},
+    } as unknown as PollResponseData;
+
+    const renderPollMessage = (language: string) => {
+      const message = generateMessage({ poll, poll_id: poll.id, text: '' });
+      return render(message, (client) => {
+        (client.user as { language?: string }).language = language;
+        client.polls.hydratePollCache([message]);
+      });
+    };
+
+    it("shows the poll question in the user's language", async () => {
+      const result = await renderPollMessage('es');
+      expect(result.current).toBe('¿Color favorito?');
+    });
+
+    it('shows the original poll question when it has no translation', async () => {
+      const result = await renderPollMessage('de');
+      expect(result.current).toBe('Favourite colour?');
+    });
+  });
 });

package/src/hooks/messagePreview/useMessagePreviewText.tsx

@@ -14,9 +14,11 @@ import { useGroupedAttachments } from './useGroupedAttachments';
 import { useChatContext } from '../../contexts/chatContext/ChatContext';
 import { useTranslationContext } from '../../contexts/translationContext/TranslationContext';
 import { useStateStore } from '../../hooks/useStateStore';
+import { getTranslatedText } from '../../utils/i18n/getTranslatedText';
 
 const selector = (nextValue: PollState) => ({
   name: nextValue.name,
+  name_i18n: nextValue.name_i18n,
 });
 
 export const useMessagePreviewText = ({
@@ -24,10 +26,11 @@ export const useMessagePreviewText = ({
 }: {
   message?: LocalMessage | MessageResponse | DraftMessage | null;
 }) => {
-  const { t } = useTranslationContext();
+  const { t, userLanguage } = useTranslationContext();
   const { client } = useChatContext();
   const poll = client.polls.fromState(message?.poll_id ?? '');
-  const { name: pollName } = useStateStore(poll?.state, selector) ?? {};
+  const { name, name_i18n } = useStateStore(poll?.state, selector) ?? {};
+  const pollName = getTranslatedText(name_i18n, userLanguage) ?? name;
   const { giphys, audios, images, videos, files, voiceRecordings } = useGroupedAttachments(
     message?.attachments,
   );

package/src/hooks/useTranslatedMessage.ts

@@ -1,13 +1,7 @@
 import type { LocalMessage, MessageResponse } from 'stream-chat';
 
 import { useTranslationContext } from '../contexts/translationContext/TranslationContext';
-
-/**
- * The key under which auto-translated text lives in `message.i18n`. The UI language can be any
- * registered string, while `message.i18n` only carries the languages the auto-translation endpoint
- * supports: the `in` check below makes an unsupported language fall through to the original text.
- */
-type TranslationKey = `${string}_text`;
+import { getTranslatedText } from '../utils/i18n/getTranslatedText';
 
 /**
  * Returns a copy of `message` with its text swapped for the auto-translation into `userLanguage`,
@@ -21,16 +15,17 @@ export const getTranslatedMessage = (
   message: LocalMessage | MessageResponse | undefined,
   userLanguage: string,
 ) => {
-  const translationKey: TranslationKey = `${userLanguage}_text`;
-
   if (!message) {
     return undefined;
   }
 
-  if (message.i18n && translationKey in message.i18n && message.type !== 'deleted') {
+  const translatedText =
+    message.type !== 'deleted' ? getTranslatedText(message.i18n, userLanguage) : undefined;
+
+  if (translatedText !== undefined) {
     return {
       ...message,
-      text: message.i18n[translationKey],
+      text: translatedText,
     };
   }
 

package/src/i18n/__tests__/catalog.fixture.json

@@ -295,8 +295,8 @@
   "messageInput.sendMessage.accessibilityLabel": "Send message",
   "messageInput.sendMessageDisallowed.text": "You can't send messages in this channel",
   "messageList.dismissUnread.accessibilityLabel": "Dismiss unread messages",
-  "messageList.newMessages.text_one": "{{count}} new message",
-  "messageList.newMessages.text_other": "{{count}} new messages",
+  "messageList.newMessages.text_one": "{{count}} unread message",
+  "messageList.newMessages.text_other": "{{count}} unread messages",
   "messageList.scrollToBottom.accessibilityLabel": "Scroll to bottom",
   "messageList.scrollToBottom.withCount.accessibilityLabel_one": "Scroll to bottom, {{count}} new message",
   "messageList.scrollToBottom.withCount.accessibilityLabel_other": "Scroll to bottom, {{count}} new messages",

package/src/i18n/keys.ts

@@ -306,8 +306,8 @@ export type TranslationCatalog = {
   'messageInput.sendMessage.accessibilityLabel': 'Send message';
   'messageInput.sendMessageDisallowed.text': "You can't send messages in this channel";
   'messageList.dismissUnread.accessibilityLabel': 'Dismiss unread messages';
-  'messageList.newMessages.text_one': '{{count}} new message';
-  'messageList.newMessages.text_other': '{{count}} new messages';
+  'messageList.newMessages.text_one': '{{count}} unread message';
+  'messageList.newMessages.text_other': '{{count}} unread messages';
   'messageList.scrollToBottom.accessibilityLabel': 'Scroll to bottom';
   'messageList.scrollToBottom.withCount.accessibilityLabel_one': 'Scroll to bottom, {{count}} new message';
   'messageList.scrollToBottom.withCount.accessibilityLabel_other': 'Scroll to bottom, {{count}} new messages';

package/src/index.ts

@@ -23,7 +23,6 @@ export * from './types/types';
 export * from './utils/attachmentUrls';
 export * from './utils/i18n/Streami18n';
 export * from './i18n';
-export * from './utils/setupCommandUIMiddlewares';
 export * from './utils/createGenerateVideoThumbnails';
 export * from './utils/utils';
 export * from './nativeMultipartUpload';

package/src/store/SqliteClient.ts

@@ -44,7 +44,7 @@ export class SqliteClientError extends Error {
 
 /** Wraps all direct use of `@op-engineering/op-sqlite`. */
 export class SqliteClient {
-  static dbVersion = 18;
+  static dbVersion = 19;
 
   static dbName = DB_NAME;
   static dbLocation = DB_LOCATION;

package/src/store/apis/__tests__/pollTranslations.test.ts

@@ -0,0 +1,136 @@
+import type { ChannelStateResponseFields, PollResponseData } from 'stream-chat';
+
+import { generateChannelResponse } from '../../../mock-builders/generator/channel';
+import { generateMessage } from '../../../mock-builders/generator/message';
+import { BetterSqlite } from '../../../test-utils/BetterSqlite';
+import { SqliteClient } from '../../SqliteClient';
+import { getChannels } from '../getChannels';
+import { upsertChannels } from '../upsertChannels';
+import { upsertPoll } from '../upsertPoll';
+
+const POLL_ID = 'poll-id';
+
+const translatedPoll = {
+  answers_count: 0,
+  created_at: new Date('2026-10-27T10:00:00.000Z').getTime(),
+  created_by: { id: 'other-user' },
+  created_by_id: 'other-user',
+  description: 'For the team dinner',
+  description_i18n: { es_text: 'Para la cena del equipo', language: 'en' },
+  enforce_unique_vote: true,
+  id: POLL_ID,
+  latest_answers: [],
+  latest_votes_by_option: {},
+  max_votes_allowed: 1,
+  name: 'Favourite colour?',
+  name_i18n: { es_text: '¿Color favorito?', language: 'en' },
+  options: [
+    {
+      id: 'option-red',
+      poll_id: POLL_ID,
+      text: 'Red',
+      text_i18n: { es_text: 'Rojo', language: 'en' },
+    },
+  ],
+  updated_at: new Date('2026-10-27T10:00:00.000Z').getTime(),
+  vote_count: 0,
+  vote_counts_by_option: {},
+} as unknown as PollResponseData;
+
+/**
+ * The backend translates poll texts. The offline DB has to keep those translations, so a cold start
+ * offline shows the poll in the user's language, the same way message translations are kept.
+ */
+describe('poll translations in the offline DB', () => {
+  let cid: string;
+
+  beforeEach(async () => {
+    await SqliteClient.initializeDatabase();
+    await BetterSqlite.openDB();
+
+    const channelResponse = generateChannelResponse({ members: [], messages: [] });
+    cid = channelResponse.channel.cid as string;
+    channelResponse.messages = [
+      generateMessage({ cid, poll: translatedPoll, poll_id: POLL_ID, text: '' }),
+    ] as unknown as typeof channelResponse.messages;
+    await upsertChannels({
+      channels: [channelResponse] as unknown as ChannelStateResponseFields[],
+      isLatestMessagesSet: true,
+    });
+  });
+
+  afterEach(() => {
+    BetterSqlite.dropAllTables();
+    BetterSqlite.closeDB();
+  });
+
+  const getStoredPoll = async () => {
+    const [channel] = await getChannels({ channelIds: [cid], userId: 'some-user' });
+    return channel.messages[0].poll;
+  };
+
+  it("keeps the question's, description's and options' translations", async () => {
+    const poll = await getStoredPoll();
+
+    expect(poll?.name_i18n).toEqual(translatedPoll.name_i18n);
+    expect(poll?.description_i18n).toEqual(translatedPoll.description_i18n);
+    expect(poll?.options[0].text_i18n).toEqual(translatedPoll.options[0].text_i18n);
+  });
+
+  it('replaces the translations when the poll is stored again', async () => {
+    const name_i18n = { de_text: 'Lieblingsfarbe?', language: 'en' };
+    await upsertPoll({ poll: { ...translatedPoll, name_i18n } as PollResponseData });
+
+    expect((await getStoredPoll())?.name_i18n).toEqual(name_i18n);
+  });
+
+  it('stores a poll without translations unchanged', async () => {
+    const {
+      description_i18n: _description_i18n,
+      name_i18n: _name_i18n,
+      ...untranslatedPoll
+    } = translatedPoll;
+    const untranslatedChannel = generateChannelResponse({ members: [], messages: [] });
+    const untranslatedCid = untranslatedChannel.channel.cid as string;
+    untranslatedChannel.messages = [
+      generateMessage({
+        cid: untranslatedCid,
+        poll: {
+          ...untranslatedPoll,
+          id: 'untranslated-poll-id',
+          options: [{ id: 'option-red', poll_id: 'untranslated-poll-id', text: 'Red' }],
+        } as unknown as PollResponseData,
+        poll_id: 'untranslated-poll-id',
+        text: '',
+      }),
+    ] as unknown as typeof untranslatedChannel.messages;
+    await upsertChannels({
+      channels: [untranslatedChannel] as unknown as ChannelStateResponseFields[],
+      isLatestMessagesSet: true,
+    });
+
+    const [channel] = await getChannels({
+      channelIds: [untranslatedCid],
+      userId: 'some-user',
+    });
+    const poll = channel.messages[0].poll;
+
+    expect(poll?.name).toBe('Favourite colour?');
+    expect(poll?.description).toBe('For the team dinner');
+    expect(poll?.options).toEqual([
+      { id: 'option-red', poll_id: 'untranslated-poll-id', text: 'Red' },
+    ]);
+    expect(poll?.name_i18n).toBeUndefined();
+    expect(poll?.description_i18n).toBeUndefined();
+  });
+
+  it('clears translations that the poll no longer has', async () => {
+    await upsertPoll({
+      poll: { ...translatedPoll, description_i18n: undefined, name_i18n: undefined },
+    });
+
+    const poll = await getStoredPoll();
+    expect(poll?.name_i18n).toBeUndefined();
+    expect(poll?.description_i18n).toBeUndefined();
+  });
+});

package/src/store/mappers/mapPollToStorable.ts

@@ -13,6 +13,7 @@ export const mapPollToStorable = (poll: PollResponseData): TableRow<'poll'> => {
     created_by,
     created_by_id,
     description,
+    description_i18n,
     enforce_unique_vote,
     id,
     is_closed,
@@ -20,6 +21,7 @@ export const mapPollToStorable = (poll: PollResponseData): TableRow<'poll'> => {
     latest_votes_by_option,
     max_votes_allowed,
     name,
+    name_i18n,
     options,
     own_votes,
     updated_at,
@@ -36,6 +38,9 @@ export const mapPollToStorable = (poll: PollResponseData): TableRow<'poll'> => {
     created_by: JSON.stringify(created_by), // stored as JSON to decouple the user from the poll
     created_by_id,
     description,
+    // Always written (as `null` when absent): an upsert skips undefined columns, which would keep
+    // translations the server has since dropped, e.g. after the question was edited.
+    description_i18n: JSON.stringify(description_i18n ?? null),
     enforce_unique_vote,
     id,
     is_closed,
@@ -43,6 +48,7 @@ export const mapPollToStorable = (poll: PollResponseData): TableRow<'poll'> => {
     latest_votes_by_option: JSON.stringify(latest_votes_by_option),
     max_votes_allowed: max_votes_allowed ?? 1,
     name,
+    name_i18n: JSON.stringify(name_i18n ?? null),
     options: JSON.stringify(options),
     own_votes: JSON.stringify(own_votes),
     updated_at: mapTimestampToStorable(updated_at),