From 23809a9f40ff18013e51f6069756ad8419a68f64 Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Wed, 6 May 2026 15:16:29 +0200
Subject: [PATCH 01/17] fix: make sure buttons are properly accessible

---
 .claude/skills/accessibility/SKILL.md         | 14 +++---
 ai-docs/accessibility.md                      |  8 ++++
 package/src/a11y/hooks/useA11yLabel.ts        | 11 +++--
 .../components/AttachmentTypePickerButton.tsx |  9 ++++
 .../__tests__/ImageGalleryFooter.test.tsx     | 12 +++--
 .../__tests__/ImageGalleryHeader.test.tsx     |  5 ++-
 .../components/ImageGalleryFooter.tsx         |  4 +-
 .../components/ImageGalleryHeader.tsx         |  2 +-
 .../components/ImageGalleryVideoControl.tsx   |  2 +-
 .../AudioRecorder/AudioRecorder.tsx           |  3 ++
 .../components/InputButtons/AttachButton.tsx  |  1 +
 .../components/OutputButtons/EditButton.tsx   |  1 +
 .../components/OutputButtons/SendButton.tsx   |  1 +
 .../MessageList/ScrollToBottomButton.tsx      | 12 ++---
 .../UnreadMessagesNotification.tsx            |  1 +
 .../MessageMenu/MessageReactionPicker.tsx     |  1 +
 .../components/MessageMenu/ReactionButton.tsx | 16 +++----
 .../__tests__/MessageReactionPicker.test.tsx  | 28 ++++++------
 .../__tests__/MessageUserReactions.test.tsx   | 37 ++++++++--------
 .../__tests__/ReactionButton.test.tsx         | 23 +++++++---
 .../Poll/components/CreatePollHeader.tsx      |  2 +
 .../Poll/components/MultipleVotesSettings.tsx |  2 +
 .../Poll/components/PollModalHeader.tsx       |  1 +
 package/src/components/ui/Avatar/Avatar.tsx   |  3 +-
 package/src/components/ui/Button/Button.tsx   | 19 ++++++++
 .../ui/Button/__tests__/Button.test.tsx       | 44 +++++++++++++++++++
 package/src/i18n/en.json                      | 25 ++++++++++-
 package/src/i18n/es.json                      | 25 ++++++++++-
 package/src/i18n/fr.json                      | 25 ++++++++++-
 package/src/i18n/he.json                      | 25 ++++++++++-
 package/src/i18n/hi.json                      | 25 ++++++++++-
 package/src/i18n/it.json                      | 25 ++++++++++-
 package/src/i18n/ja.json                      | 25 ++++++++++-
 package/src/i18n/ko.json                      | 25 ++++++++++-
 package/src/i18n/nl.json                      | 25 ++++++++++-
 package/src/i18n/pt-br.json                   | 25 ++++++++++-
 package/src/i18n/ru.json                      | 25 ++++++++++-
 package/src/i18n/tr.json                      | 25 ++++++++++-
 38 files changed, 480 insertions(+), 82 deletions(-)
 create mode 100644 package/src/components/ui/Button/__tests__/Button.test.tsx

diff --git a/.claude/skills/accessibility/SKILL.md b/.claude/skills/accessibility/SKILL.md
index 785ab09e2c..ab32176cce 100644
--- a/.claude/skills/accessibility/SKILL.md
+++ b/.claude/skills/accessibility/SKILL.md
@@ -10,7 +10,7 @@ Use this skill whenever code changes can affect screen-reader users (VoiceOver o
 ## Non-negotiable rules
 
 1. **Native semantics first.** Use `Pressable`, `TextInput`, `Switch`, `Image` directly. Use `accessibilityRole` only when native semantics cannot represent the widget (`menu`, `menuitem`, `progressbar`, `radio`, `checkbox`, `article`, `alert`, `tablist`, `tab`).
-2. **Never hardcode English** in `accessibilityLabel`/`accessibilityHint`/announcement strings. Use `useA11yLabel('a11y/...', params)` (or `t('a11y/...')` directly when you don't need the disabled-state short-circuit). Add the key to all 12 locale files in `package/src/i18n/`.
+2. **Never hardcode English** in `accessibilityLabel`/`accessibilityHint`/announcement strings. For SDK `Button`, pass `accessibilityLabelKey='a11y/...'` (and `accessibilityLabelParams` when needed). For non-Button components, use `useA11yLabel('a11y/...', params)` or `t('a11y/...')` directly when you don't need the disabled-state short-circuit. Add the key to all 12 locale files in `package/src/i18n/`.
 3. **Gate behavior on `useAccessibilityContext().enabled`.** A11y is opt-in. New listeners, subscriptions, and announcer mounts must be no-ops when `enabled` is false. New `accessibilityRole`/`accessibilityState` props are fine to render unconditionally — they cost ~zero.
 4. **One focusable target per action.** Don't nest `Pressable` inside `Pressable`. Mark inner decorative views with `accessibilityElementsHidden` (iOS) + `importantForAccessibility='no-hide-descendants'` (Android) so the parent carries the label.
 5. **Decorative visuals stay hidden from AT.** Icon-only buttons must carry an `accessibilityLabel` on the wrapper, and the SVG icon should be hidden.
@@ -31,13 +31,17 @@ Use this skill whenever code changes can affect screen-reader users (VoiceOver o
 ### 1) Composing accessible names
 
 ```tsx
-import { useA11yLabel } from 'stream-chat-react-native';
+import { Button, useA11yLabel } from 'stream-chat-react-native';
 
-const label = useA11yLabel('a11y/Reaction {{emoji}} by {{count}} users', { emoji, count });
+const labelParams = useMemo(() => ({ count, emoji }), [count, emoji]);
+const label = useA11yLabel('a11y/Reaction {{emoji}} by {{count}} users', labelParams);
 <Pressable accessibilityLabel={label} accessibilityRole='button' accessibilityState={{ selected }} />
+
+<Button accessibilityLabelKey='a11y/Send message' iconOnly {...buttonProps} />
 ```
 
 `useA11yLabel` returns `undefined` when `accessibility.enabled` is false, so the `t()` call is skipped on hot list paths.
+`Button` centralizes this same behavior for SDK-owned buttons. In SDK code, pass the key/params only. When migrating a released button that already had an `accessibilityLabel`, make the new translation resolve to the same existing label unless the change is intentionally breaking.
 
 For composite labels (sender + timestamp + body + reactions summary), use `composeAccessibilityLabel(...parts)` from `package/src/a11y/a11yUtils.ts` — it filters out empty/null parts and joins with `, ` so screen readers add a brief pause.
 
@@ -95,7 +99,7 @@ Disable spring animations and limit fade durations when this is true.
 
 ## Anti-patterns to avoid
 
-- **Hardcoded English `accessibilityLabel`** strings inside component code. Always use `useA11yLabel('a11y/...')` or `t('a11y/...')`.
+- **Hardcoded English `accessibilityLabel`** strings inside component code. For SDK `Button`, use `accessibilityLabelKey='a11y/...'`; otherwise use `useA11yLabel('a11y/...')` or `t('a11y/...')`.
 - **Nested focusables**: `<Pressable><Pressable>` causes VO to stop on each. Mark the outer `accessible={false}` or the inner `accessibilityElementsHidden`.
 - **Subscribing to `AccessibilityInfo` events when `enabled` is false** — wastes a listener slot. The provided hooks already gate on this; mirror that pattern.
 - **`useScreenReaderEnabled()` inside list items** — toggling SR re-renders every item. Only subscribe in components that actually swap UI on SR (`AudioRecorder`, `ImageGallery`, `Message`'s alternative-actions button).
@@ -116,7 +120,7 @@ Recommended for non-trivial changes:
 
 - [ ] Identified the interaction type (button / menuitem / dialog / progressbar / radio / checkbox / live region / image)
 - [ ] Picked a native element first; ARIA-style `accessibilityRole` only when necessary
-- [ ] Composed `accessibilityLabel` via `useA11yLabel('a11y/...')` (not hardcoded)
+- [ ] Composed the accessible name via `Button accessibilityLabelKey='a11y/...'` or `useA11yLabel('a11y/...')` (not hardcoded)
 - [ ] Added the new `a11y/*` key to all 12 locale JSONs and ran `yarn build-translations`
 - [ ] Set `accessibilityState` for stateful widgets (`disabled`, `selected`, `checked`, `busy`, `expanded`)
 - [ ] Decorative visuals hidden from AT (`accessibilityElementsHidden` / `importantForAccessibility='no-hide-descendants'`)
diff --git a/ai-docs/accessibility.md b/ai-docs/accessibility.md
index 2d22e92a7a..d4db899d2a 100644
--- a/ai-docs/accessibility.md
+++ b/ai-docs/accessibility.md
@@ -67,6 +67,14 @@ i18n.registerTranslation('nl', {
 
 `validate-translations` (run as part of `yarn lint`) enforces non-empty values for every `a11y/*` key in every locale.
 
+SDK-owned `Button` components can translate their own accessible names from an i18n key:
+
+```tsx
+<Button accessibilityLabelKey='a11y/Send message' iconOnly {...buttonProps} />
+```
+
+Use `accessibilityLabelParams` for interpolated labels. SDK-owned buttons should pass the key/params only. When migrating an already-released button, keep the translation value aligned with the existing label unless the label change is intentionally breaking.
+
 ## Public hooks and components
 
 Importable from `stream-chat-react-native`:
diff --git a/package/src/a11y/hooks/useA11yLabel.ts b/package/src/a11y/hooks/useA11yLabel.ts
index a27675b864..a3f1d13ec9 100644
--- a/package/src/a11y/hooks/useA11yLabel.ts
+++ b/package/src/a11y/hooks/useA11yLabel.ts
@@ -1,5 +1,7 @@
+import { useContext } from 'react';
+
 import { useAccessibilityContext } from '../../contexts/accessibilityContext/AccessibilityContext';
-import { useTranslationContext } from '../../contexts/translationContext/TranslationContext';
+import { TranslationContext } from '../../contexts/translationContext/TranslationContext';
 
 /**
  * Returns the translated `a11y/...` label when the AccessibilityContext is enabled,
@@ -8,12 +10,13 @@ import { useTranslationContext } from '../../contexts/translationContext/Transla
  * default disabled-state.
  *
  * Example:
- *   const label = useA11yLabel('a11y/Avatar of {{name}}', { name });
+ *   const labelParams = useMemo(() => ({ name }), [name]);
+ *   const label = useA11yLabel('a11y/Avatar of {{name}}', labelParams);
  *   <Image accessibilityLabel={label} />
  */
 export const useA11yLabel = (key: string, params?: Record<string, unknown>): string | undefined => {
   const { enabled } = useAccessibilityContext();
-  const { t } = useTranslationContext();
-  if (!enabled) return undefined;
+  const { t } = useContext(TranslationContext);
+  if (!enabled || !key) return undefined;
   return t(key, params);
 };
diff --git a/package/src/components/AttachmentPicker/components/AttachmentTypePickerButton.tsx b/package/src/components/AttachmentPicker/components/AttachmentTypePickerButton.tsx
index a1f061bc7b..bf2ff59a76 100644
--- a/package/src/components/AttachmentPicker/components/AttachmentTypePickerButton.tsx
+++ b/package/src/components/AttachmentPicker/components/AttachmentTypePickerButton.tsx
@@ -28,12 +28,14 @@ import { Button, ButtonProps } from '../../ui';
 import { BottomSheetModal } from '../../UIComponents';
 
 export type AttachmentTypePickerButtonProps = Pick<ButtonProps, 'selected' | 'onPress'> & {
+  accessibilityLabelKey?: string;
   Icon: ButtonProps['LeadingIcon'];
 } & Pick<PressableProps, 'testID'>;
 
 const hitSlop = { bottom: 15, top: 15 };
 
 export const AttachmentTypePickerButton = ({
+  accessibilityLabelKey,
   testID,
   selected,
   onPress: onPressProp,
@@ -52,6 +54,7 @@ export const AttachmentTypePickerButton = ({
 
   return (
     <Button
+      accessibilityLabelKey={accessibilityLabelKey}
       testID={testID}
       hitSlop={hitSlop}
       onPress={onPress}
@@ -80,6 +83,7 @@ export const MediaPickerButton = () => {
 
   return hasImagePicker ? (
     <AttachmentTypePickerButton
+      accessibilityLabelKey='a11y/Open photo picker'
       testID='upload-photo-touchable'
       Icon={Picture}
       selected={selectedPicker === 'images'}
@@ -113,6 +117,7 @@ export const CameraPickerButton = () => {
   return hasCameraPicker ? (
     <>
       <AttachmentTypePickerButton
+        accessibilityLabelKey='a11y/Open camera'
         testID='take-photo-touchable'
         Icon={Camera}
         selected={selectedPicker === 'camera-photo'}
@@ -120,6 +125,7 @@ export const CameraPickerButton = () => {
       />
       {Platform.OS === 'android' ? (
         <AttachmentTypePickerButton
+          accessibilityLabelKey='a11y/Open video recorder'
           Icon={VideoIcon}
           selected={selectedPicker === 'camera-video'}
           onPress={onVideoRecorderPickerPress}
@@ -144,6 +150,7 @@ export const FilePickerButton = () => {
 
   return hasFilePicker ? (
     <AttachmentTypePickerButton
+      accessibilityLabelKey='a11y/Open file picker'
       testID='upload-file-touchable'
       Icon={FilePickerIcon}
       selected={selectedPicker === 'files'}
@@ -171,6 +178,7 @@ export const PollPickerButton = () => {
 
   return !threadList && hasCreatePoll && ownCapabilities.sendPoll ? ( // do not allow poll creation in threads
     <AttachmentTypePickerButton
+      accessibilityLabelKey='a11y/Open poll creation'
       testID='create-poll-touchable'
       Icon={PollThumbnail}
       selected={selectedPicker === 'polls'}
@@ -198,6 +206,7 @@ export const CommandsPickerButton = () => {
   return hasCommands ? (
     <>
       <AttachmentTypePickerButton
+        accessibilityLabelKey='a11y/Open commands'
         testID='commands-touchable'
         Icon={CommandsIcon}
         selected={selectedPicker === 'commands'}
diff --git a/package/src/components/ImageGallery/__tests__/ImageGalleryFooter.test.tsx b/package/src/components/ImageGallery/__tests__/ImageGalleryFooter.test.tsx
index db8aa4d513..aba07889ed 100644
--- a/package/src/components/ImageGallery/__tests__/ImageGalleryFooter.test.tsx
+++ b/package/src/components/ImageGallery/__tests__/ImageGalleryFooter.test.tsx
@@ -59,7 +59,10 @@ const ImageGalleryComponentVideo = (props: ImageGalleryProps) => {
   });
 
   return (
-    <OverlayProvider value={{ overlayOpacity: { value: 1 } as SharedValue<number> }}>
+    <OverlayProvider
+      accessibility={{ enabled: true }}
+      value={{ overlayOpacity: { value: 1 } as SharedValue<number> }}
+    >
       {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
       <WithComponents overrides={{ ImageGalleryHeader: undefined as any }}>
         <ImageGalleryContext.Provider
@@ -101,7 +104,10 @@ const ImageGalleryComponentImage = (
   });
 
   return (
-    <OverlayProvider value={{ overlayOpacity: { value: 1 } as SharedValue<number> }}>
+    <OverlayProvider
+      accessibility={{ enabled: true }}
+      value={{ overlayOpacity: { value: 1 } as SharedValue<number> }}
+    >
       {/* eslint-disable-next-line @typescript-eslint/no-explicit-any */}
       <WithComponents overrides={{ ImageGalleryHeader: undefined as any }}>
         <ImageGalleryContext.Provider
@@ -129,7 +135,7 @@ describe('ImageGalleryFooter', () => {
     });
   });
 
-  it('render image gallery footer component with Share Button and Grid Icon', async () => {
+  it('render image gallery footer component with share and grid buttons', async () => {
     render(<ImageGalleryComponentVideo />);
 
     await waitFor(() => {
diff --git a/package/src/components/ImageGallery/__tests__/ImageGalleryHeader.test.tsx b/package/src/components/ImageGallery/__tests__/ImageGalleryHeader.test.tsx
index d3ae35bd5f..794675041c 100644
--- a/package/src/components/ImageGallery/__tests__/ImageGalleryHeader.test.tsx
+++ b/package/src/components/ImageGallery/__tests__/ImageGalleryHeader.test.tsx
@@ -47,7 +47,10 @@ const ImageGalleryComponent = (props: ImageGalleryProps) => {
   }, [imageGalleryStateStore]);
 
   return (
-    <OverlayProvider value={{ overlayOpacity: { value: 1 } as SharedValue<number> }}>
+    <OverlayProvider
+      accessibility={{ enabled: true }}
+      value={{ overlayOpacity: { value: 1 } as SharedValue<number> }}
+    >
       <ImageGalleryContext.Provider
         value={
           {
diff --git a/package/src/components/ImageGallery/components/ImageGalleryFooter.tsx b/package/src/components/ImageGallery/components/ImageGalleryFooter.tsx
index 51bd40c1c6..bbd37cf0e8 100644
--- a/package/src/components/ImageGallery/components/ImageGalleryFooter.tsx
+++ b/package/src/components/ImageGallery/components/ImageGalleryFooter.tsx
@@ -134,7 +134,7 @@ export const ImageGalleryFooterWithContext = (props: ImageGalleryFooterProps) =>
             </Text>
           </View>
           <Button
-            accessibilityLabel='Grid Icon'
+            accessibilityLabelKey='a11y/Grid Icon'
             variant='secondary'
             type='ghost'
             size='md'
@@ -166,7 +166,7 @@ const ShareButton = ({ share, savingInProgress }: ShareButtonProps) => {
     </View>
   ) : (
     <Button
-      accessibilityLabel='Share Button'
+      accessibilityLabelKey='a11y/Share Button'
       variant='secondary'
       type='ghost'
       size='md'
diff --git a/package/src/components/ImageGallery/components/ImageGalleryHeader.tsx b/package/src/components/ImageGallery/components/ImageGalleryHeader.tsx
index 61421c363b..1778c71750 100644
--- a/package/src/components/ImageGallery/components/ImageGalleryHeader.tsx
+++ b/package/src/components/ImageGallery/components/ImageGalleryHeader.tsx
@@ -74,7 +74,7 @@ export const ImageGalleryHeader = (props: ImageGalleryHeaderProps) => {
       <ReanimatedSafeAreaView edges={['top']} style={[styles.container, headerStyle]}>
         <View style={styles.innerContainer}>
           <Button
-            accessibilityLabel='Hide Overlay'
+            accessibilityLabelKey='a11y/Hide Overlay'
             variant='secondary'
             type='ghost'
             size='md'
diff --git a/package/src/components/ImageGallery/components/ImageGalleryVideoControl.tsx b/package/src/components/ImageGallery/components/ImageGalleryVideoControl.tsx
index 9235e23ed4..5baecdb103 100644
--- a/package/src/components/ImageGallery/components/ImageGalleryVideoControl.tsx
+++ b/package/src/components/ImageGallery/components/ImageGalleryVideoControl.tsx
@@ -74,7 +74,7 @@ export const ImageGalleryVideoControl = React.memo((props: ImageGalleryVideoCont
     <View style={[styles.container, container]}>
       <View style={styles.leftContainer}>
         <Button
-          accessibilityLabel='Play Pause Button'
+          accessibilityLabelKey='a11y/Play Pause Button'
           variant='secondary'
           type='ghost'
           size='md'
diff --git a/package/src/components/MessageInput/components/AudioRecorder/AudioRecorder.tsx b/package/src/components/MessageInput/components/AudioRecorder/AudioRecorder.tsx
index 129ae321da..9c4ee6b996 100644
--- a/package/src/components/MessageInput/components/AudioRecorder/AudioRecorder.tsx
+++ b/package/src/components/MessageInput/components/AudioRecorder/AudioRecorder.tsx
@@ -59,6 +59,7 @@ const StopRecording = ({
 
   return (
     <Button
+      accessibilityLabelKey='a11y/Stop voice recording'
       variant='destructive'
       type='outline'
       size='sm'
@@ -83,6 +84,7 @@ const UploadRecording = ({
 
   return (
     <Button
+      accessibilityLabelKey='a11y/Send voice recording'
       variant='primary'
       type='solid'
       onPress={onUploadVoiceRecording}
@@ -104,6 +106,7 @@ const DeleteRecording = ({
   };
   return (
     <Button
+      accessibilityLabelKey='a11y/Delete voice recording'
       variant='secondary'
       type='outline'
       size='sm'
diff --git a/package/src/components/MessageInput/components/InputButtons/AttachButton.tsx b/package/src/components/MessageInput/components/InputButtons/AttachButton.tsx
index 1466b2db6a..087876ee98 100644
--- a/package/src/components/MessageInput/components/InputButtons/AttachButton.tsx
+++ b/package/src/components/MessageInput/components/InputButtons/AttachButton.tsx
@@ -45,6 +45,7 @@ const AttachButtonWithContext = (props: AttachButtonPropsWithContext) => {
 
   return (
     <Button
+      accessibilityLabelKey='a11y/Add attachment'
       variant='secondary'
       type='outline'
       size='lg'
diff --git a/package/src/components/MessageInput/components/OutputButtons/EditButton.tsx b/package/src/components/MessageInput/components/OutputButtons/EditButton.tsx
index 44a0d4be90..fcded0bacd 100644
--- a/package/src/components/MessageInput/components/OutputButtons/EditButton.tsx
+++ b/package/src/components/MessageInput/components/OutputButtons/EditButton.tsx
@@ -26,6 +26,7 @@ export const EditButton = (props: EditButtonProps) => {
 
   return (
     <Button
+      accessibilityLabelKey='a11y/Save edited message'
       variant='primary'
       type='solid'
       LeadingIcon={Tick}
diff --git a/package/src/components/MessageInput/components/OutputButtons/SendButton.tsx b/package/src/components/MessageInput/components/OutputButtons/SendButton.tsx
index 38a1bc8403..968191bbe2 100644
--- a/package/src/components/MessageInput/components/OutputButtons/SendButton.tsx
+++ b/package/src/components/MessageInput/components/OutputButtons/SendButton.tsx
@@ -26,6 +26,7 @@ export const SendButton = (props: SendButtonProps) => {
 
   return (
     <Button
+      accessibilityLabelKey='a11y/Send message'
       variant='primary'
       type='solid'
       disabled={disabled}
diff --git a/package/src/components/MessageList/ScrollToBottomButton.tsx b/package/src/components/MessageList/ScrollToBottomButton.tsx
index 6e2cb8dc28..3ec4292a11 100644
--- a/package/src/components/MessageList/ScrollToBottomButton.tsx
+++ b/package/src/components/MessageList/ScrollToBottomButton.tsx
@@ -3,7 +3,6 @@ import React from 'react';
 import { StyleSheet, View } from 'react-native';
 import Animated, { ZoomIn, ZoomOut } from 'react-native-reanimated';
 
-import { useA11yLabel } from '../../a11y/hooks/useA11yLabel';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { Down } from '../../icons/arrow-up';
 import { primitives } from '../../theme';
@@ -23,9 +22,9 @@ export const ScrollToBottomButton = (props: ScrollToBottomButtonProps) => {
   const {
     theme: { semantics },
   } = useTheme();
-  const a11yLabel = useA11yLabel(
-    unreadCount ? 'a11y/Scroll to latest, {{count}} unread' : 'a11y/Scroll to latest',
-    { count: unreadCount ?? 0 },
+  const accessibilityLabelParams = React.useMemo(
+    () => (unreadCount ? { count: unreadCount } : undefined),
+    [unreadCount],
   );
 
   if (!showNotification) {
@@ -47,7 +46,10 @@ export const ScrollToBottomButton = (props: ScrollToBottomButtonProps) => {
         ]}
       >
         <Button
-          accessibilityLabel={a11yLabel}
+          accessibilityLabelKey={
+            unreadCount ? 'a11y/Scroll to latest, {{count}} unread' : 'a11y/Scroll to latest'
+          }
+          accessibilityLabelParams={accessibilityLabelParams}
           variant='secondary'
           type='outline'
           LeadingIcon={Down}
diff --git a/package/src/components/MessageList/UnreadMessagesNotification.tsx b/package/src/components/MessageList/UnreadMessagesNotification.tsx
index 118334e785..a43555f71c 100644
--- a/package/src/components/MessageList/UnreadMessagesNotification.tsx
+++ b/package/src/components/MessageList/UnreadMessagesNotification.tsx
@@ -84,6 +84,7 @@ export const UnreadMessagesNotification = (props: UnreadMessagesNotificationProp
       </View>
       <View style={styles.rightButtonContainer}>
         <Button
+          accessibilityLabelKey='a11y/Dismiss unread messages'
           variant='secondary'
           type='ghost'
           iconOnly
diff --git a/package/src/components/MessageMenu/MessageReactionPicker.tsx b/package/src/components/MessageMenu/MessageReactionPicker.tsx
index 02a950209b..bfdc318d1b 100644
--- a/package/src/components/MessageMenu/MessageReactionPicker.tsx
+++ b/package/src/components/MessageMenu/MessageReactionPicker.tsx
@@ -115,6 +115,7 @@ export const EmojiViewerButton = ({
     <>
       <View style={[styles.emojiViewerButton, emojiViewerButton]}>
         <Button
+          accessibilityLabelKey='a11y/Open more reactions'
           variant='secondary'
           type='outline'
           size='sm'
diff --git a/package/src/components/MessageMenu/ReactionButton.tsx b/package/src/components/MessageMenu/ReactionButton.tsx
index 4e8a8d650e..f5ed0f82b2 100644
--- a/package/src/components/MessageMenu/ReactionButton.tsx
+++ b/package/src/components/MessageMenu/ReactionButton.tsx
@@ -1,7 +1,6 @@
 import React, { useCallback, useMemo } from 'react';
 import { StyleSheet, View } from 'react-native';
 
-import { useA11yLabel } from '../../a11y/hooks/useA11yLabel';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { IconProps } from '../../icons';
 import { Button, ButtonProps } from '../ui';
@@ -50,18 +49,17 @@ export const ReactionButton = (props: ReactionButtonProps) => {
     () => <Icon size={reactionIconSize ?? 24} />,
     [Icon, reactionIconSize],
   );
-
-  const a11yLabel = useA11yLabel('a11y/Reaction {{emoji}} by {{count}} users', {
-    count: count ?? '0',
-    emoji: type,
-  });
+  const selectedLabelState = selected ? 'selected' : 'unselected';
+  const accessibilityLabelParams = useMemo(
+    () => ({ selected: selectedLabelState, type }),
+    [selectedLabelState, type],
+  );
 
   return (
     <View style={styles.reactionButton}>
       <Button
-        accessibilityLabel={
-          a11yLabel ?? `reaction-button-${type}-${selected ? 'selected' : 'unselected'}`
-        }
+        accessibilityLabelKey='a11y/reaction-button-{{type}}-{{selected}}'
+        accessibilityLabelParams={accessibilityLabelParams}
         variant={'secondary'}
         type={'outline'}
         iconOnly={!count}
diff --git a/package/src/components/MessageMenu/__tests__/MessageReactionPicker.test.tsx b/package/src/components/MessageMenu/__tests__/MessageReactionPicker.test.tsx
index f694466531..14d7f5b148 100644
--- a/package/src/components/MessageMenu/__tests__/MessageReactionPicker.test.tsx
+++ b/package/src/components/MessageMenu/__tests__/MessageReactionPicker.test.tsx
@@ -80,12 +80,10 @@ describe('MessageReactionPicker', () => {
   });
 
   it('renders correctly with supported reactions', async () => {
-    const { getAllByLabelText, getByLabelText } = renderComponent();
+    const { getAllByRole, getByLabelText } = renderComponent();
     await waitFor(() => {
       expect(getByLabelText('Reaction Selector on long pressing message')).toBeTruthy();
-      expect(getAllByLabelText(/\breaction-button[^\s]+/)).toHaveLength(
-        mockSupportedReactions.length,
-      );
+      expect(getAllByRole('button')).toHaveLength(mockSupportedReactions.length + 1);
     });
   });
 
@@ -95,20 +93,20 @@ describe('MessageReactionPicker', () => {
   });
 
   it('marks own reactions as selected', async () => {
-    const { getAllByLabelText } = renderComponent();
+    const { getAllByRole } = renderComponent();
 
     await waitFor(() => {
-      const reactionButtons = getAllByLabelText(/\breaction-button[^\s]+/);
-      expect(reactionButtons[0].props.accessibilityLabel).toBe('reaction-button-like-selected');
-      expect(reactionButtons[1].props.accessibilityLabel).toBe('reaction-button-love-unselected');
+      const reactionButtons = getAllByRole('button');
+      expect(reactionButtons[0].props.accessibilityState.selected).toBe(true);
+      expect(reactionButtons[1].props.accessibilityState.selected).toBe(false);
     });
   });
 
   it('calls handleReaction and dismissOverlay when a reaction is pressed', async () => {
-    const { getAllByLabelText } = renderComponent();
+    const { getAllByRole } = renderComponent();
 
     await waitFor(() => {
-      const reactionButtons = getAllByLabelText(/\breaction-button[^\s]+/);
+      const reactionButtons = getAllByRole('button');
       fireEvent.press(reactionButtons[1]);
       expect(defaultProps.handleReaction).toHaveBeenCalledWith('love');
       expect(defaultProps.dismissOverlay).toHaveBeenCalled();
@@ -117,9 +115,9 @@ describe('MessageReactionPicker', () => {
   });
 
   it("doesn't call handleReaction when it's not provided", async () => {
-    const { getAllByLabelText } = renderComponent({ handleReaction: undefined });
+    const { getAllByRole } = renderComponent({ handleReaction: undefined });
     await waitFor(() => {
-      const reactionButtons = getAllByLabelText(/\breaction-button[^\s]+/);
+      const reactionButtons = getAllByRole('button');
 
       fireEvent.press(reactionButtons[1]);
 
@@ -132,11 +130,11 @@ describe('MessageReactionPicker', () => {
       { Icon: () => null, isMain: true, type: 'wow' },
       { Icon: () => null, isMain: true, type: 'haha' },
     ];
-    const { getAllByLabelText } = renderComponent({ supportedReactions: customSupportedReactions });
+    const { getAllByRole } = renderComponent({ supportedReactions: customSupportedReactions });
 
     await waitFor(() => {
-      const reactionButtons = getAllByLabelText(/\breaction-button[^\s]+/);
-      expect(reactionButtons).toHaveLength(customSupportedReactions.length);
+      const reactionButtons = getAllByRole('button');
+      expect(reactionButtons).toHaveLength(customSupportedReactions.length + 1);
     });
   });
 });
diff --git a/package/src/components/MessageMenu/__tests__/MessageUserReactions.test.tsx b/package/src/components/MessageMenu/__tests__/MessageUserReactions.test.tsx
index aaf535d2e1..58ffecc253 100644
--- a/package/src/components/MessageMenu/__tests__/MessageUserReactions.test.tsx
+++ b/package/src/components/MessageMenu/__tests__/MessageUserReactions.test.tsx
@@ -5,6 +5,7 @@ import { Text } from 'react-native';
 import { fireEvent, render } from '@testing-library/react-native';
 
 import { ReactionResponse } from 'stream-chat';
+import type { ReactTestInstance } from 'react-test-renderer';
 
 import { WithComponents } from '../../../contexts/componentsContext/ComponentsContext';
 import {
@@ -39,6 +40,9 @@ const defaultProps = {
   supportedReactions: mockSupportedReactions,
 };
 
+const filterReactionButtons = (buttons: ReactTestInstance[]) =>
+  buttons.filter((button) => button.props.accessibilityLabel !== 'more-reactions-button');
+
 const renderComponent = (props = {}) =>
   render(
     <ThemeProvider theme={defaultTheme}>
@@ -87,35 +91,32 @@ describe('MessageUserReactions when the supportedReactions are defined', () => {
   });
 
   it('renders reaction buttons', () => {
-    const { getByLabelText } = renderComponent();
-    const likeReactionButton = getByLabelText('reaction-button-like-unselected');
-    expect(likeReactionButton).toBeDefined();
-    const loveReactionButton = getByLabelText('reaction-button-love-unselected');
-    expect(loveReactionButton).toBeDefined();
+    const { getAllByRole } = renderComponent();
+    expect(filterReactionButtons(getAllByRole('button'))).toHaveLength(2);
   });
 
   it('starts with no reaction filter selected by default', () => {
-    const { getAllByLabelText } = renderComponent();
-    const reactionButtons = getAllByLabelText(/\breaction-button[^\s]+/);
-    expect(reactionButtons[0].props.accessibilityLabel).toBe('reaction-button-like-unselected');
-    expect(reactionButtons[1].props.accessibilityLabel).toBe('reaction-button-love-unselected');
+    const { getAllByRole } = renderComponent();
+    const reactionButtons = filterReactionButtons(getAllByRole('button'));
+    expect(reactionButtons[0].props.accessibilityState.selected).toBe(false);
+    expect(reactionButtons[1].props.accessibilityState.selected).toBe(false);
   });
 
   it('toggles the selected reaction when a reaction button is pressed twice', () => {
-    const { getAllByLabelText } = renderComponent();
-    let reactionButtons = getAllByLabelText(/\breaction-button[^\s]+/);
+    const { getAllByRole } = renderComponent();
+    let reactionButtons = filterReactionButtons(getAllByRole('button'));
 
     fireEvent.press(reactionButtons[1]);
 
-    expect(reactionButtons[0].props.accessibilityLabel).toBe('reaction-button-like-unselected');
-    expect(reactionButtons[1].props.accessibilityLabel).toBe('reaction-button-love-selected');
+    expect(reactionButtons[0].props.accessibilityState.selected).toBe(false);
+    expect(reactionButtons[1].props.accessibilityState.selected).toBe(true);
 
     fireEvent.press(reactionButtons[1]);
 
-    reactionButtons = getAllByLabelText(/\breaction-button[^\s]+/);
+    reactionButtons = filterReactionButtons(getAllByRole('button'));
 
-    expect(reactionButtons[0].props.accessibilityLabel).toBe('reaction-button-like-unselected');
-    expect(reactionButtons[1].props.accessibilityLabel).toBe('reaction-button-love-unselected');
+    expect(reactionButtons[0].props.accessibilityState.selected).toBe(false);
+    expect(reactionButtons[1].props.accessibilityState.selected).toBe(false);
   });
 
   it('renders reactions list', () => {
@@ -133,10 +134,10 @@ describe('MessageUserReactions when the supportedReactions are defined', () => {
   });
 
   it("don't render reaction buttons that is of unsupported type", () => {
-    const { queryAllByLabelText } = renderComponent({
+    const { queryAllByRole } = renderComponent({
       message: { ...generateMessage(), reaction_groups: { money: 1 } },
     });
-    const reactionButtons = queryAllByLabelText(/\breaction-button[^\s]+/);
+    const reactionButtons = filterReactionButtons(queryAllByRole('button'));
 
     expect(reactionButtons.length).toBe(0);
   });
diff --git a/package/src/components/MessageMenu/__tests__/ReactionButton.test.tsx b/package/src/components/MessageMenu/__tests__/ReactionButton.test.tsx
index 45bf1a2411..89bd67ed01 100644
--- a/package/src/components/MessageMenu/__tests__/ReactionButton.test.tsx
+++ b/package/src/components/MessageMenu/__tests__/ReactionButton.test.tsx
@@ -2,8 +2,9 @@ import React from 'react';
 
 import { Text } from 'react-native';
 
-import { cleanup, fireEvent, render } from '@testing-library/react-native';
+import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react-native';
 
+import { OverlayProvider } from '../../../contexts/overlayContext/OverlayProvider';
 import { ThemeProvider } from '../../../contexts/themeContext/ThemeContext';
 import { defaultTheme } from '../../../contexts/themeContext/utils/theme';
 import { IconProps } from '../../../icons';
@@ -37,28 +38,40 @@ describe('ReactionButton', () => {
     expect(getByText('24')).toBeTruthy();
   });
 
+  it('uses the released reaction button label when accessibility labels are translated', async () => {
+    render(
+      <OverlayProvider accessibility={{ enabled: true }}>
+        <ReactionButton {...defaultProps} />
+      </OverlayProvider>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getByLabelText('reaction-button-like-unselected')).toBeTruthy();
+    });
+  });
+
   it('should call onPress function with the correct reaction type when pressed', () => {
-    const { getByLabelText } = render(
+    const { getByRole } = render(
       <ThemeProvider theme={defaultTheme}>
         <ReactionButton {...defaultProps} />
       </ThemeProvider>,
     );
 
     // Simulate a press event
-    fireEvent.press(getByLabelText('reaction-button-like-unselected'));
+    fireEvent.press(getByRole('button'));
 
     // Verify if the mock function has been called with the correct reaction type
     expect(mockOnPress).toHaveBeenCalledWith('like');
   });
 
   it('should not call onPress when the onPress prop is not provided', () => {
-    const { getByLabelText } = render(
+    const { getByRole } = render(
       <ThemeProvider theme={defaultTheme}>
         <ReactionButton {...defaultProps} onPress={undefined} />
       </ThemeProvider>,
     );
 
-    fireEvent.press(getByLabelText('reaction-button-like-unselected'));
+    fireEvent.press(getByRole('button'));
 
     expect(mockOnPress).not.toHaveBeenCalled();
   });
diff --git a/package/src/components/Poll/components/CreatePollHeader.tsx b/package/src/components/Poll/components/CreatePollHeader.tsx
index 36d334ee2a..2877ad668f 100644
--- a/package/src/components/Poll/components/CreatePollHeader.tsx
+++ b/package/src/components/Poll/components/CreatePollHeader.tsx
@@ -51,6 +51,7 @@ export const CreatePollHeader = ({
   return (
     <View style={[styles.headerContainer, headerContainer]}>
       <Button
+        accessibilityLabelKey='a11y/Close poll creation'
         variant='secondary'
         onPress={onBackPressHandler}
         type='solid'
@@ -63,6 +64,7 @@ export const CreatePollHeader = ({
       </Text>
 
       <Button
+        accessibilityLabelKey='a11y/Create poll'
         variant='primary'
         onPress={onCreatePollPressHandler}
         type='solid'
diff --git a/package/src/components/Poll/components/MultipleVotesSettings.tsx b/package/src/components/Poll/components/MultipleVotesSettings.tsx
index 14275f7735..f6eb10cab5 100644
--- a/package/src/components/Poll/components/MultipleVotesSettings.tsx
+++ b/package/src/components/Poll/components/MultipleVotesSettings.tsx
@@ -163,6 +163,7 @@ export const MultipleVotesSettings = () => {
           style={[styles.row, multipleAnswers.row]}
         >
           <Button
+            accessibilityLabelKey='a11y/Decrease maximum votes'
             variant='secondary'
             type='outline'
             size='md'
@@ -175,6 +176,7 @@ export const MultipleVotesSettings = () => {
           />
           <MaxVotesTextInput />
           <Button
+            accessibilityLabelKey='a11y/Increase maximum votes'
             variant='secondary'
             type='outline'
             size='md'
diff --git a/package/src/components/Poll/components/PollModalHeader.tsx b/package/src/components/Poll/components/PollModalHeader.tsx
index b1470a06ac..85a07b78ec 100644
--- a/package/src/components/Poll/components/PollModalHeader.tsx
+++ b/package/src/components/Poll/components/PollModalHeader.tsx
@@ -25,6 +25,7 @@ export const PollModalHeader = ({ onPress, title }: PollModalHeaderProps) => {
     <View style={[styles.container, container]}>
       <View style={styles.sideContainer}>
         <Button
+          accessibilityLabelKey='a11y/Close poll'
           variant='secondary'
           type='solid'
           size='md'
diff --git a/package/src/components/ui/Avatar/Avatar.tsx b/package/src/components/ui/Avatar/Avatar.tsx
index 7d403e88e7..d5a64d0522 100644
--- a/package/src/components/ui/Avatar/Avatar.tsx
+++ b/package/src/components/ui/Avatar/Avatar.tsx
@@ -46,7 +46,8 @@ export const Avatar = (props: AvatarProps) => {
     style,
   } = props;
   const styles = useStyles();
-  const composedLabel = useA11yLabel('a11y/Avatar of {{name}}', { name: name ?? '' });
+  const accessibilityLabelParams = useMemo(() => ({ name: name ?? '' }), [name]);
+  const composedLabel = useA11yLabel('a11y/Avatar of {{name}}', accessibilityLabelParams);
   const accessibilityLabel = accessibilityLabelOverride ?? (name ? composedLabel : undefined);
 
   const onHandleError = useCallback(() => {
diff --git a/package/src/components/ui/Button/Button.tsx b/package/src/components/ui/Button/Button.tsx
index fc63425917..e381b41049 100644
--- a/package/src/components/ui/Button/Button.tsx
+++ b/package/src/components/ui/Button/Button.tsx
@@ -6,6 +6,7 @@ import { Pressable, PressableProps } from 'react-native-gesture-handler';
 import { buttonPadding, buttonSizes } from './constants';
 import { useButtonStyles } from './hooks/useButtonStyles';
 
+import { useA11yLabel } from '../../../a11y/hooks/useA11yLabel';
 import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 import { IconProps } from '../../../icons/utils/base';
 import { primitives } from '../../../theme';
@@ -34,6 +35,15 @@ const getButtonAccessibilityState = ({
 };
 
 export type ButtonProps = PressableProps & {
+  /**
+   * Translation key used for the button's accessibility label when SDK
+   * accessibility is enabled. Prefer this for SDK-owned icon-only buttons.
+   */
+  accessibilityLabelKey?: string;
+  /**
+   * Optional interpolation params for `accessibilityLabelKey`.
+   */
+  accessibilityLabelParams?: Record<string, unknown>;
   /**
    * The style of the button.
    */
@@ -74,6 +84,9 @@ export type ButtonProps = PressableProps & {
 };
 
 export const Button = ({
+  accessibilityLabel,
+  accessibilityLabelKey,
+  accessibilityLabelParams,
   variant,
   type,
   selected = false,
@@ -100,6 +113,11 @@ export const Button = ({
   const IconOnlyIcon = LeadingIcon ?? TrailingIcon;
   const PrimaryIcon = iconOnly ? IconOnlyIcon : LeftIcon;
   const accessibilityState = getButtonAccessibilityState({ disabled: !!disabled, selected });
+  const translatedAccessibilityLabel = useA11yLabel(
+    accessibilityLabelKey ?? '',
+    accessibilityLabelParams,
+  );
+  const resolvedAccessibilityLabel = translatedAccessibilityLabel ?? accessibilityLabel;
 
   return (
     <View
@@ -119,6 +137,7 @@ export const Button = ({
       onLayout={onLayout}
     >
       <Pressable
+        accessibilityLabel={resolvedAccessibilityLabel}
         accessibilityRole='button'
         accessibilityState={accessibilityState}
         style={({ pressed }) => [
diff --git a/package/src/components/ui/Button/__tests__/Button.test.tsx b/package/src/components/ui/Button/__tests__/Button.test.tsx
new file mode 100644
index 0000000000..d77390bb71
--- /dev/null
+++ b/package/src/components/ui/Button/__tests__/Button.test.tsx
@@ -0,0 +1,44 @@
+import React from 'react';
+
+import { render, screen, waitFor } from '@testing-library/react-native';
+
+import { OverlayProvider } from '../../../../contexts';
+import { Button } from '../Button';
+
+describe('Button accessibilityLabelKey', () => {
+  it('uses the translated accessibility label when accessibility is enabled', async () => {
+    render(
+      <OverlayProvider accessibility={{ enabled: true }}>
+        <Button
+          accessibilityLabelKey='a11y/Add attachment'
+          iconOnly
+          onPress={jest.fn()}
+          size='md'
+          type='outline'
+          variant='secondary'
+        />
+      </OverlayProvider>,
+    );
+
+    await waitFor(() => {
+      expect(screen.getByLabelText('Add attachment')).toBeTruthy();
+    });
+  });
+
+  it('supports a plain accessibilityLabel without the translation path', () => {
+    render(
+      <OverlayProvider>
+        <Button
+          accessibilityLabel='Legacy label'
+          iconOnly
+          onPress={jest.fn()}
+          size='md'
+          type='outline'
+          variant='secondary'
+        />
+      </OverlayProvider>,
+    );
+
+    expect(screen.getByLabelText('Legacy label')).toBeTruthy();
+  });
+});
diff --git a/package/src/i18n/en.json b/package/src/i18n/en.json
index 6a33c23953..acd794a5be 100644
--- a/package/src/i18n/en.json
+++ b/package/src/i18n/en.json
@@ -258,5 +258,28 @@
   "a11y/Sending": "Sending",
   "a11y/Sent": "Sent",
   "a11y/Voice message recording. Hold to record.": "Voice message recording. Hold to record.",
-  "a11y/{{count}} new messages": "{{count}} new messages"
+  "a11y/{{count}} new messages": "{{count}} new messages",
+  "a11y/Add attachment": "Add attachment",
+  "a11y/Close poll": "Close poll",
+  "a11y/Close poll creation": "Close poll creation",
+  "a11y/Create poll": "Create poll",
+  "a11y/Decrease maximum votes": "Decrease maximum votes",
+  "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Dismiss unread messages": "Dismiss unread messages",
+  "a11y/Grid Icon": "Grid Icon",
+  "a11y/Hide Overlay": "Hide Overlay",
+  "a11y/Increase maximum votes": "Increase maximum votes",
+  "a11y/Open camera": "Open camera",
+  "a11y/Open commands": "Open commands",
+  "a11y/Open file picker": "Open file picker",
+  "a11y/Open more reactions": "Open more reactions",
+  "a11y/Open photo picker": "Open photo picker",
+  "a11y/Open poll creation": "Open poll creation",
+  "a11y/Open video recorder": "Open video recorder",
+  "a11y/Play Pause Button": "Play Pause Button",
+  "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
+  "a11y/Save edited message": "Save edited message",
+  "a11y/Send voice recording": "Send voice recording",
+  "a11y/Share Button": "Share Button",
+  "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/es.json b/package/src/i18n/es.json
index c8f8fe80b2..119346c5a9 100644
--- a/package/src/i18n/es.json
+++ b/package/src/i18n/es.json
@@ -258,5 +258,28 @@
   "a11y/Sending": "Enviando",
   "a11y/Sent": "Enviado",
   "a11y/Voice message recording. Hold to record.": "Grabación de mensaje de voz. Mantén pulsado para grabar.",
-  "a11y/{{count}} new messages": "{{count}} mensajes nuevos"
+  "a11y/{{count}} new messages": "{{count}} mensajes nuevos",
+  "a11y/Add attachment": "Add attachment",
+  "a11y/Close poll": "Close poll",
+  "a11y/Close poll creation": "Close poll creation",
+  "a11y/Create poll": "Create poll",
+  "a11y/Decrease maximum votes": "Decrease maximum votes",
+  "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Dismiss unread messages": "Dismiss unread messages",
+  "a11y/Grid Icon": "Grid Icon",
+  "a11y/Hide Overlay": "Hide Overlay",
+  "a11y/Increase maximum votes": "Increase maximum votes",
+  "a11y/Open camera": "Open camera",
+  "a11y/Open commands": "Open commands",
+  "a11y/Open file picker": "Open file picker",
+  "a11y/Open more reactions": "Open more reactions",
+  "a11y/Open photo picker": "Open photo picker",
+  "a11y/Open poll creation": "Open poll creation",
+  "a11y/Open video recorder": "Open video recorder",
+  "a11y/Play Pause Button": "Play Pause Button",
+  "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
+  "a11y/Save edited message": "Save edited message",
+  "a11y/Send voice recording": "Send voice recording",
+  "a11y/Share Button": "Share Button",
+  "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/fr.json b/package/src/i18n/fr.json
index 097910a2b1..88150785b3 100644
--- a/package/src/i18n/fr.json
+++ b/package/src/i18n/fr.json
@@ -258,5 +258,28 @@
   "a11y/Sending": "Envoi",
   "a11y/Sent": "Envoyé",
   "a11y/Voice message recording. Hold to record.": "Enregistrement d'un message vocal. Maintenez appuyé pour enregistrer.",
-  "a11y/{{count}} new messages": "{{count}} nouveaux messages"
+  "a11y/{{count}} new messages": "{{count}} nouveaux messages",
+  "a11y/Add attachment": "Add attachment",
+  "a11y/Close poll": "Close poll",
+  "a11y/Close poll creation": "Close poll creation",
+  "a11y/Create poll": "Create poll",
+  "a11y/Decrease maximum votes": "Decrease maximum votes",
+  "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Dismiss unread messages": "Dismiss unread messages",
+  "a11y/Grid Icon": "Grid Icon",
+  "a11y/Hide Overlay": "Hide Overlay",
+  "a11y/Increase maximum votes": "Increase maximum votes",
+  "a11y/Open camera": "Open camera",
+  "a11y/Open commands": "Open commands",
+  "a11y/Open file picker": "Open file picker",
+  "a11y/Open more reactions": "Open more reactions",
+  "a11y/Open photo picker": "Open photo picker",
+  "a11y/Open poll creation": "Open poll creation",
+  "a11y/Open video recorder": "Open video recorder",
+  "a11y/Play Pause Button": "Play Pause Button",
+  "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
+  "a11y/Save edited message": "Save edited message",
+  "a11y/Send voice recording": "Send voice recording",
+  "a11y/Share Button": "Share Button",
+  "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/he.json b/package/src/i18n/he.json
index 64071893b9..542847ab74 100644
--- a/package/src/i18n/he.json
+++ b/package/src/i18n/he.json
@@ -258,5 +258,28 @@
   "a11y/Sending": "שולח",
   "a11y/Sent": "נשלח",
   "a11y/Voice message recording. Hold to record.": "הקלטת הודעה קולית. החזק כדי להקליט.",
-  "a11y/{{count}} new messages": "{{count}} הודעות חדשות"
+  "a11y/{{count}} new messages": "{{count}} הודעות חדשות",
+  "a11y/Add attachment": "Add attachment",
+  "a11y/Close poll": "Close poll",
+  "a11y/Close poll creation": "Close poll creation",
+  "a11y/Create poll": "Create poll",
+  "a11y/Decrease maximum votes": "Decrease maximum votes",
+  "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Dismiss unread messages": "Dismiss unread messages",
+  "a11y/Grid Icon": "Grid Icon",
+  "a11y/Hide Overlay": "Hide Overlay",
+  "a11y/Increase maximum votes": "Increase maximum votes",
+  "a11y/Open camera": "Open camera",
+  "a11y/Open commands": "Open commands",
+  "a11y/Open file picker": "Open file picker",
+  "a11y/Open more reactions": "Open more reactions",
+  "a11y/Open photo picker": "Open photo picker",
+  "a11y/Open poll creation": "Open poll creation",
+  "a11y/Open video recorder": "Open video recorder",
+  "a11y/Play Pause Button": "Play Pause Button",
+  "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
+  "a11y/Save edited message": "Save edited message",
+  "a11y/Send voice recording": "Send voice recording",
+  "a11y/Share Button": "Share Button",
+  "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/hi.json b/package/src/i18n/hi.json
index 24f3a09dac..6476135ad9 100644
--- a/package/src/i18n/hi.json
+++ b/package/src/i18n/hi.json
@@ -258,5 +258,28 @@
   "a11y/Sending": "भेजा जा रहा है",
   "a11y/Sent": "भेजा गया",
   "a11y/Voice message recording. Hold to record.": "वॉइस संदेश रिकॉर्डिंग। रिकॉर्ड करने के लिए दबाकर रखें।",
-  "a11y/{{count}} new messages": "{{count}} नए संदेश"
+  "a11y/{{count}} new messages": "{{count}} नए संदेश",
+  "a11y/Add attachment": "Add attachment",
+  "a11y/Close poll": "Close poll",
+  "a11y/Close poll creation": "Close poll creation",
+  "a11y/Create poll": "Create poll",
+  "a11y/Decrease maximum votes": "Decrease maximum votes",
+  "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Dismiss unread messages": "Dismiss unread messages",
+  "a11y/Grid Icon": "Grid Icon",
+  "a11y/Hide Overlay": "Hide Overlay",
+  "a11y/Increase maximum votes": "Increase maximum votes",
+  "a11y/Open camera": "Open camera",
+  "a11y/Open commands": "Open commands",
+  "a11y/Open file picker": "Open file picker",
+  "a11y/Open more reactions": "Open more reactions",
+  "a11y/Open photo picker": "Open photo picker",
+  "a11y/Open poll creation": "Open poll creation",
+  "a11y/Open video recorder": "Open video recorder",
+  "a11y/Play Pause Button": "Play Pause Button",
+  "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
+  "a11y/Save edited message": "Save edited message",
+  "a11y/Send voice recording": "Send voice recording",
+  "a11y/Share Button": "Share Button",
+  "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/it.json b/package/src/i18n/it.json
index 15664187b1..d91bc2b0a9 100644
--- a/package/src/i18n/it.json
+++ b/package/src/i18n/it.json
@@ -258,5 +258,28 @@
   "a11y/Sending": "Invio in corso",
   "a11y/Sent": "Inviato",
   "a11y/Voice message recording. Hold to record.": "Registrazione del messaggio vocale. Tieni premuto per registrare.",
-  "a11y/{{count}} new messages": "{{count}} nuovi messaggi"
+  "a11y/{{count}} new messages": "{{count}} nuovi messaggi",
+  "a11y/Add attachment": "Add attachment",
+  "a11y/Close poll": "Close poll",
+  "a11y/Close poll creation": "Close poll creation",
+  "a11y/Create poll": "Create poll",
+  "a11y/Decrease maximum votes": "Decrease maximum votes",
+  "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Dismiss unread messages": "Dismiss unread messages",
+  "a11y/Grid Icon": "Grid Icon",
+  "a11y/Hide Overlay": "Hide Overlay",
+  "a11y/Increase maximum votes": "Increase maximum votes",
+  "a11y/Open camera": "Open camera",
+  "a11y/Open commands": "Open commands",
+  "a11y/Open file picker": "Open file picker",
+  "a11y/Open more reactions": "Open more reactions",
+  "a11y/Open photo picker": "Open photo picker",
+  "a11y/Open poll creation": "Open poll creation",
+  "a11y/Open video recorder": "Open video recorder",
+  "a11y/Play Pause Button": "Play Pause Button",
+  "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
+  "a11y/Save edited message": "Save edited message",
+  "a11y/Send voice recording": "Send voice recording",
+  "a11y/Share Button": "Share Button",
+  "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/ja.json b/package/src/i18n/ja.json
index d64f30bbc9..426da6ccb9 100644
--- a/package/src/i18n/ja.json
+++ b/package/src/i18n/ja.json
@@ -258,5 +258,28 @@
   "a11y/Sending": "送信中",
   "a11y/Sent": "送信済み",
   "a11y/Voice message recording. Hold to record.": "音声メッセージの録音。長押しして録音します。",
-  "a11y/{{count}} new messages": "新しいメッセージ{{count}}件"
+  "a11y/{{count}} new messages": "新しいメッセージ{{count}}件",
+  "a11y/Add attachment": "Add attachment",
+  "a11y/Close poll": "Close poll",
+  "a11y/Close poll creation": "Close poll creation",
+  "a11y/Create poll": "Create poll",
+  "a11y/Decrease maximum votes": "Decrease maximum votes",
+  "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Dismiss unread messages": "Dismiss unread messages",
+  "a11y/Grid Icon": "Grid Icon",
+  "a11y/Hide Overlay": "Hide Overlay",
+  "a11y/Increase maximum votes": "Increase maximum votes",
+  "a11y/Open camera": "Open camera",
+  "a11y/Open commands": "Open commands",
+  "a11y/Open file picker": "Open file picker",
+  "a11y/Open more reactions": "Open more reactions",
+  "a11y/Open photo picker": "Open photo picker",
+  "a11y/Open poll creation": "Open poll creation",
+  "a11y/Open video recorder": "Open video recorder",
+  "a11y/Play Pause Button": "Play Pause Button",
+  "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
+  "a11y/Save edited message": "Save edited message",
+  "a11y/Send voice recording": "Send voice recording",
+  "a11y/Share Button": "Share Button",
+  "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/ko.json b/package/src/i18n/ko.json
index 225d034906..52fbf6774f 100644
--- a/package/src/i18n/ko.json
+++ b/package/src/i18n/ko.json
@@ -258,5 +258,28 @@
   "a11y/Sending": "보내는 중",
   "a11y/Sent": "보냄",
   "a11y/Voice message recording. Hold to record.": "음성 메시지 녹음. 길게 눌러 녹음하세요.",
-  "a11y/{{count}} new messages": "새 메시지 {{count}}개"
+  "a11y/{{count}} new messages": "새 메시지 {{count}}개",
+  "a11y/Add attachment": "Add attachment",
+  "a11y/Close poll": "Close poll",
+  "a11y/Close poll creation": "Close poll creation",
+  "a11y/Create poll": "Create poll",
+  "a11y/Decrease maximum votes": "Decrease maximum votes",
+  "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Dismiss unread messages": "Dismiss unread messages",
+  "a11y/Grid Icon": "Grid Icon",
+  "a11y/Hide Overlay": "Hide Overlay",
+  "a11y/Increase maximum votes": "Increase maximum votes",
+  "a11y/Open camera": "Open camera",
+  "a11y/Open commands": "Open commands",
+  "a11y/Open file picker": "Open file picker",
+  "a11y/Open more reactions": "Open more reactions",
+  "a11y/Open photo picker": "Open photo picker",
+  "a11y/Open poll creation": "Open poll creation",
+  "a11y/Open video recorder": "Open video recorder",
+  "a11y/Play Pause Button": "Play Pause Button",
+  "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
+  "a11y/Save edited message": "Save edited message",
+  "a11y/Send voice recording": "Send voice recording",
+  "a11y/Share Button": "Share Button",
+  "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/nl.json b/package/src/i18n/nl.json
index f28f95d03e..df25983c15 100644
--- a/package/src/i18n/nl.json
+++ b/package/src/i18n/nl.json
@@ -258,5 +258,28 @@
   "a11y/Sending": "Verzenden",
   "a11y/Sent": "Verzonden",
   "a11y/Voice message recording. Hold to record.": "Spraakbericht opnemen. Houd ingedrukt om op te nemen.",
-  "a11y/{{count}} new messages": "{{count}} nieuwe berichten"
+  "a11y/{{count}} new messages": "{{count}} nieuwe berichten",
+  "a11y/Add attachment": "Add attachment",
+  "a11y/Close poll": "Close poll",
+  "a11y/Close poll creation": "Close poll creation",
+  "a11y/Create poll": "Create poll",
+  "a11y/Decrease maximum votes": "Decrease maximum votes",
+  "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Dismiss unread messages": "Dismiss unread messages",
+  "a11y/Grid Icon": "Grid Icon",
+  "a11y/Hide Overlay": "Hide Overlay",
+  "a11y/Increase maximum votes": "Increase maximum votes",
+  "a11y/Open camera": "Open camera",
+  "a11y/Open commands": "Open commands",
+  "a11y/Open file picker": "Open file picker",
+  "a11y/Open more reactions": "Open more reactions",
+  "a11y/Open photo picker": "Open photo picker",
+  "a11y/Open poll creation": "Open poll creation",
+  "a11y/Open video recorder": "Open video recorder",
+  "a11y/Play Pause Button": "Play Pause Button",
+  "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
+  "a11y/Save edited message": "Save edited message",
+  "a11y/Send voice recording": "Send voice recording",
+  "a11y/Share Button": "Share Button",
+  "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/pt-br.json b/package/src/i18n/pt-br.json
index 61eb3adcd6..ec62acf354 100644
--- a/package/src/i18n/pt-br.json
+++ b/package/src/i18n/pt-br.json
@@ -258,5 +258,28 @@
   "a11y/Sending": "Enviando",
   "a11y/Sent": "Enviado",
   "a11y/Voice message recording. Hold to record.": "Gravação de mensagem de voz. Mantenha pressionado para gravar.",
-  "a11y/{{count}} new messages": "{{count}} novas mensagens"
+  "a11y/{{count}} new messages": "{{count}} novas mensagens",
+  "a11y/Add attachment": "Add attachment",
+  "a11y/Close poll": "Close poll",
+  "a11y/Close poll creation": "Close poll creation",
+  "a11y/Create poll": "Create poll",
+  "a11y/Decrease maximum votes": "Decrease maximum votes",
+  "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Dismiss unread messages": "Dismiss unread messages",
+  "a11y/Grid Icon": "Grid Icon",
+  "a11y/Hide Overlay": "Hide Overlay",
+  "a11y/Increase maximum votes": "Increase maximum votes",
+  "a11y/Open camera": "Open camera",
+  "a11y/Open commands": "Open commands",
+  "a11y/Open file picker": "Open file picker",
+  "a11y/Open more reactions": "Open more reactions",
+  "a11y/Open photo picker": "Open photo picker",
+  "a11y/Open poll creation": "Open poll creation",
+  "a11y/Open video recorder": "Open video recorder",
+  "a11y/Play Pause Button": "Play Pause Button",
+  "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
+  "a11y/Save edited message": "Save edited message",
+  "a11y/Send voice recording": "Send voice recording",
+  "a11y/Share Button": "Share Button",
+  "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/ru.json b/package/src/i18n/ru.json
index 6fb689b35b..023852ad24 100644
--- a/package/src/i18n/ru.json
+++ b/package/src/i18n/ru.json
@@ -258,5 +258,28 @@
   "a11y/Sending": "Отправка",
   "a11y/Sent": "Отправлено",
   "a11y/Voice message recording. Hold to record.": "Запись голосового сообщения. Удерживайте, чтобы записать.",
-  "a11y/{{count}} new messages": "{{count}} новых сообщений"
+  "a11y/{{count}} new messages": "{{count}} новых сообщений",
+  "a11y/Add attachment": "Add attachment",
+  "a11y/Close poll": "Close poll",
+  "a11y/Close poll creation": "Close poll creation",
+  "a11y/Create poll": "Create poll",
+  "a11y/Decrease maximum votes": "Decrease maximum votes",
+  "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Dismiss unread messages": "Dismiss unread messages",
+  "a11y/Grid Icon": "Grid Icon",
+  "a11y/Hide Overlay": "Hide Overlay",
+  "a11y/Increase maximum votes": "Increase maximum votes",
+  "a11y/Open camera": "Open camera",
+  "a11y/Open commands": "Open commands",
+  "a11y/Open file picker": "Open file picker",
+  "a11y/Open more reactions": "Open more reactions",
+  "a11y/Open photo picker": "Open photo picker",
+  "a11y/Open poll creation": "Open poll creation",
+  "a11y/Open video recorder": "Open video recorder",
+  "a11y/Play Pause Button": "Play Pause Button",
+  "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
+  "a11y/Save edited message": "Save edited message",
+  "a11y/Send voice recording": "Send voice recording",
+  "a11y/Share Button": "Share Button",
+  "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/tr.json b/package/src/i18n/tr.json
index ad964926c5..e4d7be0832 100644
--- a/package/src/i18n/tr.json
+++ b/package/src/i18n/tr.json
@@ -258,5 +258,28 @@
   "a11y/Sending": "Gönderiliyor",
   "a11y/Sent": "Gönderildi",
   "a11y/Voice message recording. Hold to record.": "Sesli mesaj kaydı. Kaydetmek için basılı tutun.",
-  "a11y/{{count}} new messages": "{{count}} yeni mesaj"
+  "a11y/{{count}} new messages": "{{count}} yeni mesaj",
+  "a11y/Add attachment": "Add attachment",
+  "a11y/Close poll": "Close poll",
+  "a11y/Close poll creation": "Close poll creation",
+  "a11y/Create poll": "Create poll",
+  "a11y/Decrease maximum votes": "Decrease maximum votes",
+  "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Dismiss unread messages": "Dismiss unread messages",
+  "a11y/Grid Icon": "Grid Icon",
+  "a11y/Hide Overlay": "Hide Overlay",
+  "a11y/Increase maximum votes": "Increase maximum votes",
+  "a11y/Open camera": "Open camera",
+  "a11y/Open commands": "Open commands",
+  "a11y/Open file picker": "Open file picker",
+  "a11y/Open more reactions": "Open more reactions",
+  "a11y/Open photo picker": "Open photo picker",
+  "a11y/Open poll creation": "Open poll creation",
+  "a11y/Open video recorder": "Open video recorder",
+  "a11y/Play Pause Button": "Play Pause Button",
+  "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
+  "a11y/Save edited message": "Save edited message",
+  "a11y/Send voice recording": "Send voice recording",
+  "a11y/Share Button": "Share Button",
+  "a11y/Stop voice recording": "Stop voice recording"
 }

From e7c3bb8d250892747f90a0d30be096dab6e99d33 Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Wed, 6 May 2026 22:33:46 +0200
Subject: [PATCH 02/17] fix: focus picker on open

---
 package/src/a11y/index.ts                     |  10 +
 .../AttachmentPicker/AttachmentPicker.tsx     |  31 ++-
 .../components/AttachmentTypePickerButton.tsx |  11 +
 package/src/components/ui/Button/Button.tsx   |   6 +
 .../AccessibilityContext.tsx                  | 195 +++++++++++++++++-
 5 files changed, 246 insertions(+), 7 deletions(-)

diff --git a/package/src/a11y/index.ts b/package/src/a11y/index.ts
index 55ae3fc9ac..066ec80d39 100644
--- a/package/src/a11y/index.ts
+++ b/package/src/a11y/index.ts
@@ -4,3 +4,13 @@ export * from './hooks/useReducedMotionPreference';
 export * from './hooks/useResolvedModalAccessibilityProps';
 export * from './hooks/useAnnounceOnStateChange';
 export * from './hooks/useA11yLabel';
+export {
+  IMPORTANT_ACCESSIBILITY_ELEMENT_IDS,
+  useImportantAccessibilityElementRef,
+  useImportantAccessibilityElements,
+  useRegisterImportantAccessibilityElement,
+} from '../contexts/accessibilityContext';
+export type {
+  ImportantAccessibilityElementId,
+  ImportantAccessibilityElementRef,
+} from '../contexts/accessibilityContext';
diff --git a/package/src/components/AttachmentPicker/AttachmentPicker.tsx b/package/src/components/AttachmentPicker/AttachmentPicker.tsx
index 19022bbc90..1b50e7db8b 100644
--- a/package/src/components/AttachmentPicker/AttachmentPicker.tsx
+++ b/package/src/components/AttachmentPicker/AttachmentPicker.tsx
@@ -11,9 +11,15 @@ import {
 import { runOnJS, useAnimatedReaction, useSharedValue } from 'react-native-reanimated';
 
 import { useBottomSheetSpringConfigs } from '@gorhom/bottom-sheet';
+import type { BottomSheetBackgroundProps } from '@gorhom/bottom-sheet';
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 
+import {
+  IMPORTANT_ACCESSIBILITY_ELEMENT_IDS,
+  useImportantAccessibilityElements,
+  useScreenReaderEnabled,
+} from '../../a11y';
 import { useAttachmentPickerContext } from '../../contexts/attachmentPickerContext/AttachmentPickerContext';
 import { useComponentsContext } from '../../contexts/componentsContext/ComponentsContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
@@ -44,7 +50,8 @@ export const AttachmentPicker = () => {
   const {
     theme: { semantics },
   } = useTheme();
-
+  const isScreenReaderEnabled = useScreenReaderEnabled();
+  const { focusImportantAccessibilityElement } = useImportantAccessibilityElements();
   const [currentIndex, setCurrentIndexInternal] = useState(-1);
   const currentIndexRef = useRef<number>(currentIndex);
   const setCurrentIndex = useStableCallback((_: number, toIndex: number) => {
@@ -122,6 +129,7 @@ export const AttachmentPicker = () => {
   );
 
   const animatedIndex = useSharedValue(currentIndex);
+  const isPickerClosed = currentIndex < 0;
 
   // This is required to prevent the attachment picker from getting out of sync
   // with the rest of the state. While there are more prudent fixes, this is about
@@ -136,6 +144,12 @@ export const AttachmentPicker = () => {
       // TODO: Extend the store to at least accept a default value.
       //       This in particular is not nice.
       attachmentPickerStore.setSelectedPicker('images');
+
+      if (isScreenReaderEnabled) {
+        focusImportantAccessibilityElement(
+          IMPORTANT_ACCESSIBILITY_ELEMENT_IDS.attachmentPickerMediaButton,
+        );
+      }
     }
   });
 
@@ -150,12 +164,18 @@ export const AttachmentPicker = () => {
 
   return (
     <BottomSheet
+      accessible={false}
+      accessibilityElementsHidden={isPickerClosed}
+      accessibilityLabel={null}
+      accessibilityRole={null}
       android_keyboardInputMode='adjustResize'
+      backgroundComponent={AttachmentPickerBackground}
       backgroundStyle={backgroundStyle}
       enablePanDownToClose={false}
       enableContentPanningGesture={false}
       enableDynamicSizing={false}
       handleComponent={RenderNull}
+      importantForAccessibility={isPickerClosed ? 'no-hide-descendants' : 'auto'}
       index={currentIndex}
       onAnimate={setCurrentIndex}
       animatedIndex={animatedIndex}
@@ -178,4 +198,13 @@ export const AttachmentPicker = () => {
 
 const RenderNull = () => null;
 
+const AttachmentPickerBackground = ({ pointerEvents, style }: BottomSheetBackgroundProps) => (
+  <View
+    accessible={false}
+    importantForAccessibility='no'
+    pointerEvents={pointerEvents}
+    style={style}
+  />
+);
+
 AttachmentPicker.displayName = 'AttachmentPicker';
diff --git a/package/src/components/AttachmentPicker/components/AttachmentTypePickerButton.tsx b/package/src/components/AttachmentPicker/components/AttachmentTypePickerButton.tsx
index bf2ff59a76..fd321123a0 100644
--- a/package/src/components/AttachmentPicker/components/AttachmentTypePickerButton.tsx
+++ b/package/src/components/AttachmentPicker/components/AttachmentTypePickerButton.tsx
@@ -6,6 +6,10 @@ import { PressableProps } from 'react-native-gesture-handler';
 
 import { AttachmentCommandPicker } from './AttachmentPickerContent';
 
+import {
+  IMPORTANT_ACCESSIBILITY_ELEMENT_IDS,
+  useImportantAccessibilityElementRef,
+} from '../../../a11y';
 import {
   useAttachmentPickerContext,
   useChannelContext,
@@ -30,6 +34,7 @@ import { BottomSheetModal } from '../../UIComponents';
 export type AttachmentTypePickerButtonProps = Pick<ButtonProps, 'selected' | 'onPress'> & {
   accessibilityLabelKey?: string;
   Icon: ButtonProps['LeadingIcon'];
+  pressableRef?: ButtonProps['pressableRef'];
 } & Pick<PressableProps, 'testID'>;
 
 const hitSlop = { bottom: 15, top: 15 };
@@ -40,6 +45,7 @@ export const AttachmentTypePickerButton = ({
   selected,
   onPress: onPressProp,
   Icon,
+  pressableRef,
 }: AttachmentTypePickerButtonProps) => {
   const { disableAttachmentPicker } = useAttachmentPickerContext();
   const ButtonIcon = useCallback(
@@ -58,6 +64,7 @@ export const AttachmentTypePickerButton = ({
       testID={testID}
       hitSlop={hitSlop}
       onPress={onPress}
+      pressableRef={pressableRef}
       LeadingIcon={ButtonIcon}
       type={'ghost'}
       size={'lg'}
@@ -72,6 +79,9 @@ export const MediaPickerButton = () => {
   const { hasImagePicker, pickAndUploadImageFromNativePicker } = useMessageInputContext();
   const { attachmentPickerStore, disableAttachmentPicker } = useAttachmentPickerContext();
   const { selectedPicker } = useAttachmentPickerState();
+  const pressableRef = useImportantAccessibilityElementRef(
+    IMPORTANT_ACCESSIBILITY_ELEMENT_IDS.attachmentPickerMediaButton,
+  );
 
   const setImagePicker = useStableCallback(() => {
     if (disableAttachmentPicker) {
@@ -86,6 +96,7 @@ export const MediaPickerButton = () => {
       accessibilityLabelKey='a11y/Open photo picker'
       testID='upload-photo-touchable'
       Icon={Picture}
+      pressableRef={pressableRef}
       selected={selectedPicker === 'images'}
       onPress={setImagePicker}
     />
diff --git a/package/src/components/ui/Button/Button.tsx b/package/src/components/ui/Button/Button.tsx
index e381b41049..2f0eeec129 100644
--- a/package/src/components/ui/Button/Button.tsx
+++ b/package/src/components/ui/Button/Button.tsx
@@ -44,6 +44,10 @@ export type ButtonProps = PressableProps & {
    * Optional interpolation params for `accessibilityLabelKey`.
    */
   accessibilityLabelParams?: Record<string, unknown>;
+  /**
+   * Ref attached to the native pressable element. Used for accessibility focus restoration.
+   */
+  pressableRef?: React.Ref<unknown>;
   /**
    * The style of the button.
    */
@@ -96,6 +100,7 @@ export const Button = ({
   iconOnly = false,
   label,
   onLayout,
+  pressableRef,
   disabled = false,
   style,
   ...rest
@@ -140,6 +145,7 @@ export const Button = ({
         accessibilityLabel={resolvedAccessibilityLabel}
         accessibilityRole='button'
         accessibilityState={accessibilityState}
+        ref={pressableRef as React.Ref<React.ElementRef<typeof Pressable>>}
         style={({ pressed }) => [
           {
             backgroundColor: pressed
diff --git a/package/src/contexts/accessibilityContext/AccessibilityContext.tsx b/package/src/contexts/accessibilityContext/AccessibilityContext.tsx
index 1c9d64fd14..0fb384db73 100644
--- a/package/src/contexts/accessibilityContext/AccessibilityContext.tsx
+++ b/package/src/contexts/accessibilityContext/AccessibilityContext.tsx
@@ -6,7 +6,7 @@ import React, {
   useMemo,
   useRef,
 } from 'react';
-import { AccessibilityInfo } from 'react-native';
+import { AccessibilityInfo, findNodeHandle } from 'react-native';
 
 import { AccessibilityAnnouncerContext } from '../../components/Accessibility/useAccessibilityAnnouncer';
 import type {
@@ -50,6 +50,41 @@ export type AccessibilityConfig = {
 /** Fully-resolved config — every field is populated with its default. */
 export type ResolvedAccessibilityConfig = Required<AccessibilityConfig>;
 
+export const IMPORTANT_ACCESSIBILITY_ELEMENT_IDS = {
+  attachmentPickerMediaButton: 'attachmentPicker.mediaButton',
+} as const;
+
+type ImportantAccessibilityNativeElement = NonNullable<Parameters<typeof findNodeHandle>[0]>;
+
+type ImportantAccessibilityElementRegistry = {
+  [IMPORTANT_ACCESSIBILITY_ELEMENT_IDS.attachmentPickerMediaButton]: ImportantAccessibilityNativeElement;
+};
+
+export type ImportantAccessibilityElementId = keyof ImportantAccessibilityElementRegistry;
+
+export type ImportantAccessibilityElementRef<Id extends ImportantAccessibilityElementId> =
+  React.RefObject<ImportantAccessibilityElementRegistry[Id] | null>;
+
+type ImportantAccessibilityElements = Partial<{
+  [Id in ImportantAccessibilityElementId]: ImportantAccessibilityElementRef<Id>;
+}>;
+
+type ImportantAccessibilityElementsContextValue = {
+  importantElements: React.MutableRefObject<ImportantAccessibilityElements>;
+  focusImportantAccessibilityElement: (id: ImportantAccessibilityElementId) => boolean;
+  registerImportantAccessibilityElement: <Id extends ImportantAccessibilityElementId>(
+    id: Id,
+    ref: ImportantAccessibilityElementRef<Id>,
+  ) => void;
+  unregisterImportantAccessibilityElement: <Id extends ImportantAccessibilityElementId>(
+    id: Id,
+    ref: ImportantAccessibilityElementRef<Id>,
+  ) => void;
+};
+
+type AccessibilityContextValue = ResolvedAccessibilityConfig &
+  ImportantAccessibilityElementsContextValue;
+
 export const accessibilityContextDefaultValue: ResolvedAccessibilityConfig = {
   announceConnectionState: true,
   announceNewMessages: true,
@@ -61,9 +96,19 @@ export const accessibilityContextDefaultValue: ResolvedAccessibilityConfig = {
   messageActionsTrigger: 'auto',
 };
 
-export const AccessibilityContext = React.createContext<ResolvedAccessibilityConfig>(
-  accessibilityContextDefaultValue,
-);
+const defaultImportantElements = { current: {} };
+
+const importantAccessibilityElementsDefaultValue: ImportantAccessibilityElementsContextValue = {
+  importantElements: defaultImportantElements,
+  focusImportantAccessibilityElement: () => false,
+  registerImportantAccessibilityElement: () => undefined,
+  unregisterImportantAccessibilityElement: () => undefined,
+};
+
+export const AccessibilityContext = React.createContext<AccessibilityContextValue>({
+  ...accessibilityContextDefaultValue,
+  ...importantAccessibilityElementsDefaultValue,
+});
 
 const AccessibilityAnnouncerProvider = ({ children }: PropsWithChildren) => {
   const sequenceByPriorityRef = useRef<SequenceByPriority>({ assertive: 0, polite: 0 });
@@ -151,8 +196,65 @@ export const AccessibilityProvider = ({
     ],
   );
 
+  const importantElements = useRef<ImportantAccessibilityElements>({});
+
+  const registerImportantAccessibilityElement = useCallback(
+    <Id extends ImportantAccessibilityElementId>(
+      id: Id,
+      ref: ImportantAccessibilityElementRef<Id>,
+    ) => {
+      importantElements.current[id] = ref;
+    },
+    [],
+  );
+
+  const unregisterImportantAccessibilityElement = useCallback(
+    <Id extends ImportantAccessibilityElementId>(
+      id: Id,
+      ref: ImportantAccessibilityElementRef<Id>,
+    ) => {
+      if (importantElements.current[id] === ref) {
+        delete importantElements.current[id];
+      }
+    },
+    [],
+  );
+
+  const focusImportantAccessibilityElement = useCallback((id: ImportantAccessibilityElementId) => {
+    const element = importantElements.current[id]?.current;
+
+    if (!element) {
+      return false;
+    }
+
+    const reactTag = findNodeHandle(element);
+
+    if (!reactTag) {
+      return false;
+    }
+
+    AccessibilityInfo.setAccessibilityFocus(reactTag);
+    return true;
+  }, []);
+
+  const contextValue = useMemo<AccessibilityContextValue>(
+    () => ({
+      ...resolved,
+      importantElements,
+      focusImportantAccessibilityElement,
+      registerImportantAccessibilityElement,
+      unregisterImportantAccessibilityElement,
+    }),
+    [
+      resolved,
+      focusImportantAccessibilityElement,
+      registerImportantAccessibilityElement,
+      unregisterImportantAccessibilityElement,
+    ],
+  );
+
   return (
-    <AccessibilityContext.Provider value={resolved}>
+    <AccessibilityContext.Provider value={contextValue}>
       {enabled ? (
         <AccessibilityAnnouncerProvider>{children}</AccessibilityAnnouncerProvider>
       ) : (
@@ -162,4 +264,85 @@ export const AccessibilityProvider = ({
   );
 };
 
-export const useAccessibilityContext = () => useContext(AccessibilityContext);
+export const useAccessibilityContext = (): ResolvedAccessibilityConfig => {
+  const {
+    announceConnectionState,
+    announceNewMessages,
+    announceTypingIndicator,
+    audioRecorderTapMode,
+    enabled,
+    forceScreenReaderMode,
+    imageGalleryScreenReaderMode,
+    messageActionsTrigger,
+  } = useContext(AccessibilityContext);
+
+  return useMemo(
+    () => ({
+      announceConnectionState,
+      announceNewMessages,
+      announceTypingIndicator,
+      audioRecorderTapMode,
+      enabled,
+      forceScreenReaderMode,
+      imageGalleryScreenReaderMode,
+      messageActionsTrigger,
+    }),
+    [
+      announceConnectionState,
+      announceNewMessages,
+      announceTypingIndicator,
+      audioRecorderTapMode,
+      enabled,
+      forceScreenReaderMode,
+      imageGalleryScreenReaderMode,
+      messageActionsTrigger,
+    ],
+  );
+};
+
+export const useImportantAccessibilityElements = () => {
+  const {
+    importantElements,
+    focusImportantAccessibilityElement,
+    registerImportantAccessibilityElement,
+    unregisterImportantAccessibilityElement,
+  } = useContext(AccessibilityContext);
+
+  return useMemo(
+    () => ({
+      importantElements,
+      focusImportantAccessibilityElement,
+      registerImportantAccessibilityElement,
+      unregisterImportantAccessibilityElement,
+    }),
+    [
+      importantElements,
+      focusImportantAccessibilityElement,
+      registerImportantAccessibilityElement,
+      unregisterImportantAccessibilityElement,
+    ],
+  );
+};
+
+export const useRegisterImportantAccessibilityElement = <
+  Id extends ImportantAccessibilityElementId,
+>(
+  id: Id,
+  ref: ImportantAccessibilityElementRef<Id>,
+) => {
+  const { registerImportantAccessibilityElement, unregisterImportantAccessibilityElement } =
+    useImportantAccessibilityElements();
+
+  useEffect(() => {
+    registerImportantAccessibilityElement(id, ref);
+    return () => unregisterImportantAccessibilityElement(id, ref);
+  }, [id, ref, registerImportantAccessibilityElement, unregisterImportantAccessibilityElement]);
+};
+
+export const useImportantAccessibilityElementRef = <Id extends ImportantAccessibilityElementId>(
+  id: Id,
+) => {
+  const ref = useRef<ImportantAccessibilityElementRegistry[Id] | null>(null);
+  useRegisterImportantAccessibilityElement(id, ref);
+  return ref;
+};

From f95e23a13d4381d7f72718e8814d7016d23c07a0 Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Wed, 6 May 2026 23:44:01 +0200
Subject: [PATCH 03/17] fix: accessibility ordering

---
 .../AttachmentPicker/AttachmentPicker.tsx     | 25 +++++++------------
 .../AttachmentMediaPicker.tsx                 |  1 +
 .../components/AttachmentPickerContent.tsx    |  1 +
 3 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/package/src/components/AttachmentPicker/AttachmentPicker.tsx b/package/src/components/AttachmentPicker/AttachmentPicker.tsx
index 1b50e7db8b..3b8586e82f 100644
--- a/package/src/components/AttachmentPicker/AttachmentPicker.tsx
+++ b/package/src/components/AttachmentPicker/AttachmentPicker.tsx
@@ -6,6 +6,7 @@ import {
   Platform,
   View,
   LayoutChangeEvent,
+  useWindowDimensions,
 } from 'react-native';
 
 import { runOnJS, useAnimatedReaction, useSharedValue } from 'react-native-reanimated';
@@ -15,11 +16,6 @@ import type { BottomSheetBackgroundProps } from '@gorhom/bottom-sheet';
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 
-import {
-  IMPORTANT_ACCESSIBILITY_ELEMENT_IDS,
-  useImportantAccessibilityElements,
-  useScreenReaderEnabled,
-} from '../../a11y';
 import { useAttachmentPickerContext } from '../../contexts/attachmentPickerContext/AttachmentPickerContext';
 import { useComponentsContext } from '../../contexts/componentsContext/ComponentsContext';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
@@ -44,14 +40,14 @@ export const AttachmentPicker = () => {
     attachmentPickerStore,
     attachmentPickerBottomSheetHeight,
     bottomSheetRef: ref,
+    bottomInset,
     disableAttachmentPicker,
   } = useAttachmentPickerContext();
   const { AttachmentPickerContent, AttachmentPickerSelectionBar } = useComponentsContext();
   const {
     theme: { semantics },
   } = useTheme();
-  const isScreenReaderEnabled = useScreenReaderEnabled();
-  const { focusImportantAccessibilityElement } = useImportantAccessibilityElements();
+  const { height: windowHeight } = useWindowDimensions();
   const [currentIndex, setCurrentIndexInternal] = useState(-1);
   const currentIndexRef = useRef<number>(currentIndex);
   const setCurrentIndex = useStableCallback((_: number, toIndex: number) => {
@@ -106,6 +102,10 @@ export const AttachmentPicker = () => {
   const selectionBarRef = useRef<number | null>(null);
 
   const initialSnapPoint = attachmentPickerBottomSheetHeight;
+  const pickerTopInset = Math.max(
+    0,
+    windowHeight - attachmentPickerBottomSheetHeight - bottomInset,
+  );
 
   /**
    * Snap points changing cause a rerender of the position,
@@ -129,7 +129,6 @@ export const AttachmentPicker = () => {
   );
 
   const animatedIndex = useSharedValue(currentIndex);
-  const isPickerClosed = currentIndex < 0;
 
   // This is required to prevent the attachment picker from getting out of sync
   // with the rest of the state. While there are more prudent fixes, this is about
@@ -144,12 +143,6 @@ export const AttachmentPicker = () => {
       // TODO: Extend the store to at least accept a default value.
       //       This in particular is not nice.
       attachmentPickerStore.setSelectedPicker('images');
-
-      if (isScreenReaderEnabled) {
-        focusImportantAccessibilityElement(
-          IMPORTANT_ACCESSIBILITY_ELEMENT_IDS.attachmentPickerMediaButton,
-        );
-      }
     }
   });
 
@@ -165,23 +158,23 @@ export const AttachmentPicker = () => {
   return (
     <BottomSheet
       accessible={false}
-      accessibilityElementsHidden={isPickerClosed}
       accessibilityLabel={null}
       accessibilityRole={null}
       android_keyboardInputMode='adjustResize'
       backgroundComponent={AttachmentPickerBackground}
       backgroundStyle={backgroundStyle}
+      bottomInset={bottomInset}
       enablePanDownToClose={false}
       enableContentPanningGesture={false}
       enableDynamicSizing={false}
       handleComponent={RenderNull}
-      importantForAccessibility={isPickerClosed ? 'no-hide-descendants' : 'auto'}
       index={currentIndex}
       onAnimate={setCurrentIndex}
       animatedIndex={animatedIndex}
       // @ts-ignore
       ref={ref}
       snapPoints={snapPoints}
+      topInset={pickerTopInset}
       animationConfigs={animationConfigs}
     >
       <View onLayout={onAttachmentPickerSelectionBarLayout}>
diff --git a/package/src/components/AttachmentPicker/components/AttachmentMediaPicker/AttachmentMediaPicker.tsx b/package/src/components/AttachmentPicker/components/AttachmentMediaPicker/AttachmentMediaPicker.tsx
index 86e7fac67c..161d7fc6f3 100644
--- a/package/src/components/AttachmentPicker/components/AttachmentMediaPicker/AttachmentMediaPicker.tsx
+++ b/package/src/components/AttachmentPicker/components/AttachmentMediaPicker/AttachmentMediaPicker.tsx
@@ -172,6 +172,7 @@ export const AttachmentMediaPicker = (props: AttachmentPickerContentProps) => {
       numColumns={numberOfColumns}
       onEndReached={photoError ? undefined : getMorePhotos}
       renderItem={renderAttachmentPickerItem}
+      showsVerticalScrollIndicator={false}
       testID={'attachment-picker-list'}
       updateCellsBatchingPeriod={16}
     />
diff --git a/package/src/components/AttachmentPicker/components/AttachmentPickerContent.tsx b/package/src/components/AttachmentPicker/components/AttachmentPickerContent.tsx
index e955a28252..6529814903 100644
--- a/package/src/components/AttachmentPicker/components/AttachmentPickerContent.tsx
+++ b/package/src/components/AttachmentPicker/components/AttachmentPickerContent.tsx
@@ -141,6 +141,7 @@ export const AttachmentCommandPicker = () => {
         renderItem={renderItem}
         data={commands}
         keyExtractor={keyExtractor}
+        showsVerticalScrollIndicator={false}
       />
     </>
   );

From ef605eb513eea6b447e272bbacfbf7bc27c7729d Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Wed, 6 May 2026 23:47:39 +0200
Subject: [PATCH 04/17] fix: revert accesibility important element registry

---
 package/src/a11y/index.ts                     |  10 --
 .../components/AttachmentTypePickerButton.tsx |  11 --
 package/src/components/ui/Button/Button.tsx   |   6 -
 .../AccessibilityContext.tsx                  | 159 +-----------------
 4 files changed, 5 insertions(+), 181 deletions(-)

diff --git a/package/src/a11y/index.ts b/package/src/a11y/index.ts
index 066ec80d39..55ae3fc9ac 100644
--- a/package/src/a11y/index.ts
+++ b/package/src/a11y/index.ts
@@ -4,13 +4,3 @@ export * from './hooks/useReducedMotionPreference';
 export * from './hooks/useResolvedModalAccessibilityProps';
 export * from './hooks/useAnnounceOnStateChange';
 export * from './hooks/useA11yLabel';
-export {
-  IMPORTANT_ACCESSIBILITY_ELEMENT_IDS,
-  useImportantAccessibilityElementRef,
-  useImportantAccessibilityElements,
-  useRegisterImportantAccessibilityElement,
-} from '../contexts/accessibilityContext';
-export type {
-  ImportantAccessibilityElementId,
-  ImportantAccessibilityElementRef,
-} from '../contexts/accessibilityContext';
diff --git a/package/src/components/AttachmentPicker/components/AttachmentTypePickerButton.tsx b/package/src/components/AttachmentPicker/components/AttachmentTypePickerButton.tsx
index fd321123a0..bf2ff59a76 100644
--- a/package/src/components/AttachmentPicker/components/AttachmentTypePickerButton.tsx
+++ b/package/src/components/AttachmentPicker/components/AttachmentTypePickerButton.tsx
@@ -6,10 +6,6 @@ import { PressableProps } from 'react-native-gesture-handler';
 
 import { AttachmentCommandPicker } from './AttachmentPickerContent';
 
-import {
-  IMPORTANT_ACCESSIBILITY_ELEMENT_IDS,
-  useImportantAccessibilityElementRef,
-} from '../../../a11y';
 import {
   useAttachmentPickerContext,
   useChannelContext,
@@ -34,7 +30,6 @@ import { BottomSheetModal } from '../../UIComponents';
 export type AttachmentTypePickerButtonProps = Pick<ButtonProps, 'selected' | 'onPress'> & {
   accessibilityLabelKey?: string;
   Icon: ButtonProps['LeadingIcon'];
-  pressableRef?: ButtonProps['pressableRef'];
 } & Pick<PressableProps, 'testID'>;
 
 const hitSlop = { bottom: 15, top: 15 };
@@ -45,7 +40,6 @@ export const AttachmentTypePickerButton = ({
   selected,
   onPress: onPressProp,
   Icon,
-  pressableRef,
 }: AttachmentTypePickerButtonProps) => {
   const { disableAttachmentPicker } = useAttachmentPickerContext();
   const ButtonIcon = useCallback(
@@ -64,7 +58,6 @@ export const AttachmentTypePickerButton = ({
       testID={testID}
       hitSlop={hitSlop}
       onPress={onPress}
-      pressableRef={pressableRef}
       LeadingIcon={ButtonIcon}
       type={'ghost'}
       size={'lg'}
@@ -79,9 +72,6 @@ export const MediaPickerButton = () => {
   const { hasImagePicker, pickAndUploadImageFromNativePicker } = useMessageInputContext();
   const { attachmentPickerStore, disableAttachmentPicker } = useAttachmentPickerContext();
   const { selectedPicker } = useAttachmentPickerState();
-  const pressableRef = useImportantAccessibilityElementRef(
-    IMPORTANT_ACCESSIBILITY_ELEMENT_IDS.attachmentPickerMediaButton,
-  );
 
   const setImagePicker = useStableCallback(() => {
     if (disableAttachmentPicker) {
@@ -96,7 +86,6 @@ export const MediaPickerButton = () => {
       accessibilityLabelKey='a11y/Open photo picker'
       testID='upload-photo-touchable'
       Icon={Picture}
-      pressableRef={pressableRef}
       selected={selectedPicker === 'images'}
       onPress={setImagePicker}
     />
diff --git a/package/src/components/ui/Button/Button.tsx b/package/src/components/ui/Button/Button.tsx
index 2f0eeec129..e381b41049 100644
--- a/package/src/components/ui/Button/Button.tsx
+++ b/package/src/components/ui/Button/Button.tsx
@@ -44,10 +44,6 @@ export type ButtonProps = PressableProps & {
    * Optional interpolation params for `accessibilityLabelKey`.
    */
   accessibilityLabelParams?: Record<string, unknown>;
-  /**
-   * Ref attached to the native pressable element. Used for accessibility focus restoration.
-   */
-  pressableRef?: React.Ref<unknown>;
   /**
    * The style of the button.
    */
@@ -100,7 +96,6 @@ export const Button = ({
   iconOnly = false,
   label,
   onLayout,
-  pressableRef,
   disabled = false,
   style,
   ...rest
@@ -145,7 +140,6 @@ export const Button = ({
         accessibilityLabel={resolvedAccessibilityLabel}
         accessibilityRole='button'
         accessibilityState={accessibilityState}
-        ref={pressableRef as React.Ref<React.ElementRef<typeof Pressable>>}
         style={({ pressed }) => [
           {
             backgroundColor: pressed
diff --git a/package/src/contexts/accessibilityContext/AccessibilityContext.tsx b/package/src/contexts/accessibilityContext/AccessibilityContext.tsx
index 0fb384db73..7e00a5347d 100644
--- a/package/src/contexts/accessibilityContext/AccessibilityContext.tsx
+++ b/package/src/contexts/accessibilityContext/AccessibilityContext.tsx
@@ -6,7 +6,7 @@ import React, {
   useMemo,
   useRef,
 } from 'react';
-import { AccessibilityInfo, findNodeHandle } from 'react-native';
+import { AccessibilityInfo } from 'react-native';
 
 import { AccessibilityAnnouncerContext } from '../../components/Accessibility/useAccessibilityAnnouncer';
 import type {
@@ -50,41 +50,6 @@ export type AccessibilityConfig = {
 /** Fully-resolved config — every field is populated with its default. */
 export type ResolvedAccessibilityConfig = Required<AccessibilityConfig>;
 
-export const IMPORTANT_ACCESSIBILITY_ELEMENT_IDS = {
-  attachmentPickerMediaButton: 'attachmentPicker.mediaButton',
-} as const;
-
-type ImportantAccessibilityNativeElement = NonNullable<Parameters<typeof findNodeHandle>[0]>;
-
-type ImportantAccessibilityElementRegistry = {
-  [IMPORTANT_ACCESSIBILITY_ELEMENT_IDS.attachmentPickerMediaButton]: ImportantAccessibilityNativeElement;
-};
-
-export type ImportantAccessibilityElementId = keyof ImportantAccessibilityElementRegistry;
-
-export type ImportantAccessibilityElementRef<Id extends ImportantAccessibilityElementId> =
-  React.RefObject<ImportantAccessibilityElementRegistry[Id] | null>;
-
-type ImportantAccessibilityElements = Partial<{
-  [Id in ImportantAccessibilityElementId]: ImportantAccessibilityElementRef<Id>;
-}>;
-
-type ImportantAccessibilityElementsContextValue = {
-  importantElements: React.MutableRefObject<ImportantAccessibilityElements>;
-  focusImportantAccessibilityElement: (id: ImportantAccessibilityElementId) => boolean;
-  registerImportantAccessibilityElement: <Id extends ImportantAccessibilityElementId>(
-    id: Id,
-    ref: ImportantAccessibilityElementRef<Id>,
-  ) => void;
-  unregisterImportantAccessibilityElement: <Id extends ImportantAccessibilityElementId>(
-    id: Id,
-    ref: ImportantAccessibilityElementRef<Id>,
-  ) => void;
-};
-
-type AccessibilityContextValue = ResolvedAccessibilityConfig &
-  ImportantAccessibilityElementsContextValue;
-
 export const accessibilityContextDefaultValue: ResolvedAccessibilityConfig = {
   announceConnectionState: true,
   announceNewMessages: true,
@@ -96,19 +61,9 @@ export const accessibilityContextDefaultValue: ResolvedAccessibilityConfig = {
   messageActionsTrigger: 'auto',
 };
 
-const defaultImportantElements = { current: {} };
-
-const importantAccessibilityElementsDefaultValue: ImportantAccessibilityElementsContextValue = {
-  importantElements: defaultImportantElements,
-  focusImportantAccessibilityElement: () => false,
-  registerImportantAccessibilityElement: () => undefined,
-  unregisterImportantAccessibilityElement: () => undefined,
-};
-
-export const AccessibilityContext = React.createContext<AccessibilityContextValue>({
-  ...accessibilityContextDefaultValue,
-  ...importantAccessibilityElementsDefaultValue,
-});
+export const AccessibilityContext = React.createContext<ResolvedAccessibilityConfig>(
+  accessibilityContextDefaultValue,
+);
 
 const AccessibilityAnnouncerProvider = ({ children }: PropsWithChildren) => {
   const sequenceByPriorityRef = useRef<SequenceByPriority>({ assertive: 0, polite: 0 });
@@ -196,65 +151,8 @@ export const AccessibilityProvider = ({
     ],
   );
 
-  const importantElements = useRef<ImportantAccessibilityElements>({});
-
-  const registerImportantAccessibilityElement = useCallback(
-    <Id extends ImportantAccessibilityElementId>(
-      id: Id,
-      ref: ImportantAccessibilityElementRef<Id>,
-    ) => {
-      importantElements.current[id] = ref;
-    },
-    [],
-  );
-
-  const unregisterImportantAccessibilityElement = useCallback(
-    <Id extends ImportantAccessibilityElementId>(
-      id: Id,
-      ref: ImportantAccessibilityElementRef<Id>,
-    ) => {
-      if (importantElements.current[id] === ref) {
-        delete importantElements.current[id];
-      }
-    },
-    [],
-  );
-
-  const focusImportantAccessibilityElement = useCallback((id: ImportantAccessibilityElementId) => {
-    const element = importantElements.current[id]?.current;
-
-    if (!element) {
-      return false;
-    }
-
-    const reactTag = findNodeHandle(element);
-
-    if (!reactTag) {
-      return false;
-    }
-
-    AccessibilityInfo.setAccessibilityFocus(reactTag);
-    return true;
-  }, []);
-
-  const contextValue = useMemo<AccessibilityContextValue>(
-    () => ({
-      ...resolved,
-      importantElements,
-      focusImportantAccessibilityElement,
-      registerImportantAccessibilityElement,
-      unregisterImportantAccessibilityElement,
-    }),
-    [
-      resolved,
-      focusImportantAccessibilityElement,
-      registerImportantAccessibilityElement,
-      unregisterImportantAccessibilityElement,
-    ],
-  );
-
   return (
-    <AccessibilityContext.Provider value={contextValue}>
+    <AccessibilityContext.Provider value={resolved}>
       {enabled ? (
         <AccessibilityAnnouncerProvider>{children}</AccessibilityAnnouncerProvider>
       ) : (
@@ -299,50 +197,3 @@ export const useAccessibilityContext = (): ResolvedAccessibilityConfig => {
     ],
   );
 };
-
-export const useImportantAccessibilityElements = () => {
-  const {
-    importantElements,
-    focusImportantAccessibilityElement,
-    registerImportantAccessibilityElement,
-    unregisterImportantAccessibilityElement,
-  } = useContext(AccessibilityContext);
-
-  return useMemo(
-    () => ({
-      importantElements,
-      focusImportantAccessibilityElement,
-      registerImportantAccessibilityElement,
-      unregisterImportantAccessibilityElement,
-    }),
-    [
-      importantElements,
-      focusImportantAccessibilityElement,
-      registerImportantAccessibilityElement,
-      unregisterImportantAccessibilityElement,
-    ],
-  );
-};
-
-export const useRegisterImportantAccessibilityElement = <
-  Id extends ImportantAccessibilityElementId,
->(
-  id: Id,
-  ref: ImportantAccessibilityElementRef<Id>,
-) => {
-  const { registerImportantAccessibilityElement, unregisterImportantAccessibilityElement } =
-    useImportantAccessibilityElements();
-
-  useEffect(() => {
-    registerImportantAccessibilityElement(id, ref);
-    return () => unregisterImportantAccessibilityElement(id, ref);
-  }, [id, ref, registerImportantAccessibilityElement, unregisterImportantAccessibilityElement]);
-};
-
-export const useImportantAccessibilityElementRef = <Id extends ImportantAccessibilityElementId>(
-  id: Id,
-) => {
-  const ref = useRef<ImportantAccessibilityElementRegistry[Id] | null>(null);
-  useRegisterImportantAccessibilityElement(id, ref);
-  return ref;
-};

From d2f7fc0d8b009e17c5affb16a8e6b7524db0fa50 Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 00:07:22 +0200
Subject: [PATCH 05/17] fix: attach button label

---
 .../components/InputButtons/AttachButton.tsx    | 17 +++++++++++++----
 package/src/i18n/en.json                        |  1 +
 package/src/i18n/es.json                        |  1 +
 package/src/i18n/fr.json                        |  1 +
 package/src/i18n/he.json                        |  1 +
 package/src/i18n/hi.json                        |  1 +
 package/src/i18n/it.json                        |  1 +
 package/src/i18n/ja.json                        |  1 +
 package/src/i18n/ko.json                        |  1 +
 package/src/i18n/nl.json                        |  1 +
 package/src/i18n/pt-br.json                     |  1 +
 package/src/i18n/ru.json                        |  1 +
 package/src/i18n/tr.json                        |  1 +
 13 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/package/src/components/MessageInput/components/InputButtons/AttachButton.tsx b/package/src/components/MessageInput/components/InputButtons/AttachButton.tsx
index 087876ee98..b11fb5d2fd 100644
--- a/package/src/components/MessageInput/components/InputButtons/AttachButton.tsx
+++ b/package/src/components/MessageInput/components/InputButtons/AttachButton.tsx
@@ -10,6 +10,7 @@ import {
   useMessageInputContext,
 } from '../../../../contexts/messageInputContext/MessageInputContext';
 import { useStableCallback } from '../../../../hooks';
+import { useAttachmentPickerState } from '../../../../hooks/useAttachmentPickerState';
 import { Plus } from '../../../../icons/plus';
 import { Button } from '../../../ui/';
 
@@ -18,6 +19,7 @@ type AttachButtonPropsWithContext = Pick<MessageInputContextValue, 'handleAttach
     disabled?: boolean;
     /** Function that opens attachment options bottom sheet */
     handleOnPress?: ((event: GestureResponderEvent) => void) & (() => void);
+    isAttachmentPickerOpen?: boolean;
   } & { toggleAttachmentPicker: () => void };
 
 const AttachButtonWithContext = (props: AttachButtonPropsWithContext) => {
@@ -25,6 +27,7 @@ const AttachButtonWithContext = (props: AttachButtonPropsWithContext) => {
     disabled = false,
     handleAttachButtonPress,
     handleOnPress,
+    isAttachmentPickerOpen = false,
     toggleAttachmentPicker,
   } = props;
 
@@ -45,7 +48,9 @@ const AttachButtonWithContext = (props: AttachButtonPropsWithContext) => {
 
   return (
     <Button
-      accessibilityLabelKey='a11y/Add attachment'
+      accessibilityLabelKey={
+        isAttachmentPickerOpen ? 'a11y/Close attachments' : 'a11y/Add attachment'
+      }
       variant='secondary'
       type='outline'
       size='lg'
@@ -62,15 +67,17 @@ const areEqual = (
   prevProps: AttachButtonPropsWithContext,
   nextProps: AttachButtonPropsWithContext,
 ) => {
-  const { handleOnPress: prevHandleOnPress } = prevProps;
-  const { handleOnPress: nextHandleOnPress } = nextProps;
+  const { handleOnPress: prevHandleOnPress, isAttachmentPickerOpen: prevIsAttachmentPickerOpen } =
+    prevProps;
+  const { handleOnPress: nextHandleOnPress, isAttachmentPickerOpen: nextIsAttachmentPickerOpen } =
+    nextProps;
 
   const handleOnPressEqual = prevHandleOnPress === nextHandleOnPress;
   if (!handleOnPressEqual) {
     return false;
   }
 
-  return true;
+  return prevIsAttachmentPickerOpen === nextIsAttachmentPickerOpen;
 };
 
 const MemoizedAttachButton = React.memo(
@@ -87,6 +94,7 @@ export const AttachButton = (props: AttachButtonProps) => {
   const { disableAttachmentPicker } = useAttachmentPickerContext();
   const { inputBoxRef, handleAttachButtonPress, openAttachmentPicker } = useMessageInputContext();
   const { attachmentPickerStore } = useAttachmentPickerContext();
+  const { selectedPicker } = useAttachmentPickerState();
 
   const toggleAttachmentPicker = useStableCallback(() => {
     if (attachmentPickerStore.state.getLatestValue().selectedPicker) {
@@ -101,6 +109,7 @@ export const AttachButton = (props: AttachButtonProps) => {
       {...{
         disableAttachmentPicker,
         handleAttachButtonPress,
+        isAttachmentPickerOpen: !!selectedPicker,
         toggleAttachmentPicker,
       }}
       {...props}
diff --git a/package/src/i18n/en.json b/package/src/i18n/en.json
index acd794a5be..1c0a5d6034 100644
--- a/package/src/i18n/en.json
+++ b/package/src/i18n/en.json
@@ -260,6 +260,7 @@
   "a11y/Voice message recording. Hold to record.": "Voice message recording. Hold to record.",
   "a11y/{{count}} new messages": "{{count}} new messages",
   "a11y/Add attachment": "Add attachment",
+  "a11y/Close attachments": "Close attachments",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/es.json b/package/src/i18n/es.json
index 119346c5a9..c844cb8415 100644
--- a/package/src/i18n/es.json
+++ b/package/src/i18n/es.json
@@ -260,6 +260,7 @@
   "a11y/Voice message recording. Hold to record.": "Grabación de mensaje de voz. Mantén pulsado para grabar.",
   "a11y/{{count}} new messages": "{{count}} mensajes nuevos",
   "a11y/Add attachment": "Add attachment",
+  "a11y/Close attachments": "Close attachments",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/fr.json b/package/src/i18n/fr.json
index 88150785b3..4546699e18 100644
--- a/package/src/i18n/fr.json
+++ b/package/src/i18n/fr.json
@@ -260,6 +260,7 @@
   "a11y/Voice message recording. Hold to record.": "Enregistrement d'un message vocal. Maintenez appuyé pour enregistrer.",
   "a11y/{{count}} new messages": "{{count}} nouveaux messages",
   "a11y/Add attachment": "Add attachment",
+  "a11y/Close attachments": "Close attachments",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/he.json b/package/src/i18n/he.json
index 542847ab74..3db56f57c7 100644
--- a/package/src/i18n/he.json
+++ b/package/src/i18n/he.json
@@ -260,6 +260,7 @@
   "a11y/Voice message recording. Hold to record.": "הקלטת הודעה קולית. החזק כדי להקליט.",
   "a11y/{{count}} new messages": "{{count}} הודעות חדשות",
   "a11y/Add attachment": "Add attachment",
+  "a11y/Close attachments": "Close attachments",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/hi.json b/package/src/i18n/hi.json
index 6476135ad9..0f84e913e2 100644
--- a/package/src/i18n/hi.json
+++ b/package/src/i18n/hi.json
@@ -260,6 +260,7 @@
   "a11y/Voice message recording. Hold to record.": "वॉइस संदेश रिकॉर्डिंग। रिकॉर्ड करने के लिए दबाकर रखें।",
   "a11y/{{count}} new messages": "{{count}} नए संदेश",
   "a11y/Add attachment": "Add attachment",
+  "a11y/Close attachments": "Close attachments",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/it.json b/package/src/i18n/it.json
index d91bc2b0a9..c46dd8d8cf 100644
--- a/package/src/i18n/it.json
+++ b/package/src/i18n/it.json
@@ -260,6 +260,7 @@
   "a11y/Voice message recording. Hold to record.": "Registrazione del messaggio vocale. Tieni premuto per registrare.",
   "a11y/{{count}} new messages": "{{count}} nuovi messaggi",
   "a11y/Add attachment": "Add attachment",
+  "a11y/Close attachments": "Close attachments",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/ja.json b/package/src/i18n/ja.json
index 426da6ccb9..1a5bad93fa 100644
--- a/package/src/i18n/ja.json
+++ b/package/src/i18n/ja.json
@@ -260,6 +260,7 @@
   "a11y/Voice message recording. Hold to record.": "音声メッセージの録音。長押しして録音します。",
   "a11y/{{count}} new messages": "新しいメッセージ{{count}}件",
   "a11y/Add attachment": "Add attachment",
+  "a11y/Close attachments": "Close attachments",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/ko.json b/package/src/i18n/ko.json
index 52fbf6774f..104c083e3f 100644
--- a/package/src/i18n/ko.json
+++ b/package/src/i18n/ko.json
@@ -260,6 +260,7 @@
   "a11y/Voice message recording. Hold to record.": "음성 메시지 녹음. 길게 눌러 녹음하세요.",
   "a11y/{{count}} new messages": "새 메시지 {{count}}개",
   "a11y/Add attachment": "Add attachment",
+  "a11y/Close attachments": "Close attachments",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/nl.json b/package/src/i18n/nl.json
index df25983c15..83b7fc7f5d 100644
--- a/package/src/i18n/nl.json
+++ b/package/src/i18n/nl.json
@@ -260,6 +260,7 @@
   "a11y/Voice message recording. Hold to record.": "Spraakbericht opnemen. Houd ingedrukt om op te nemen.",
   "a11y/{{count}} new messages": "{{count}} nieuwe berichten",
   "a11y/Add attachment": "Add attachment",
+  "a11y/Close attachments": "Close attachments",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/pt-br.json b/package/src/i18n/pt-br.json
index ec62acf354..f5cd8beaa9 100644
--- a/package/src/i18n/pt-br.json
+++ b/package/src/i18n/pt-br.json
@@ -260,6 +260,7 @@
   "a11y/Voice message recording. Hold to record.": "Gravação de mensagem de voz. Mantenha pressionado para gravar.",
   "a11y/{{count}} new messages": "{{count}} novas mensagens",
   "a11y/Add attachment": "Add attachment",
+  "a11y/Close attachments": "Close attachments",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/ru.json b/package/src/i18n/ru.json
index 023852ad24..3a275c5cea 100644
--- a/package/src/i18n/ru.json
+++ b/package/src/i18n/ru.json
@@ -260,6 +260,7 @@
   "a11y/Voice message recording. Hold to record.": "Запись голосового сообщения. Удерживайте, чтобы записать.",
   "a11y/{{count}} new messages": "{{count}} новых сообщений",
   "a11y/Add attachment": "Add attachment",
+  "a11y/Close attachments": "Close attachments",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/tr.json b/package/src/i18n/tr.json
index e4d7be0832..b9cf485e07 100644
--- a/package/src/i18n/tr.json
+++ b/package/src/i18n/tr.json
@@ -260,6 +260,7 @@
   "a11y/Voice message recording. Hold to record.": "Sesli mesaj kaydı. Kaydetmek için basılı tutun.",
   "a11y/{{count}} new messages": "{{count}} yeni mesaj",
   "a11y/Add attachment": "Add attachment",
+  "a11y/Close attachments": "Close attachments",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",

From 27fe0bb62bf71ae2e9f4737f0d37ce2355924f63 Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 01:18:08 +0200
Subject: [PATCH 06/17] fix: scroll to bottom label

---
 .../MessageList/ScrollToBottomButton.tsx           | 14 ++++++++++++--
 package/src/i18n/en.json                           |  2 ++
 package/src/i18n/es.json                           |  2 ++
 package/src/i18n/fr.json                           |  2 ++
 package/src/i18n/he.json                           |  2 ++
 package/src/i18n/hi.json                           |  2 ++
 package/src/i18n/it.json                           |  2 ++
 package/src/i18n/ja.json                           |  2 ++
 package/src/i18n/ko.json                           |  2 ++
 package/src/i18n/nl.json                           |  2 ++
 package/src/i18n/pt-br.json                        |  2 ++
 package/src/i18n/ru.json                           |  2 ++
 package/src/i18n/tr.json                           |  2 ++
 13 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/package/src/components/MessageList/ScrollToBottomButton.tsx b/package/src/components/MessageList/ScrollToBottomButton.tsx
index 3ec4292a11..54d885bf7c 100644
--- a/package/src/components/MessageList/ScrollToBottomButton.tsx
+++ b/package/src/components/MessageList/ScrollToBottomButton.tsx
@@ -9,6 +9,10 @@ import { primitives } from '../../theme';
 import { BadgeNotification } from '../ui';
 import { Button } from '../ui/Button';
 
+const SCROLL_TO_BOTTOM_ACCESSIBILITY_LABEL_KEY = 'a11y/Scroll to bottom';
+const SCROLL_TO_BOTTOM_WITH_COUNT_ACCESSIBILITY_LABEL_KEY =
+  'a11y/Scroll to bottom, {{count}} new messages';
+
 export type ScrollToBottomButtonProps = {
   /** onPress handler */
   onPress: () => void;
@@ -47,7 +51,9 @@ export const ScrollToBottomButton = (props: ScrollToBottomButtonProps) => {
       >
         <Button
           accessibilityLabelKey={
-            unreadCount ? 'a11y/Scroll to latest, {{count}} unread' : 'a11y/Scroll to latest'
+            unreadCount
+              ? SCROLL_TO_BOTTOM_WITH_COUNT_ACCESSIBILITY_LABEL_KEY
+              : SCROLL_TO_BOTTOM_ACCESSIBILITY_LABEL_KEY
           }
           accessibilityLabelParams={accessibilityLabelParams}
           variant='secondary'
@@ -60,7 +66,11 @@ export const ScrollToBottomButton = (props: ScrollToBottomButtonProps) => {
         />
       </View>
 
-      <View style={styles.unreadCountNotificationContainer}>
+      <View
+        accessibilityElementsHidden
+        importantForAccessibility='no-hide-descendants'
+        style={styles.unreadCountNotificationContainer}
+      >
         {unreadCount ? (
           <BadgeNotification count={unreadCount} size='xs' type='primary' testID='unread-count' />
         ) : null}
diff --git a/package/src/i18n/en.json b/package/src/i18n/en.json
index 1c0a5d6034..d075d7357a 100644
--- a/package/src/i18n/en.json
+++ b/package/src/i18n/en.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Read",
   "a11y/Reconnecting": "Reconnecting",
   "a11y/Reply to {{user}}": "Reply to {{user}}",
+  "a11y/Scroll to bottom": "Scroll to bottom",
+  "a11y/Scroll to bottom, {{count}} new messages": "Scroll to bottom, {{count}} new messages",
   "a11y/Scroll to latest": "Scroll to latest",
   "a11y/Scroll to latest, {{count}} unread": "Scroll to latest, {{count}} unread",
   "a11y/Send message": "Send message",
diff --git a/package/src/i18n/es.json b/package/src/i18n/es.json
index c844cb8415..fc4744fe1f 100644
--- a/package/src/i18n/es.json
+++ b/package/src/i18n/es.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Leído",
   "a11y/Reconnecting": "Reconectando",
   "a11y/Reply to {{user}}": "Responder a {{user}}",
+  "a11y/Scroll to bottom": "Ir al final",
+  "a11y/Scroll to bottom, {{count}} new messages": "Ir al final, {{count}} mensajes nuevos",
   "a11y/Scroll to latest": "Ir al último mensaje",
   "a11y/Scroll to latest, {{count}} unread": "Ir al último mensaje, {{count}} sin leer",
   "a11y/Send message": "Enviar mensaje",
diff --git a/package/src/i18n/fr.json b/package/src/i18n/fr.json
index 4546699e18..c283599d83 100644
--- a/package/src/i18n/fr.json
+++ b/package/src/i18n/fr.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Lu",
   "a11y/Reconnecting": "Reconnexion",
   "a11y/Reply to {{user}}": "Répondre à {{user}}",
+  "a11y/Scroll to bottom": "Aller en bas",
+  "a11y/Scroll to bottom, {{count}} new messages": "Aller en bas, {{count}} nouveaux messages",
   "a11y/Scroll to latest": "Aller au dernier message",
   "a11y/Scroll to latest, {{count}} unread": "Aller au dernier message, {{count}} non lus",
   "a11y/Send message": "Envoyer le message",
diff --git a/package/src/i18n/he.json b/package/src/i18n/he.json
index 3db56f57c7..af960432c7 100644
--- a/package/src/i18n/he.json
+++ b/package/src/i18n/he.json
@@ -252,6 +252,8 @@
   "a11y/Read": "נקרא",
   "a11y/Reconnecting": "מתחבר מחדש",
   "a11y/Reply to {{user}}": "השב ל-{{user}}",
+  "a11y/Scroll to bottom": "גלול לתחתית",
+  "a11y/Scroll to bottom, {{count}} new messages": "גלול לתחתית, {{count}} הודעות חדשות",
   "a11y/Scroll to latest": "גלול להודעה האחרונה",
   "a11y/Scroll to latest, {{count}} unread": "גלול להודעה האחרונה, {{count}} לא נקראו",
   "a11y/Send message": "שלח הודעה",
diff --git a/package/src/i18n/hi.json b/package/src/i18n/hi.json
index 0f84e913e2..51cb48371e 100644
--- a/package/src/i18n/hi.json
+++ b/package/src/i18n/hi.json
@@ -252,6 +252,8 @@
   "a11y/Read": "पढ़ा गया",
   "a11y/Reconnecting": "फिर से कनेक्ट हो रहा है",
   "a11y/Reply to {{user}}": "{{user}} को जवाब दें",
+  "a11y/Scroll to bottom": "नीचे स्क्रॉल करें",
+  "a11y/Scroll to bottom, {{count}} new messages": "नीचे स्क्रॉल करें, {{count}} नए संदेश",
   "a11y/Scroll to latest": "नवीनतम संदेश पर जाएं",
   "a11y/Scroll to latest, {{count}} unread": "नवीनतम संदेश पर जाएं, {{count}} अपठित",
   "a11y/Send message": "संदेश भेजें",
diff --git a/package/src/i18n/it.json b/package/src/i18n/it.json
index c46dd8d8cf..cd3225d6b5 100644
--- a/package/src/i18n/it.json
+++ b/package/src/i18n/it.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Letto",
   "a11y/Reconnecting": "Riconnessione",
   "a11y/Reply to {{user}}": "Rispondi a {{user}}",
+  "a11y/Scroll to bottom": "Vai in fondo",
+  "a11y/Scroll to bottom, {{count}} new messages": "Vai in fondo, {{count}} nuovi messaggi",
   "a11y/Scroll to latest": "Vai al messaggio più recente",
   "a11y/Scroll to latest, {{count}} unread": "Vai al messaggio più recente, {{count}} non letti",
   "a11y/Send message": "Invia messaggio",
diff --git a/package/src/i18n/ja.json b/package/src/i18n/ja.json
index 1a5bad93fa..c2cc08edfb 100644
--- a/package/src/i18n/ja.json
+++ b/package/src/i18n/ja.json
@@ -252,6 +252,8 @@
   "a11y/Read": "既読",
   "a11y/Reconnecting": "再接続中",
   "a11y/Reply to {{user}}": "{{user}}に返信",
+  "a11y/Scroll to bottom": "一番下へ移動",
+  "a11y/Scroll to bottom, {{count}} new messages": "一番下へ移動、新しいメッセージ{{count}}件",
   "a11y/Scroll to latest": "最新のメッセージへ移動",
   "a11y/Scroll to latest, {{count}} unread": "最新のメッセージへ移動、未読{{count}}件",
   "a11y/Send message": "メッセージを送信",
diff --git a/package/src/i18n/ko.json b/package/src/i18n/ko.json
index 104c083e3f..021683715f 100644
--- a/package/src/i18n/ko.json
+++ b/package/src/i18n/ko.json
@@ -252,6 +252,8 @@
   "a11y/Read": "읽음",
   "a11y/Reconnecting": "다시 연결 중",
   "a11y/Reply to {{user}}": "{{user}}님에게 답장",
+  "a11y/Scroll to bottom": "맨 아래로 이동",
+  "a11y/Scroll to bottom, {{count}} new messages": "맨 아래로 이동, 새 메시지 {{count}}개",
   "a11y/Scroll to latest": "최신 메시지로 이동",
   "a11y/Scroll to latest, {{count}} unread": "최신 메시지로 이동, 읽지 않은 메시지 {{count}}개",
   "a11y/Send message": "메시지 보내기",
diff --git a/package/src/i18n/nl.json b/package/src/i18n/nl.json
index 83b7fc7f5d..998bec0185 100644
--- a/package/src/i18n/nl.json
+++ b/package/src/i18n/nl.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Gelezen",
   "a11y/Reconnecting": "Opnieuw verbinden",
   "a11y/Reply to {{user}}": "Antwoorden op {{user}}",
+  "a11y/Scroll to bottom": "Ga naar beneden",
+  "a11y/Scroll to bottom, {{count}} new messages": "Ga naar beneden, {{count}} nieuwe berichten",
   "a11y/Scroll to latest": "Ga naar het nieuwste bericht",
   "a11y/Scroll to latest, {{count}} unread": "Ga naar het nieuwste bericht, {{count}} ongelezen",
   "a11y/Send message": "Bericht verzenden",
diff --git a/package/src/i18n/pt-br.json b/package/src/i18n/pt-br.json
index f5cd8beaa9..1c28abd4b0 100644
--- a/package/src/i18n/pt-br.json
+++ b/package/src/i18n/pt-br.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Lido",
   "a11y/Reconnecting": "Reconectando",
   "a11y/Reply to {{user}}": "Responder a {{user}}",
+  "a11y/Scroll to bottom": "Ir para o final",
+  "a11y/Scroll to bottom, {{count}} new messages": "Ir para o final, {{count}} novas mensagens",
   "a11y/Scroll to latest": "Ir para a mensagem mais recente",
   "a11y/Scroll to latest, {{count}} unread": "Ir para a mensagem mais recente, {{count}} não lidas",
   "a11y/Send message": "Enviar mensagem",
diff --git a/package/src/i18n/ru.json b/package/src/i18n/ru.json
index 3a275c5cea..19089faa38 100644
--- a/package/src/i18n/ru.json
+++ b/package/src/i18n/ru.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Прочитано",
   "a11y/Reconnecting": "Повторное подключение",
   "a11y/Reply to {{user}}": "Ответить {{user}}",
+  "a11y/Scroll to bottom": "Прокрутить вниз",
+  "a11y/Scroll to bottom, {{count}} new messages": "Прокрутить вниз, {{count}} новых сообщений",
   "a11y/Scroll to latest": "Перейти к последнему сообщению",
   "a11y/Scroll to latest, {{count}} unread": "Перейти к последнему сообщению, {{count}} непрочитанных",
   "a11y/Send message": "Отправить сообщение",
diff --git a/package/src/i18n/tr.json b/package/src/i18n/tr.json
index b9cf485e07..0961da87cc 100644
--- a/package/src/i18n/tr.json
+++ b/package/src/i18n/tr.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Okundu",
   "a11y/Reconnecting": "Yeniden bağlanıyor",
   "a11y/Reply to {{user}}": "{{user}} kullanıcısına yanıt ver",
+  "a11y/Scroll to bottom": "En alta git",
+  "a11y/Scroll to bottom, {{count}} new messages": "En alta git, {{count}} yeni mesaj",
   "a11y/Scroll to latest": "En son mesaja git",
   "a11y/Scroll to latest, {{count}} unread": "En son mesaja git, {{count}} okunmamış",
   "a11y/Send message": "Mesaj gönder",

From a3df120d434a80f73ce8d193f0d8b7fd61d1fc5e Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 01:23:41 +0200
Subject: [PATCH 07/17] fix: remove button accessibility

---
 .../components/AttachmentPreview/AttachmentRemoveControl.tsx | 4 +++-
 package/src/components/Reply/Reply.tsx                       | 5 ++++-
 package/src/i18n/en.json                                     | 2 ++
 package/src/i18n/es.json                                     | 2 ++
 package/src/i18n/fr.json                                     | 2 ++
 package/src/i18n/he.json                                     | 2 ++
 package/src/i18n/hi.json                                     | 2 ++
 package/src/i18n/it.json                                     | 2 ++
 package/src/i18n/ja.json                                     | 2 ++
 package/src/i18n/ko.json                                     | 2 ++
 package/src/i18n/nl.json                                     | 2 ++
 package/src/i18n/pt-br.json                                  | 2 ++
 package/src/i18n/ru.json                                     | 2 ++
 package/src/i18n/tr.json                                     | 2 ++
 14 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/package/src/components/MessageInput/components/AttachmentPreview/AttachmentRemoveControl.tsx b/package/src/components/MessageInput/components/AttachmentPreview/AttachmentRemoveControl.tsx
index 46f74ff46b..d45aa112e0 100644
--- a/package/src/components/MessageInput/components/AttachmentPreview/AttachmentRemoveControl.tsx
+++ b/package/src/components/MessageInput/components/AttachmentPreview/AttachmentRemoveControl.tsx
@@ -8,7 +8,7 @@ import { primitives } from '../../../../theme';
 
 type AttachmentRemoveControlProps = PressableProps;
 
-export const AttachmentRemoveControl = ({ onPress }: AttachmentRemoveControlProps) => {
+export const AttachmentRemoveControl = ({ onPress, ...rest }: AttachmentRemoveControlProps) => {
   const {
     theme: {
       semantics,
@@ -21,6 +21,7 @@ export const AttachmentRemoveControl = ({ onPress }: AttachmentRemoveControlProp
 
   return (
     <Pressable
+      accessibilityRole='button'
       hitSlop={15}
       onPress={onPress}
       style={({ pressed }) => [
@@ -31,6 +32,7 @@ export const AttachmentRemoveControl = ({ onPress }: AttachmentRemoveControlProp
         dismiss,
       ]}
       testID='remove-upload-preview'
+      {...rest}
     >
       <NewClose
         height={16}
diff --git a/package/src/components/Reply/Reply.tsx b/package/src/components/Reply/Reply.tsx
index 13766299b2..38fb20080f 100644
--- a/package/src/components/Reply/Reply.tsx
+++ b/package/src/components/Reply/Reply.tsx
@@ -170,7 +170,10 @@ export const ReplyWithContext = (props: ReplyPropsWithContext) => {
       </View>
       {onDismiss ? (
         <View style={[styles.dismissWrapper, dismissWrapper, stylesProp?.dismissWrapper]}>
-          <AttachmentRemoveControl onPress={onDismiss} />
+          <AttachmentRemoveControl
+            accessibilityLabel={t(mode === 'edit' ? 'a11y/Remove edit' : 'a11y/Remove reply')}
+            onPress={onDismiss}
+          />
         </View>
       ) : null}
     </View>
diff --git a/package/src/i18n/en.json b/package/src/i18n/en.json
index d075d7357a..c4762cfce6 100644
--- a/package/src/i18n/en.json
+++ b/package/src/i18n/en.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Read",
   "a11y/Reconnecting": "Reconnecting",
   "a11y/Reply to {{user}}": "Reply to {{user}}",
+  "a11y/Remove edit": "Remove edit",
+  "a11y/Remove reply": "Remove reply",
   "a11y/Scroll to bottom": "Scroll to bottom",
   "a11y/Scroll to bottom, {{count}} new messages": "Scroll to bottom, {{count}} new messages",
   "a11y/Scroll to latest": "Scroll to latest",
diff --git a/package/src/i18n/es.json b/package/src/i18n/es.json
index fc4744fe1f..ccb289e854 100644
--- a/package/src/i18n/es.json
+++ b/package/src/i18n/es.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Leído",
   "a11y/Reconnecting": "Reconectando",
   "a11y/Reply to {{user}}": "Responder a {{user}}",
+  "a11y/Remove edit": "Eliminar edición",
+  "a11y/Remove reply": "Eliminar respuesta",
   "a11y/Scroll to bottom": "Ir al final",
   "a11y/Scroll to bottom, {{count}} new messages": "Ir al final, {{count}} mensajes nuevos",
   "a11y/Scroll to latest": "Ir al último mensaje",
diff --git a/package/src/i18n/fr.json b/package/src/i18n/fr.json
index c283599d83..22c93cb892 100644
--- a/package/src/i18n/fr.json
+++ b/package/src/i18n/fr.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Lu",
   "a11y/Reconnecting": "Reconnexion",
   "a11y/Reply to {{user}}": "Répondre à {{user}}",
+  "a11y/Remove edit": "Supprimer la modification",
+  "a11y/Remove reply": "Supprimer la réponse",
   "a11y/Scroll to bottom": "Aller en bas",
   "a11y/Scroll to bottom, {{count}} new messages": "Aller en bas, {{count}} nouveaux messages",
   "a11y/Scroll to latest": "Aller au dernier message",
diff --git a/package/src/i18n/he.json b/package/src/i18n/he.json
index af960432c7..e0bd112a77 100644
--- a/package/src/i18n/he.json
+++ b/package/src/i18n/he.json
@@ -252,6 +252,8 @@
   "a11y/Read": "נקרא",
   "a11y/Reconnecting": "מתחבר מחדש",
   "a11y/Reply to {{user}}": "השב ל-{{user}}",
+  "a11y/Remove edit": "הסר עריכה",
+  "a11y/Remove reply": "הסר תגובה",
   "a11y/Scroll to bottom": "גלול לתחתית",
   "a11y/Scroll to bottom, {{count}} new messages": "גלול לתחתית, {{count}} הודעות חדשות",
   "a11y/Scroll to latest": "גלול להודעה האחרונה",
diff --git a/package/src/i18n/hi.json b/package/src/i18n/hi.json
index 51cb48371e..ffa37718b1 100644
--- a/package/src/i18n/hi.json
+++ b/package/src/i18n/hi.json
@@ -252,6 +252,8 @@
   "a11y/Read": "पढ़ा गया",
   "a11y/Reconnecting": "फिर से कनेक्ट हो रहा है",
   "a11y/Reply to {{user}}": "{{user}} को जवाब दें",
+  "a11y/Remove edit": "संपादन हटाएं",
+  "a11y/Remove reply": "जवाब हटाएं",
   "a11y/Scroll to bottom": "नीचे स्क्रॉल करें",
   "a11y/Scroll to bottom, {{count}} new messages": "नीचे स्क्रॉल करें, {{count}} नए संदेश",
   "a11y/Scroll to latest": "नवीनतम संदेश पर जाएं",
diff --git a/package/src/i18n/it.json b/package/src/i18n/it.json
index cd3225d6b5..c8d15901d4 100644
--- a/package/src/i18n/it.json
+++ b/package/src/i18n/it.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Letto",
   "a11y/Reconnecting": "Riconnessione",
   "a11y/Reply to {{user}}": "Rispondi a {{user}}",
+  "a11y/Remove edit": "Rimuovi modifica",
+  "a11y/Remove reply": "Rimuovi risposta",
   "a11y/Scroll to bottom": "Vai in fondo",
   "a11y/Scroll to bottom, {{count}} new messages": "Vai in fondo, {{count}} nuovi messaggi",
   "a11y/Scroll to latest": "Vai al messaggio più recente",
diff --git a/package/src/i18n/ja.json b/package/src/i18n/ja.json
index c2cc08edfb..ffe4d3bc60 100644
--- a/package/src/i18n/ja.json
+++ b/package/src/i18n/ja.json
@@ -252,6 +252,8 @@
   "a11y/Read": "既読",
   "a11y/Reconnecting": "再接続中",
   "a11y/Reply to {{user}}": "{{user}}に返信",
+  "a11y/Remove edit": "編集を削除",
+  "a11y/Remove reply": "返信を削除",
   "a11y/Scroll to bottom": "一番下へ移動",
   "a11y/Scroll to bottom, {{count}} new messages": "一番下へ移動、新しいメッセージ{{count}}件",
   "a11y/Scroll to latest": "最新のメッセージへ移動",
diff --git a/package/src/i18n/ko.json b/package/src/i18n/ko.json
index 021683715f..6006562c73 100644
--- a/package/src/i18n/ko.json
+++ b/package/src/i18n/ko.json
@@ -252,6 +252,8 @@
   "a11y/Read": "읽음",
   "a11y/Reconnecting": "다시 연결 중",
   "a11y/Reply to {{user}}": "{{user}}님에게 답장",
+  "a11y/Remove edit": "편집 제거",
+  "a11y/Remove reply": "답장 제거",
   "a11y/Scroll to bottom": "맨 아래로 이동",
   "a11y/Scroll to bottom, {{count}} new messages": "맨 아래로 이동, 새 메시지 {{count}}개",
   "a11y/Scroll to latest": "최신 메시지로 이동",
diff --git a/package/src/i18n/nl.json b/package/src/i18n/nl.json
index 998bec0185..09d7ce9a50 100644
--- a/package/src/i18n/nl.json
+++ b/package/src/i18n/nl.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Gelezen",
   "a11y/Reconnecting": "Opnieuw verbinden",
   "a11y/Reply to {{user}}": "Antwoorden op {{user}}",
+  "a11y/Remove edit": "Bewerking verwijderen",
+  "a11y/Remove reply": "Antwoord verwijderen",
   "a11y/Scroll to bottom": "Ga naar beneden",
   "a11y/Scroll to bottom, {{count}} new messages": "Ga naar beneden, {{count}} nieuwe berichten",
   "a11y/Scroll to latest": "Ga naar het nieuwste bericht",
diff --git a/package/src/i18n/pt-br.json b/package/src/i18n/pt-br.json
index 1c28abd4b0..9052816367 100644
--- a/package/src/i18n/pt-br.json
+++ b/package/src/i18n/pt-br.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Lido",
   "a11y/Reconnecting": "Reconectando",
   "a11y/Reply to {{user}}": "Responder a {{user}}",
+  "a11y/Remove edit": "Remover edição",
+  "a11y/Remove reply": "Remover resposta",
   "a11y/Scroll to bottom": "Ir para o final",
   "a11y/Scroll to bottom, {{count}} new messages": "Ir para o final, {{count}} novas mensagens",
   "a11y/Scroll to latest": "Ir para a mensagem mais recente",
diff --git a/package/src/i18n/ru.json b/package/src/i18n/ru.json
index 19089faa38..d48f7ba81a 100644
--- a/package/src/i18n/ru.json
+++ b/package/src/i18n/ru.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Прочитано",
   "a11y/Reconnecting": "Повторное подключение",
   "a11y/Reply to {{user}}": "Ответить {{user}}",
+  "a11y/Remove edit": "Удалить редактирование",
+  "a11y/Remove reply": "Удалить ответ",
   "a11y/Scroll to bottom": "Прокрутить вниз",
   "a11y/Scroll to bottom, {{count}} new messages": "Прокрутить вниз, {{count}} новых сообщений",
   "a11y/Scroll to latest": "Перейти к последнему сообщению",
diff --git a/package/src/i18n/tr.json b/package/src/i18n/tr.json
index 0961da87cc..11ace14352 100644
--- a/package/src/i18n/tr.json
+++ b/package/src/i18n/tr.json
@@ -252,6 +252,8 @@
   "a11y/Read": "Okundu",
   "a11y/Reconnecting": "Yeniden bağlanıyor",
   "a11y/Reply to {{user}}": "{{user}} kullanıcısına yanıt ver",
+  "a11y/Remove edit": "Düzenlemeyi kaldır",
+  "a11y/Remove reply": "Yanıtı kaldır",
   "a11y/Scroll to bottom": "En alta git",
   "a11y/Scroll to bottom, {{count}} new messages": "En alta git, {{count}} yeni mesaj",
   "a11y/Scroll to latest": "En son mesaja git",

From 919558002824902fa52c761de83edee3bda6a13c Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 01:40:50 +0200
Subject: [PATCH 08/17] fix: add voice recording button to accessibility tree

---
 .../components/AudioRecorder/AudioRecordingButton.tsx    | 9 ++++++++-
 package/src/components/Reply/Reply.tsx                   | 6 +++++-
 package/src/i18n/en.json                                 | 1 +
 package/src/i18n/es.json                                 | 1 +
 package/src/i18n/fr.json                                 | 1 +
 package/src/i18n/he.json                                 | 1 +
 package/src/i18n/hi.json                                 | 1 +
 package/src/i18n/it.json                                 | 1 +
 package/src/i18n/ja.json                                 | 1 +
 package/src/i18n/ko.json                                 | 1 +
 package/src/i18n/nl.json                                 | 1 +
 package/src/i18n/pt-br.json                              | 1 +
 package/src/i18n/ru.json                                 | 1 +
 package/src/i18n/tr.json                                 | 1 +
 14 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/package/src/components/MessageInput/components/AudioRecorder/AudioRecordingButton.tsx b/package/src/components/MessageInput/components/AudioRecorder/AudioRecordingButton.tsx
index d646fa133c..2b389d8ecb 100644
--- a/package/src/components/MessageInput/components/AudioRecorder/AudioRecordingButton.tsx
+++ b/package/src/components/MessageInput/components/AudioRecorder/AudioRecordingButton.tsx
@@ -10,6 +10,7 @@ import Animated, {
   withSpring,
 } from 'react-native-reanimated';
 
+import { useA11yLabel } from '../../../../a11y/hooks/useA11yLabel';
 import { useActiveAudioPlayer } from '../../../../contexts/audioPlayerContext/AudioPlayerContext';
 import {
   MessageInputContextValue,
@@ -83,6 +84,7 @@ export const AudioRecordingButtonWithContext = (props: AudioRecordingButtonProps
   const pressed = useSharedValue(false);
 
   const { t } = useTranslationContext();
+  const startVoiceRecordingAccessibilityLabel = useA11yLabel('a11y/Start voice recording');
   const {
     theme: {
       messageComposer: { micButtonContainer },
@@ -238,7 +240,12 @@ export const AudioRecordingButtonWithContext = (props: AudioRecordingButtonProps
 
   return (
     <GestureDetector gesture={Gesture.Simultaneous(panGesture, tapGesture)}>
-      <Animated.View style={[styles.container, animatedStyle, micButtonContainer]}>
+      <Animated.View
+        accessibilityLabel={startVoiceRecordingAccessibilityLabel}
+        accessibilityRole='button'
+        accessible
+        style={[styles.container, animatedStyle, micButtonContainer]}
+      >
         <Mic height={20} width={20} strokeWidth={1.5} stroke={buttonStyles.foregroundColor} />
       </Animated.View>
     </GestureDetector>
diff --git a/package/src/components/Reply/Reply.tsx b/package/src/components/Reply/Reply.tsx
index 38fb20080f..88213e4e2c 100644
--- a/package/src/components/Reply/Reply.tsx
+++ b/package/src/components/Reply/Reply.tsx
@@ -20,6 +20,7 @@ import {
 
 import { ReplyMessageView } from './ReplyMessageView';
 
+import { useA11yLabel } from '../../a11y/hooks/useA11yLabel';
 import { useChatContext } from '../../contexts/chatContext/ChatContext';
 import { useComponentsContext } from '../../contexts/componentsContext/ComponentsContext';
 import {
@@ -133,6 +134,9 @@ export const ReplyWithContext = (props: ReplyPropsWithContext) => {
     },
   } = useTheme();
   const styles = useStyles();
+  const dismissAccessibilityLabel = useA11yLabel(
+    mode === 'edit' ? 'a11y/Remove edit' : 'a11y/Remove reply',
+  );
 
   const title = useMemo(
     () =>
@@ -171,7 +175,7 @@ export const ReplyWithContext = (props: ReplyPropsWithContext) => {
       {onDismiss ? (
         <View style={[styles.dismissWrapper, dismissWrapper, stylesProp?.dismissWrapper]}>
           <AttachmentRemoveControl
-            accessibilityLabel={t(mode === 'edit' ? 'a11y/Remove edit' : 'a11y/Remove reply')}
+            accessibilityLabel={dismissAccessibilityLabel}
             onPress={onDismiss}
           />
         </View>
diff --git a/package/src/i18n/en.json b/package/src/i18n/en.json
index c4762cfce6..2943a5fd01 100644
--- a/package/src/i18n/en.json
+++ b/package/src/i18n/en.json
@@ -286,5 +286,6 @@
   "a11y/Save edited message": "Save edited message",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
+  "a11y/Start voice recording": "Start voice recording",
   "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/es.json b/package/src/i18n/es.json
index ccb289e854..e6cd82fda7 100644
--- a/package/src/i18n/es.json
+++ b/package/src/i18n/es.json
@@ -286,5 +286,6 @@
   "a11y/Save edited message": "Save edited message",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
+  "a11y/Start voice recording": "Start voice recording",
   "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/fr.json b/package/src/i18n/fr.json
index 22c93cb892..0ac948a711 100644
--- a/package/src/i18n/fr.json
+++ b/package/src/i18n/fr.json
@@ -286,5 +286,6 @@
   "a11y/Save edited message": "Save edited message",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
+  "a11y/Start voice recording": "Start voice recording",
   "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/he.json b/package/src/i18n/he.json
index e0bd112a77..391f256337 100644
--- a/package/src/i18n/he.json
+++ b/package/src/i18n/he.json
@@ -286,5 +286,6 @@
   "a11y/Save edited message": "Save edited message",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
+  "a11y/Start voice recording": "Start voice recording",
   "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/hi.json b/package/src/i18n/hi.json
index ffa37718b1..d07ee6da85 100644
--- a/package/src/i18n/hi.json
+++ b/package/src/i18n/hi.json
@@ -286,5 +286,6 @@
   "a11y/Save edited message": "Save edited message",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
+  "a11y/Start voice recording": "Start voice recording",
   "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/it.json b/package/src/i18n/it.json
index c8d15901d4..a60339c150 100644
--- a/package/src/i18n/it.json
+++ b/package/src/i18n/it.json
@@ -286,5 +286,6 @@
   "a11y/Save edited message": "Save edited message",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
+  "a11y/Start voice recording": "Start voice recording",
   "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/ja.json b/package/src/i18n/ja.json
index ffe4d3bc60..a78b776e88 100644
--- a/package/src/i18n/ja.json
+++ b/package/src/i18n/ja.json
@@ -286,5 +286,6 @@
   "a11y/Save edited message": "Save edited message",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
+  "a11y/Start voice recording": "Start voice recording",
   "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/ko.json b/package/src/i18n/ko.json
index 6006562c73..473ce95a03 100644
--- a/package/src/i18n/ko.json
+++ b/package/src/i18n/ko.json
@@ -286,5 +286,6 @@
   "a11y/Save edited message": "Save edited message",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
+  "a11y/Start voice recording": "Start voice recording",
   "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/nl.json b/package/src/i18n/nl.json
index 09d7ce9a50..39e41d88f8 100644
--- a/package/src/i18n/nl.json
+++ b/package/src/i18n/nl.json
@@ -286,5 +286,6 @@
   "a11y/Save edited message": "Save edited message",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
+  "a11y/Start voice recording": "Start voice recording",
   "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/pt-br.json b/package/src/i18n/pt-br.json
index 9052816367..26c37b2f9e 100644
--- a/package/src/i18n/pt-br.json
+++ b/package/src/i18n/pt-br.json
@@ -286,5 +286,6 @@
   "a11y/Save edited message": "Save edited message",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
+  "a11y/Start voice recording": "Start voice recording",
   "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/ru.json b/package/src/i18n/ru.json
index d48f7ba81a..c9e7d20545 100644
--- a/package/src/i18n/ru.json
+++ b/package/src/i18n/ru.json
@@ -286,5 +286,6 @@
   "a11y/Save edited message": "Save edited message",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
+  "a11y/Start voice recording": "Start voice recording",
   "a11y/Stop voice recording": "Stop voice recording"
 }
diff --git a/package/src/i18n/tr.json b/package/src/i18n/tr.json
index 11ace14352..07332bab7e 100644
--- a/package/src/i18n/tr.json
+++ b/package/src/i18n/tr.json
@@ -286,5 +286,6 @@
   "a11y/Save edited message": "Save edited message",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
+  "a11y/Start voice recording": "Start voice recording",
   "a11y/Stop voice recording": "Stop voice recording"
 }

From 5ac5c4ce4c889a9f49f926ac27b85854e32b840d Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 01:42:32 +0200
Subject: [PATCH 09/17] fix: screen header accessibility

---
 examples/SampleApp/src/components/ScreenHeader.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/examples/SampleApp/src/components/ScreenHeader.tsx b/examples/SampleApp/src/components/ScreenHeader.tsx
index ab1b5393a0..5a7d141f90 100644
--- a/examples/SampleApp/src/components/ScreenHeader.tsx
+++ b/examples/SampleApp/src/components/ScreenHeader.tsx
@@ -64,6 +64,8 @@ export const BackButton: React.FC<{
 
   return (
     <TouchableOpacity
+      accessibilityLabel='Back'
+      accessibilityRole='button'
       onPress={() => {
         if (onBack) {
           onBack();

From ed21c558b387efd2753000a3f381205b573d476e Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 01:49:03 +0200
Subject: [PATCH 10/17] fix: attachment removal accessibility

---
 .../AttachmentRemoveControl.tsx                | 18 ++++++++++++++++--
 package/src/components/Reply/Reply.tsx         |  6 +-----
 package/src/i18n/en.json                       |  1 +
 package/src/i18n/es.json                       |  1 +
 package/src/i18n/fr.json                       |  1 +
 package/src/i18n/he.json                       |  1 +
 package/src/i18n/hi.json                       |  1 +
 package/src/i18n/it.json                       |  1 +
 package/src/i18n/ja.json                       |  1 +
 package/src/i18n/ko.json                       |  1 +
 package/src/i18n/nl.json                       |  1 +
 package/src/i18n/pt-br.json                    |  1 +
 package/src/i18n/ru.json                       |  1 +
 package/src/i18n/tr.json                       |  1 +
 14 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/package/src/components/MessageInput/components/AttachmentPreview/AttachmentRemoveControl.tsx b/package/src/components/MessageInput/components/AttachmentPreview/AttachmentRemoveControl.tsx
index d45aa112e0..85951d23b1 100644
--- a/package/src/components/MessageInput/components/AttachmentPreview/AttachmentRemoveControl.tsx
+++ b/package/src/components/MessageInput/components/AttachmentPreview/AttachmentRemoveControl.tsx
@@ -2,13 +2,22 @@ import React, { useMemo } from 'react';
 
 import { Pressable, PressableProps, StyleSheet } from 'react-native';
 
+import { useA11yLabel } from '../../../../a11y/hooks/useA11yLabel';
 import { useTheme } from '../../../../contexts/themeContext/ThemeContext';
 import { NewClose } from '../../../../icons/xmark';
 import { primitives } from '../../../../theme';
 
-type AttachmentRemoveControlProps = PressableProps;
+type AttachmentRemoveControlProps = PressableProps & {
+  accessibilityLabelKey?: string;
+  accessibilityLabelParams?: Record<string, unknown>;
+};
 
-export const AttachmentRemoveControl = ({ onPress, ...rest }: AttachmentRemoveControlProps) => {
+export const AttachmentRemoveControl = ({
+  accessibilityLabelKey = 'a11y/Remove attachment',
+  accessibilityLabelParams,
+  onPress,
+  ...rest
+}: AttachmentRemoveControlProps) => {
   const {
     theme: {
       semantics,
@@ -18,9 +27,14 @@ export const AttachmentRemoveControl = ({ onPress, ...rest }: AttachmentRemoveCo
     },
   } = useTheme();
   const styles = useStyles();
+  const translatedAccessibilityLabel = useA11yLabel(
+    accessibilityLabelKey,
+    accessibilityLabelParams,
+  );
 
   return (
     <Pressable
+      accessibilityLabel={translatedAccessibilityLabel}
       accessibilityRole='button'
       hitSlop={15}
       onPress={onPress}
diff --git a/package/src/components/Reply/Reply.tsx b/package/src/components/Reply/Reply.tsx
index 88213e4e2c..819388e542 100644
--- a/package/src/components/Reply/Reply.tsx
+++ b/package/src/components/Reply/Reply.tsx
@@ -20,7 +20,6 @@ import {
 
 import { ReplyMessageView } from './ReplyMessageView';
 
-import { useA11yLabel } from '../../a11y/hooks/useA11yLabel';
 import { useChatContext } from '../../contexts/chatContext/ChatContext';
 import { useComponentsContext } from '../../contexts/componentsContext/ComponentsContext';
 import {
@@ -134,9 +133,6 @@ export const ReplyWithContext = (props: ReplyPropsWithContext) => {
     },
   } = useTheme();
   const styles = useStyles();
-  const dismissAccessibilityLabel = useA11yLabel(
-    mode === 'edit' ? 'a11y/Remove edit' : 'a11y/Remove reply',
-  );
 
   const title = useMemo(
     () =>
@@ -175,7 +171,7 @@ export const ReplyWithContext = (props: ReplyPropsWithContext) => {
       {onDismiss ? (
         <View style={[styles.dismissWrapper, dismissWrapper, stylesProp?.dismissWrapper]}>
           <AttachmentRemoveControl
-            accessibilityLabel={dismissAccessibilityLabel}
+            accessibilityLabelKey={mode === 'edit' ? 'a11y/Remove edit' : 'a11y/Remove reply'}
             onPress={onDismiss}
           />
         </View>
diff --git a/package/src/i18n/en.json b/package/src/i18n/en.json
index 2943a5fd01..732f1d745e 100644
--- a/package/src/i18n/en.json
+++ b/package/src/i18n/en.json
@@ -265,6 +265,7 @@
   "a11y/{{count}} new messages": "{{count}} new messages",
   "a11y/Add attachment": "Add attachment",
   "a11y/Close attachments": "Close attachments",
+  "a11y/Remove attachment": "Remove Attachment",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/es.json b/package/src/i18n/es.json
index e6cd82fda7..53fe6ce2fc 100644
--- a/package/src/i18n/es.json
+++ b/package/src/i18n/es.json
@@ -265,6 +265,7 @@
   "a11y/{{count}} new messages": "{{count}} mensajes nuevos",
   "a11y/Add attachment": "Add attachment",
   "a11y/Close attachments": "Close attachments",
+  "a11y/Remove attachment": "Remove Attachment",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/fr.json b/package/src/i18n/fr.json
index 0ac948a711..58d52130c1 100644
--- a/package/src/i18n/fr.json
+++ b/package/src/i18n/fr.json
@@ -265,6 +265,7 @@
   "a11y/{{count}} new messages": "{{count}} nouveaux messages",
   "a11y/Add attachment": "Add attachment",
   "a11y/Close attachments": "Close attachments",
+  "a11y/Remove attachment": "Remove Attachment",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/he.json b/package/src/i18n/he.json
index 391f256337..48c24d4d3f 100644
--- a/package/src/i18n/he.json
+++ b/package/src/i18n/he.json
@@ -265,6 +265,7 @@
   "a11y/{{count}} new messages": "{{count}} הודעות חדשות",
   "a11y/Add attachment": "Add attachment",
   "a11y/Close attachments": "Close attachments",
+  "a11y/Remove attachment": "Remove Attachment",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/hi.json b/package/src/i18n/hi.json
index d07ee6da85..51b0a767b4 100644
--- a/package/src/i18n/hi.json
+++ b/package/src/i18n/hi.json
@@ -265,6 +265,7 @@
   "a11y/{{count}} new messages": "{{count}} नए संदेश",
   "a11y/Add attachment": "Add attachment",
   "a11y/Close attachments": "Close attachments",
+  "a11y/Remove attachment": "Remove Attachment",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/it.json b/package/src/i18n/it.json
index a60339c150..7e83e2ad95 100644
--- a/package/src/i18n/it.json
+++ b/package/src/i18n/it.json
@@ -265,6 +265,7 @@
   "a11y/{{count}} new messages": "{{count}} nuovi messaggi",
   "a11y/Add attachment": "Add attachment",
   "a11y/Close attachments": "Close attachments",
+  "a11y/Remove attachment": "Remove Attachment",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/ja.json b/package/src/i18n/ja.json
index a78b776e88..f1a5feaccb 100644
--- a/package/src/i18n/ja.json
+++ b/package/src/i18n/ja.json
@@ -265,6 +265,7 @@
   "a11y/{{count}} new messages": "新しいメッセージ{{count}}件",
   "a11y/Add attachment": "Add attachment",
   "a11y/Close attachments": "Close attachments",
+  "a11y/Remove attachment": "Remove Attachment",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/ko.json b/package/src/i18n/ko.json
index 473ce95a03..d6ec9cb847 100644
--- a/package/src/i18n/ko.json
+++ b/package/src/i18n/ko.json
@@ -265,6 +265,7 @@
   "a11y/{{count}} new messages": "새 메시지 {{count}}개",
   "a11y/Add attachment": "Add attachment",
   "a11y/Close attachments": "Close attachments",
+  "a11y/Remove attachment": "Remove Attachment",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/nl.json b/package/src/i18n/nl.json
index 39e41d88f8..90867054c7 100644
--- a/package/src/i18n/nl.json
+++ b/package/src/i18n/nl.json
@@ -265,6 +265,7 @@
   "a11y/{{count}} new messages": "{{count}} nieuwe berichten",
   "a11y/Add attachment": "Add attachment",
   "a11y/Close attachments": "Close attachments",
+  "a11y/Remove attachment": "Remove Attachment",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/pt-br.json b/package/src/i18n/pt-br.json
index 26c37b2f9e..333860faa5 100644
--- a/package/src/i18n/pt-br.json
+++ b/package/src/i18n/pt-br.json
@@ -265,6 +265,7 @@
   "a11y/{{count}} new messages": "{{count}} novas mensagens",
   "a11y/Add attachment": "Add attachment",
   "a11y/Close attachments": "Close attachments",
+  "a11y/Remove attachment": "Remove Attachment",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/ru.json b/package/src/i18n/ru.json
index c9e7d20545..1d7bdacba0 100644
--- a/package/src/i18n/ru.json
+++ b/package/src/i18n/ru.json
@@ -265,6 +265,7 @@
   "a11y/{{count}} new messages": "{{count}} новых сообщений",
   "a11y/Add attachment": "Add attachment",
   "a11y/Close attachments": "Close attachments",
+  "a11y/Remove attachment": "Remove Attachment",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",
diff --git a/package/src/i18n/tr.json b/package/src/i18n/tr.json
index 07332bab7e..cd8f6aa61c 100644
--- a/package/src/i18n/tr.json
+++ b/package/src/i18n/tr.json
@@ -265,6 +265,7 @@
   "a11y/{{count}} new messages": "{{count}} yeni mesaj",
   "a11y/Add attachment": "Add attachment",
   "a11y/Close attachments": "Close attachments",
+  "a11y/Remove attachment": "Remove Attachment",
   "a11y/Close poll": "Close poll",
   "a11y/Close poll creation": "Close poll creation",
   "a11y/Create poll": "Create poll",

From 2326fc113a023e3ae255b5b0b6baaa119dc7aade Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 01:56:13 +0200
Subject: [PATCH 11/17] fix: tests and lint

---
 .../offline-support/offline-feature.tsx       | 74 ++++++++++---------
 .../__tests__/ScrollToBottomButton.test.tsx   |  4 +-
 .../ScrollToBottomButton.test.tsx.snap        |  2 +
 .../__tests__/MessageUserReactions.test.tsx   |  3 +-
 package/src/mock-builders/DB/mock.ts          |  3 +-
 package/src/test-utils/BetterSqlite.ts        |  4 +-
 6 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/package/src/__tests__/offline-support/offline-feature.tsx b/package/src/__tests__/offline-support/offline-feature.tsx
index 0db351df0a..0270c67d7c 100644
--- a/package/src/__tests__/offline-support/offline-feature.tsx
+++ b/package/src/__tests__/offline-support/offline-feature.tsx
@@ -643,26 +643,29 @@ export const Generic = () => {
       await waitFor(() => expect(screen.getByTestId('channel-list-view')).toBeTruthy());
       const removedChannel = channels[getRandomInt(0, channels.length - 1)].channel;
       act(() => dispatchNotificationRemovedFromChannel(chatClient, removedChannel));
-      await waitFor(async () => {
-        const channelIdsOnUI = screen
-          .queryAllByLabelText('list-item')
-          .map(
-            (node) =>
-              (node as unknown as { _fiber: { pendingProps: { testID: string } } })._fiber
-                .pendingProps.testID,
-          );
-        expect(channelIdsOnUI.includes(removedChannel.cid)).toBeFalsy();
-        await expectCIDsOnUIToBeInDB(screen.queryAllByLabelText);
+      await waitFor(
+        async () => {
+          const channelIdsOnUI = screen
+            .queryAllByLabelText('list-item')
+            .map(
+              (node) =>
+                (node as unknown as { _fiber: { pendingProps: { testID: string } } })._fiber
+                  .pendingProps.testID,
+            );
+          expect(channelIdsOnUI.includes(removedChannel.cid)).toBeFalsy();
+          await expectCIDsOnUIToBeInDB(screen.queryAllByLabelText);
 
-        const channelsRows = await BetterSqlite.selectFromTable('channels');
-        const matchingRows = channelsRows.filter((c) => c.id === removedChannel.id);
+          const channelsRows = await BetterSqlite.selectFromTable('channels');
+          const matchingRows = channelsRows.filter((c) => c.id === removedChannel.id);
 
-        const messagesRows = await BetterSqlite.selectFromTable('messages');
-        const matchingMessagesRows = messagesRows.filter((m) => m.cid === removedChannel.cid);
+          const messagesRows = await BetterSqlite.selectFromTable('messages');
+          const matchingMessagesRows = messagesRows.filter((m) => m.cid === removedChannel.cid);
 
-        expect(matchingRows.length).toBe(0);
-        expect(matchingMessagesRows.length).toBe(0);
-      });
+          expect(matchingRows.length).toBe(0);
+          expect(matchingMessagesRows.length).toBe(0);
+        },
+        { timeout: 5000 },
+      );
     });
 
     it('should remove the channel from DB if the channel is deleted', async () => {
@@ -674,26 +677,29 @@ export const Generic = () => {
       await waitFor(() => expect(screen.getByTestId('channel-list-view')).toBeTruthy());
       const removedChannel = channels[getRandomInt(0, channels.length - 1)].channel;
       act(() => dispatchChannelDeletedEvent(chatClient, removedChannel));
-      await waitFor(async () => {
-        const channelIdsOnUI = screen
-          .queryAllByLabelText('list-item')
-          .map(
-            (node) =>
-              (node as unknown as { _fiber: { pendingProps: { testID: string } } })._fiber
-                .pendingProps.testID,
-          );
-        expect(channelIdsOnUI.includes(removedChannel.cid)).toBeFalsy();
-        await expectCIDsOnUIToBeInDB(screen.queryAllByLabelText);
+      await waitFor(
+        async () => {
+          const channelIdsOnUI = screen
+            .queryAllByLabelText('list-item')
+            .map(
+              (node) =>
+                (node as unknown as { _fiber: { pendingProps: { testID: string } } })._fiber
+                  .pendingProps.testID,
+            );
+          expect(channelIdsOnUI.includes(removedChannel.cid)).toBeFalsy();
+          await expectCIDsOnUIToBeInDB(screen.queryAllByLabelText);
 
-        const channelsRows = await BetterSqlite.selectFromTable('channels');
-        const matchingRows = channelsRows.filter((c) => c.id === removedChannel.id);
+          const channelsRows = await BetterSqlite.selectFromTable('channels');
+          const matchingRows = channelsRows.filter((c) => c.id === removedChannel.id);
 
-        const messagesRows = await BetterSqlite.selectFromTable('messages');
-        const matchingMessagesRows = messagesRows.filter((m) => m.cid === removedChannel.cid);
+          const messagesRows = await BetterSqlite.selectFromTable('messages');
+          const matchingMessagesRows = messagesRows.filter((m) => m.cid === removedChannel.cid);
 
-        expect(matchingRows.length).toBe(0);
-        expect(matchingMessagesRows.length).toBe(0);
-      });
+          expect(matchingRows.length).toBe(0);
+          expect(matchingMessagesRows.length).toBe(0);
+        },
+        { timeout: 5000 },
+      );
     });
 
     it('should correctly mark the channel as hidden in the db', async () => {
diff --git a/package/src/components/MessageList/__tests__/ScrollToBottomButton.test.tsx b/package/src/components/MessageList/__tests__/ScrollToBottomButton.test.tsx
index a057b76254..1445742812 100644
--- a/package/src/components/MessageList/__tests__/ScrollToBottomButton.test.tsx
+++ b/package/src/components/MessageList/__tests__/ScrollToBottomButton.test.tsx
@@ -75,8 +75,8 @@ describe('ScrollToBottomButton', () => {
       </ThemeProvider>,
     );
     await waitFor(() => {
-      expect(getByTestId('unread-count')).toBeTruthy();
-      expect(getByText('3')).toBeTruthy();
+      expect(getByTestId('unread-count', { includeHiddenElements: true })).toBeTruthy();
+      expect(getByText('3', { includeHiddenElements: true })).toBeTruthy();
     });
   });
 
diff --git a/package/src/components/MessageList/__tests__/__snapshots__/ScrollToBottomButton.test.tsx.snap b/package/src/components/MessageList/__tests__/__snapshots__/ScrollToBottomButton.test.tsx.snap
index 5998a9fb8a..0709730d90 100644
--- a/package/src/components/MessageList/__tests__/__snapshots__/ScrollToBottomButton.test.tsx.snap
+++ b/package/src/components/MessageList/__tests__/__snapshots__/ScrollToBottomButton.test.tsx.snap
@@ -186,6 +186,8 @@ exports[`ScrollToBottomButton should render the message notification and match s
     </View>
   </View>
   <View
+    accessibilityElementsHidden={true}
+    importantForAccessibility="no-hide-descendants"
     style={
       {
         "position": "absolute",
diff --git a/package/src/components/MessageMenu/__tests__/MessageUserReactions.test.tsx b/package/src/components/MessageMenu/__tests__/MessageUserReactions.test.tsx
index 58ffecc253..80e4117d72 100644
--- a/package/src/components/MessageMenu/__tests__/MessageUserReactions.test.tsx
+++ b/package/src/components/MessageMenu/__tests__/MessageUserReactions.test.tsx
@@ -2,10 +2,11 @@ import React from 'react';
 
 import { Text } from 'react-native';
 
+import type { ReactTestInstance } from 'react-test-renderer';
+
 import { fireEvent, render } from '@testing-library/react-native';
 
 import { ReactionResponse } from 'stream-chat';
-import type { ReactTestInstance } from 'react-test-renderer';
 
 import { WithComponents } from '../../../contexts/componentsContext/ComponentsContext';
 import {
diff --git a/package/src/mock-builders/DB/mock.ts b/package/src/mock-builders/DB/mock.ts
index faa2112f14..9380f20bc4 100644
--- a/package/src/mock-builders/DB/mock.ts
+++ b/package/src/mock-builders/DB/mock.ts
@@ -3,10 +3,11 @@ import Sqlite3 from 'better-sqlite3';
 import type { PreparedQueries } from '../../store/types';
 
 let db: Sqlite3.Database;
+const testDbName = `foobar-${process.env.JEST_WORKER_ID ?? '0'}.db`;
 
 export const sqliteMock = {
   open: () => {
-    db = new Sqlite3('foobar.db');
+    db = new Sqlite3(testDbName);
     return {
       close: () => {
         db.close();
diff --git a/package/src/test-utils/BetterSqlite.ts b/package/src/test-utils/BetterSqlite.ts
index 73666cc585..952fbec402 100644
--- a/package/src/test-utils/BetterSqlite.ts
+++ b/package/src/test-utils/BetterSqlite.ts
@@ -2,11 +2,13 @@ import Database, { type Database as DatabaseType } from 'better-sqlite3';
 
 import { tables } from '../store/schema';
 
+const testDbName = `foobar-${process.env.JEST_WORKER_ID ?? '0'}.db`;
+
 export class BetterSqlite {
   static db: DatabaseType | null = null;
 
   static openDB = (): void => {
-    BetterSqlite.db = new Database('foobar.db');
+    BetterSqlite.db = new Database(testDbName);
   };
 
   static closeDB = (): void => {

From d4fd658460eff9a5bfcfb669dfa39eea2aeb0462 Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 11:02:28 +0200
Subject: [PATCH 12/17] fix: audio button extra action

---
 package/src/a11y/a11yUtils.ts                 |   4 +-
 .../MessageList/MessageFlashList.tsx          |  18 +-
 .../components/MessageList/MessageList.tsx    |  18 +-
 .../MessageList/ScrollToBottomButton.tsx      |   4 +-
 .../__tests__/MessageList.test.tsx            | 186 ++++++++++++++++++
 .../useScrollToBottomAccessibilityAction.ts   |  74 +++++++
 6 files changed, 298 insertions(+), 6 deletions(-)
 create mode 100644 package/src/components/MessageList/hooks/useScrollToBottomAccessibilityAction.ts

diff --git a/package/src/a11y/a11yUtils.ts b/package/src/a11y/a11yUtils.ts
index b026d47fde..a6fdfb027d 100644
--- a/package/src/a11y/a11yUtils.ts
+++ b/package/src/a11y/a11yUtils.ts
@@ -34,10 +34,10 @@ export const formatAccessibilityValue = ({
 /**
  * Merge two `accessibilityActions` arrays, deduplicating by `name` (later wins).
  */
-type A11yAction = { name: string; label?: string };
+type A11yAction = Readonly<{ name: string; label?: string }>;
 
 export const mergeAccessibilityActions = (
-  ...actionLists: Array<A11yAction[] | undefined>
+  ...actionLists: Array<ReadonlyArray<A11yAction> | undefined>
 ): A11yAction[] => {
   const byName = new Map<string, A11yAction>();
   for (const list of actionLists) {
diff --git a/package/src/components/MessageList/MessageFlashList.tsx b/package/src/components/MessageList/MessageFlashList.tsx
index f3f7318933..36f5877855 100644
--- a/package/src/components/MessageList/MessageFlashList.tsx
+++ b/package/src/components/MessageList/MessageFlashList.tsx
@@ -14,6 +14,7 @@ import type { FlashListProps, FlashListRef } from '@shopify/flash-list';
 import type { Channel, Event, LocalMessage, MessageResponse } from 'stream-chat';
 
 import { useMessageList } from './hooks/useMessageList';
+import { useScrollToBottomAccessibilityAction } from './hooks/useScrollToBottomAccessibilityAction';
 import { useShouldScrollToRecentOnNewOwnMessage } from './hooks/useShouldScrollToRecentOnNewOwnMessage';
 import { useTypingUsers } from './hooks/useTypingUsers';
 import { InlineLoadingMoreIndicator } from './InlineLoadingMoreIndicator';
@@ -920,6 +921,19 @@ const MessageFlashListWithContext = (props: MessageFlashListPropsWithContext) =>
     });
   });
 
+  const scrollToBottomUnreadCount =
+    scrollToBottomButtonVisible && !threadList ? channel?.countUnread() : undefined;
+  const {
+    accessibilityActions: messageListAccessibilityActions,
+    onAccessibilityAction: messageListOnAccessibilityAction,
+  } = useScrollToBottomAccessibilityAction({
+    accessibilityActions: additionalFlashListProps?.accessibilityActions,
+    onAccessibilityAction: additionalFlashListProps?.onAccessibilityAction,
+    onScrollToBottom: goToNewMessages,
+    unreadCount: scrollToBottomUnreadCount,
+    visible: scrollToBottomButtonVisible,
+  });
+
   const dismissImagePicker = useStableCallback(() => {
     if (attachmentPickerStore.state.getLatestValue().selectedPicker) {
       attachmentPickerStore.setSelectedPicker(undefined);
@@ -1072,6 +1086,8 @@ const MessageFlashListWithContext = (props: MessageFlashListPropsWithContext) =>
             testID='message-flash-list'
             viewabilityConfig={flatListViewabilityConfig}
             {...additionalFlashListPropsExcludingStyle}
+            accessibilityActions={messageListAccessibilityActions}
+            onAccessibilityAction={messageListOnAccessibilityAction}
           />
         </MessageListItemProvider>
       )}
@@ -1094,7 +1110,7 @@ const MessageFlashListWithContext = (props: MessageFlashListPropsWithContext) =>
         <ScrollToBottomButton
           onPress={goToNewMessages}
           showNotification={scrollToBottomButtonVisible}
-          unreadCount={threadList ? 0 : channel?.countUnread()}
+          unreadCount={scrollToBottomUnreadCount}
         />
       </Animated.View>
       <NetworkDownIndicator />
diff --git a/package/src/components/MessageList/MessageList.tsx b/package/src/components/MessageList/MessageList.tsx
index c92486ff83..ccca5b4b67 100644
--- a/package/src/components/MessageList/MessageList.tsx
+++ b/package/src/components/MessageList/MessageList.tsx
@@ -18,6 +18,7 @@ import debounce from 'lodash/debounce';
 import type { Channel, Event, LocalMessage, MessageResponse } from 'stream-chat';
 
 import { useMessageList } from './hooks/useMessageList';
+import { useScrollToBottomAccessibilityAction } from './hooks/useScrollToBottomAccessibilityAction';
 import { useShouldScrollToRecentOnNewOwnMessage } from './hooks/useShouldScrollToRecentOnNewOwnMessage';
 
 import { InlineLoadingMoreIndicator } from './InlineLoadingMoreIndicator';
@@ -1046,6 +1047,19 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
     });
   });
 
+  const scrollToBottomUnreadCount =
+    scrollToBottomButtonVisible && !threadList ? channel?.countUnread() : undefined;
+  const {
+    accessibilityActions: messageListAccessibilityActions,
+    onAccessibilityAction: messageListOnAccessibilityAction,
+  } = useScrollToBottomAccessibilityAction({
+    accessibilityActions: additionalFlatListProps?.accessibilityActions,
+    onAccessibilityAction: additionalFlatListProps?.onAccessibilityAction,
+    onScrollToBottom: goToNewMessages,
+    unreadCount: scrollToBottomUnreadCount,
+    visible: scrollToBottomButtonVisible,
+  });
+
   const scrollToIndexFailedRetryCountRef = useRef<number>(0);
   const failScrollTimeoutId = useRef<ReturnType<typeof setTimeout>>(undefined);
   const onScrollToIndexFailedRef = useRef<
@@ -1298,6 +1312,8 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
             testID='message-flat-list'
             viewabilityConfig={flatListViewabilityConfig}
             {...additionalFlatListPropsExcludingStyle}
+            accessibilityActions={messageListAccessibilityActions}
+            onAccessibilityAction={messageListOnAccessibilityAction}
           />
         </MessageListItemProvider>
       )}
@@ -1321,7 +1337,7 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
           <ScrollToBottomButton
             onPress={goToNewMessages}
             showNotification={scrollToBottomButtonVisible}
-            unreadCount={threadList ? 0 : channel?.countUnread()}
+            unreadCount={scrollToBottomUnreadCount}
           />
         </Animated.View>
       ) : null}
diff --git a/package/src/components/MessageList/ScrollToBottomButton.tsx b/package/src/components/MessageList/ScrollToBottomButton.tsx
index 54d885bf7c..40e89d862d 100644
--- a/package/src/components/MessageList/ScrollToBottomButton.tsx
+++ b/package/src/components/MessageList/ScrollToBottomButton.tsx
@@ -9,8 +9,8 @@ import { primitives } from '../../theme';
 import { BadgeNotification } from '../ui';
 import { Button } from '../ui/Button';
 
-const SCROLL_TO_BOTTOM_ACCESSIBILITY_LABEL_KEY = 'a11y/Scroll to bottom';
-const SCROLL_TO_BOTTOM_WITH_COUNT_ACCESSIBILITY_LABEL_KEY =
+export const SCROLL_TO_BOTTOM_ACCESSIBILITY_LABEL_KEY = 'a11y/Scroll to bottom';
+export const SCROLL_TO_BOTTOM_WITH_COUNT_ACCESSIBILITY_LABEL_KEY =
   'a11y/Scroll to bottom, {{count}} new messages';
 
 export type ScrollToBottomButtonProps = {
diff --git a/package/src/components/MessageList/__tests__/MessageList.test.tsx b/package/src/components/MessageList/__tests__/MessageList.test.tsx
index e5880f739d..aceab99227 100644
--- a/package/src/components/MessageList/__tests__/MessageList.test.tsx
+++ b/package/src/components/MessageList/__tests__/MessageList.test.tsx
@@ -20,6 +20,7 @@ import { channelInitialState } from '../../Channel/hooks/useChannelDataState';
 import * as MessageListPaginationHook from '../../Channel/hooks/useMessageListPagination';
 import { Chat } from '../../Chat/Chat';
 
+import { SCROLL_TO_BOTTOM_ACCESSIBILITY_ACTION_NAME } from '../hooks/useScrollToBottomAccessibilityAction';
 import { MessageList } from '../MessageList';
 
 describe('MessageList', () => {
@@ -487,6 +488,49 @@ describe('MessageList pagination', () => {
       }));
   };
 
+  const renderMessageListForScrollToBottom = async ({
+    additionalFlatListProps,
+    accessibility = { enabled: true },
+    staleChannelState = false,
+  }: {
+    additionalFlatListProps?: React.ComponentProps<typeof MessageList>['additionalFlatListProps'];
+    accessibility?: React.ComponentProps<typeof OverlayProvider>['accessibility'];
+    staleChannelState?: boolean;
+  } = {}) => {
+    const user1 = generateUser();
+    const mockedChannel = generateChannelResponse({
+      members: [generateMember({ user: user1 })],
+      messages: Array.from({ length: 10 }, (_, i) => generateMessage({ text: `message-${i}` })),
+    });
+
+    const chatClient = await getTestClientWithUser({ id: 'testID' });
+    useMockedApis(chatClient, [getOrCreateChannelApi(mockedChannel)]);
+    const channel = chatClient.channel('messaging', mockedChannel.channel.id);
+    await channel.watch();
+
+    if (staleChannelState) {
+      channel.state = {
+        ...channelInitialState,
+        latestMessages: [],
+        members: Object.fromEntries(
+          Array.from({ length: 10 }, (_, i) => [i, generateMember({ user_id: String(i) })]),
+        ),
+        messages: Array.from({ length: 10 }, (_, i) => generateMessage({ id: String(i) })),
+        messageSets: [{ isCurrent: true, isLatest: true }],
+      } as unknown as typeof channel.state;
+    }
+
+    return render(
+      <OverlayProvider accessibility={accessibility}>
+        <Chat client={chatClient}>
+          <Channel channel={channel}>
+            <MessageList additionalFlatListProps={additionalFlatListProps} />
+          </Channel>
+        </Chat>
+      </OverlayProvider>,
+    );
+  };
+
   it('should load more recent messages when the user scrolls to the start of the list', async () => {
     const user1 = generateUser();
     const mockedChannel = generateChannelResponse({
@@ -630,4 +674,146 @@ describe('MessageList pagination', () => {
       expect(loadLatestMessages).toHaveBeenCalledTimes(1);
     });
   });
+
+  it('should not expose the scroll to bottom accessibility action when hidden', async () => {
+    const { getByTestId, queryByTestId } = await renderMessageListForScrollToBottom();
+
+    await waitFor(() => {
+      expect(queryByTestId('scroll-to-bottom-button')).toBeFalsy();
+      expect(getByTestId('message-flat-list').props.accessibilityActions).toBeUndefined();
+    });
+  });
+
+  it('should not expose the SDK scroll to bottom action when SDK accessibility is disabled', async () => {
+    const { getByTestId, queryByTestId } = await renderMessageListForScrollToBottom({
+      accessibility: { enabled: false },
+      staleChannelState: true,
+    });
+
+    act(() => {
+      fireEvent(getByTestId('message-flat-list'), 'scroll', {
+        nativeEvent: {
+          contentOffset: { y: 1900 },
+          contentSize: { height: 2000, width: 200 },
+          layoutMeasurement: { height: 400, width: 200 },
+        },
+      });
+    });
+
+    await waitFor(() => {
+      expect(queryByTestId('scroll-to-bottom-button')).toBeTruthy();
+      expect(getByTestId('message-flat-list').props.accessibilityActions ?? []).not.toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            name: SCROLL_TO_BOTTOM_ACCESSIBILITY_ACTION_NAME,
+          }),
+        ]),
+      );
+    });
+  });
+
+  it('should preserve additional message list accessibility actions when scroll to bottom is hidden', async () => {
+    const { getByTestId, queryByTestId } = await renderMessageListForScrollToBottom({
+      additionalFlatListProps: {
+        accessibilityActions: [{ label: 'Custom action', name: 'customAction' }],
+      },
+    });
+
+    await waitFor(() => {
+      expect(queryByTestId('scroll-to-bottom-button')).toBeFalsy();
+      expect(getByTestId('message-flat-list').props.accessibilityActions).toEqual([
+        { label: 'Custom action', name: 'customAction' },
+      ]);
+    });
+  });
+
+  it('should expose scroll to bottom as a message list accessibility action when visible', async () => {
+    const loadLatestMessages = jest.fn(() => Promise.resolve());
+    mockedHook({ loadLatestMessages });
+
+    const { getByTestId } = await renderMessageListForScrollToBottom({
+      staleChannelState: true,
+    });
+
+    act(() => {
+      fireEvent(getByTestId('message-flat-list'), 'scroll', {
+        nativeEvent: {
+          contentOffset: { y: 1900 },
+          contentSize: { height: 2000, width: 200 },
+          layoutMeasurement: { height: 400, width: 200 },
+        },
+      });
+    });
+
+    await waitFor(() => {
+      expect(getByTestId('message-flat-list').props.accessibilityActions).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            label: expect.stringContaining('Scroll to bottom'),
+            name: SCROLL_TO_BOTTOM_ACCESSIBILITY_ACTION_NAME,
+          }),
+        ]),
+      );
+    });
+
+    await act(async () => {
+      await getByTestId('message-flat-list').props.onAccessibilityAction({
+        nativeEvent: { actionName: SCROLL_TO_BOTTOM_ACCESSIBILITY_ACTION_NAME },
+      });
+    });
+
+    expect(loadLatestMessages).toHaveBeenCalledTimes(1);
+  });
+
+  it('should preserve additional message list accessibility actions', async () => {
+    const loadLatestMessages = jest.fn(() => Promise.resolve());
+    const onAccessibilityAction = jest.fn();
+    mockedHook({ loadLatestMessages });
+
+    const { getByTestId } = await renderMessageListForScrollToBottom({
+      additionalFlatListProps: {
+        accessibilityActions: [{ label: 'Custom action', name: 'customAction' }],
+        onAccessibilityAction,
+      },
+      staleChannelState: true,
+    });
+
+    act(() => {
+      fireEvent(getByTestId('message-flat-list'), 'scroll', {
+        nativeEvent: {
+          contentOffset: { y: 1900 },
+          contentSize: { height: 2000, width: 200 },
+          layoutMeasurement: { height: 400, width: 200 },
+        },
+      });
+    });
+
+    await waitFor(() => {
+      expect(getByTestId('message-flat-list').props.accessibilityActions).toEqual(
+        expect.arrayContaining([
+          { label: 'Custom action', name: 'customAction' },
+          expect.objectContaining({
+            label: expect.stringContaining('Scroll to bottom'),
+            name: SCROLL_TO_BOTTOM_ACCESSIBILITY_ACTION_NAME,
+          }),
+        ]),
+      );
+    });
+
+    act(() => {
+      getByTestId('message-flat-list').props.onAccessibilityAction({
+        nativeEvent: { actionName: 'customAction' },
+      });
+    });
+    expect(onAccessibilityAction).toHaveBeenCalledTimes(1);
+
+    await act(async () => {
+      await getByTestId('message-flat-list').props.onAccessibilityAction({
+        nativeEvent: { actionName: SCROLL_TO_BOTTOM_ACCESSIBILITY_ACTION_NAME },
+      });
+    });
+
+    expect(loadLatestMessages).toHaveBeenCalledTimes(1);
+    expect(onAccessibilityAction).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/package/src/components/MessageList/hooks/useScrollToBottomAccessibilityAction.ts b/package/src/components/MessageList/hooks/useScrollToBottomAccessibilityAction.ts
new file mode 100644
index 0000000000..d14dfdc578
--- /dev/null
+++ b/package/src/components/MessageList/hooks/useScrollToBottomAccessibilityAction.ts
@@ -0,0 +1,74 @@
+import { useContext, useMemo } from 'react';
+
+import type { AccessibilityActionEvent, AccessibilityProps } from 'react-native';
+
+import { mergeAccessibilityActions } from '../../../a11y/a11yUtils';
+import { useAccessibilityContext } from '../../../contexts/accessibilityContext/AccessibilityContext';
+import { TranslationContext } from '../../../contexts/translationContext/TranslationContext';
+import { useStableCallback } from '../../../hooks';
+import {
+  SCROLL_TO_BOTTOM_ACCESSIBILITY_LABEL_KEY,
+  SCROLL_TO_BOTTOM_WITH_COUNT_ACCESSIBILITY_LABEL_KEY,
+} from '../ScrollToBottomButton';
+
+export const SCROLL_TO_BOTTOM_ACCESSIBILITY_ACTION_NAME = 'streamScrollToBottom';
+
+type AccessibilityActions = AccessibilityProps['accessibilityActions'];
+type OnAccessibilityAction = AccessibilityProps['onAccessibilityAction'];
+
+type UseScrollToBottomAccessibilityActionParams = {
+  accessibilityActions?: AccessibilityActions;
+  onAccessibilityAction?: OnAccessibilityAction;
+  onScrollToBottom: () => Promise<void> | void;
+  unreadCount?: number;
+  visible: boolean;
+};
+
+export const useScrollToBottomAccessibilityAction = ({
+  accessibilityActions,
+  onAccessibilityAction,
+  onScrollToBottom,
+  unreadCount,
+  visible,
+}: UseScrollToBottomAccessibilityActionParams) => {
+  const { enabled } = useAccessibilityContext();
+  const { t } = useContext(TranslationContext);
+
+  const scrollToBottomAccessibilityAction = useMemo(() => {
+    if (!enabled || !visible) {
+      return undefined;
+    }
+
+    return [
+      {
+        name: SCROLL_TO_BOTTOM_ACCESSIBILITY_ACTION_NAME,
+        label: unreadCount
+          ? t(SCROLL_TO_BOTTOM_WITH_COUNT_ACCESSIBILITY_LABEL_KEY, { count: unreadCount })
+          : t(SCROLL_TO_BOTTOM_ACCESSIBILITY_LABEL_KEY),
+      },
+    ];
+  }, [enabled, t, unreadCount, visible]);
+
+  const mergedAccessibilityActions = useMemo(
+    () => mergeAccessibilityActions(accessibilityActions, scrollToBottomAccessibilityAction),
+    [accessibilityActions, scrollToBottomAccessibilityAction],
+  );
+
+  const handleAccessibilityAction = useStableCallback((event: AccessibilityActionEvent) => {
+    if (event.nativeEvent.actionName === SCROLL_TO_BOTTOM_ACCESSIBILITY_ACTION_NAME) {
+      return onScrollToBottom();
+    }
+
+    return onAccessibilityAction?.(event);
+  });
+
+  return {
+    accessibilityActions: mergedAccessibilityActions.length
+      ? mergedAccessibilityActions
+      : undefined,
+    onAccessibilityAction:
+      (enabled && visible) || onAccessibilityAction
+        ? handleAccessibilityAction
+        : onAccessibilityAction,
+  };
+};

From ed86906617977c2886e248f433468dae817634e0 Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 13:49:07 +0200
Subject: [PATCH 13/17] fix: android rngh button accesibility

---
 .../hooks/useAccessibilityActivateAction.ts   | 44 +++++++++++++++++++
 package/src/a11y/index.ts                     |  1 +
 package/src/components/ui/Button/Button.tsx   |  7 +++
 3 files changed, 52 insertions(+)
 create mode 100644 package/src/a11y/hooks/useAccessibilityActivateAction.ts

diff --git a/package/src/a11y/hooks/useAccessibilityActivateAction.ts b/package/src/a11y/hooks/useAccessibilityActivateAction.ts
new file mode 100644
index 0000000000..1fce1c7822
--- /dev/null
+++ b/package/src/a11y/hooks/useAccessibilityActivateAction.ts
@@ -0,0 +1,44 @@
+import type { AccessibilityActionEvent, AccessibilityProps } from 'react-native';
+
+import { useAccessibilityContext } from '../../contexts/accessibilityContext/AccessibilityContext';
+
+export type UseAccessibilityActivateActionProps<TPressEvent> = {
+  onPress?: ((event: TPressEvent) => void) | null;
+  shouldHandleActivate?: boolean;
+};
+
+export type UseAccessibilityActivateActionResult =
+  | {
+      accessibilityActions?: AccessibilityProps['accessibilityActions'];
+      onAccessibilityAction?: AccessibilityProps['onAccessibilityAction'];
+    }
+  | undefined;
+
+const accessibilityActivateActions: NonNullable<AccessibilityProps['accessibilityActions']> = [
+  { name: 'activate' },
+];
+
+/**
+ * Adds the standard screen-reader `activate` action for labeled pressables when
+ * SDK accessibility is enabled. Some Android pressable implementations don't
+ * reliably map TalkBack double-tap to `onPress`, so this bridges the generated
+ * accessibility action back to the existing press handler.
+ */
+export const useAccessibilityActivateAction = <TPressEvent>({
+  onPress,
+  shouldHandleActivate = false,
+}: UseAccessibilityActivateActionProps<TPressEvent>): UseAccessibilityActivateActionResult => {
+  const { enabled } = useAccessibilityContext();
+  const shouldHandleAccessibilityActivate = enabled && shouldHandleActivate && !!onPress;
+
+  if (!shouldHandleAccessibilityActivate) return undefined;
+
+  return {
+    accessibilityActions: accessibilityActivateActions,
+    onAccessibilityAction: (event: AccessibilityActionEvent) => {
+      if (event.nativeEvent.actionName !== 'activate') return;
+
+      onPress(event as unknown as TPressEvent);
+    },
+  };
+};
diff --git a/package/src/a11y/index.ts b/package/src/a11y/index.ts
index 55ae3fc9ac..46279098ce 100644
--- a/package/src/a11y/index.ts
+++ b/package/src/a11y/index.ts
@@ -4,3 +4,4 @@ export * from './hooks/useReducedMotionPreference';
 export * from './hooks/useResolvedModalAccessibilityProps';
 export * from './hooks/useAnnounceOnStateChange';
 export * from './hooks/useA11yLabel';
+export * from './hooks/useAccessibilityActivateAction';
diff --git a/package/src/components/ui/Button/Button.tsx b/package/src/components/ui/Button/Button.tsx
index e381b41049..ce024ef4b9 100644
--- a/package/src/components/ui/Button/Button.tsx
+++ b/package/src/components/ui/Button/Button.tsx
@@ -7,6 +7,7 @@ import { buttonPadding, buttonSizes } from './constants';
 import { useButtonStyles } from './hooks/useButtonStyles';
 
 import { useA11yLabel } from '../../../a11y/hooks/useA11yLabel';
+import { useAccessibilityActivateAction } from '../../../a11y/hooks/useAccessibilityActivateAction';
 import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 import { IconProps } from '../../../icons/utils/base';
 import { primitives } from '../../../theme';
@@ -118,6 +119,10 @@ export const Button = ({
     accessibilityLabelParams,
   );
   const resolvedAccessibilityLabel = translatedAccessibilityLabel ?? accessibilityLabel;
+  const accessibilityActivateActionProps = useAccessibilityActivateAction({
+    onPress: rest.onPress,
+    shouldHandleActivate: !!rest.onPress && !disabled && !!resolvedAccessibilityLabel,
+  });
 
   return (
     <View
@@ -137,6 +142,7 @@ export const Button = ({
       onLayout={onLayout}
     >
       <Pressable
+        accessible
         accessibilityLabel={resolvedAccessibilityLabel}
         accessibilityRole='button'
         accessibilityState={accessibilityState}
@@ -152,6 +158,7 @@ export const Button = ({
           styles.container,
         ]}
         disabled={disabled}
+        {...accessibilityActivateActionProps}
         {...rest}
       >
         {PrimaryIcon ? (

From 3d55b989823f72df04ce97f2bb13502055d1f41d Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 13:59:19 +0200
Subject: [PATCH 14/17] fix: actions menu items

---
 .../MessageMenu/MessageActionListItem.tsx          | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/package/src/components/MessageMenu/MessageActionListItem.tsx b/package/src/components/MessageMenu/MessageActionListItem.tsx
index a838a00d09..394eaf63d4 100644
--- a/package/src/components/MessageMenu/MessageActionListItem.tsx
+++ b/package/src/components/MessageMenu/MessageActionListItem.tsx
@@ -3,6 +3,7 @@ import { StyleProp, StyleSheet, Text, TextStyle, View } from 'react-native';
 
 import { Pressable } from 'react-native-gesture-handler';
 
+import { useAccessibilityActivateAction } from '../../a11y/hooks/useAccessibilityActivateAction';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useStableCallback } from '../../hooks';
 import { closeOverlay, scheduleActionOnClose } from '../../state-store';
@@ -74,20 +75,25 @@ export const MessageActionListItem = (props: MessageActionListItemProps) => {
     closeOverlay();
     scheduleActionOnClose(() => action());
   });
+  const accessibilityLabel = `${actionType} action list item`;
+  const accessibilityActivateActionProps = useAccessibilityActivateAction({
+    onPress: onActionPress,
+    shouldHandleActivate: true,
+  });
 
   return (
     <Pressable
+      accessible
+      accessibilityLabel={accessibilityLabel}
       accessibilityRole='menuitem'
+      {...accessibilityActivateActionProps}
       onPress={onActionPress}
       style={({ pressed }) => [
         styles.buttonContainer,
         { backgroundColor: pressed ? semantics.backgroundUtilityPressed : 'transparent' },
       ]}
     >
-      <View
-        accessibilityLabel={`${actionType} action list item`}
-        style={[styles.container, container]}
-      >
+      <View style={[styles.container, container]}>
         <View style={iconTheme}>{icon}</View>
         <Text style={[styles.titleStyle, titleStyle, titleTheme]}>{title}</Text>
       </View>

From 4cd8830cbe04a901e3f60b7edd00c6e203675df6 Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 15:01:16 +0200
Subject: [PATCH 15/17] fix: hide sticky header from accessibility

---
 package/src/components/MessageList/MessageFlashList.tsx | 7 ++++++-
 package/src/components/MessageList/MessageList.tsx      | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/package/src/components/MessageList/MessageFlashList.tsx b/package/src/components/MessageList/MessageFlashList.tsx
index 36f5877855..7a4cadc113 100644
--- a/package/src/components/MessageList/MessageFlashList.tsx
+++ b/package/src/components/MessageList/MessageFlashList.tsx
@@ -1091,7 +1091,12 @@ const MessageFlashListWithContext = (props: MessageFlashListPropsWithContext) =>
           />
         </MessageListItemProvider>
       )}
-      <View style={styles.stickyHeaderContainer}>
+      <View
+        accessibilityElementsHidden
+        accessible={false}
+        importantForAccessibility='no-hide-descendants'
+        style={styles.stickyHeaderContainer}
+      >
         {messageListLengthAfterUpdate && StickyHeader ? (
           <StickyHeader date={stickyHeaderDate} />
         ) : null}
diff --git a/package/src/components/MessageList/MessageList.tsx b/package/src/components/MessageList/MessageList.tsx
index ccca5b4b67..d6b7300b2f 100644
--- a/package/src/components/MessageList/MessageList.tsx
+++ b/package/src/components/MessageList/MessageList.tsx
@@ -1317,7 +1317,12 @@ const MessageListWithContext = (props: MessageListPropsWithContext) => {
           />
         </MessageListItemProvider>
       )}
-      <View style={styles.stickyHeaderContainer}>
+      <View
+        accessibilityElementsHidden
+        accessible={false}
+        importantForAccessibility='no-hide-descendants'
+        style={styles.stickyHeaderContainer}
+      >
         {messageListLengthAfterUpdate && StickyHeader ? (
           <StickyHeader date={stickyHeaderDate} />
         ) : null}

From 5843b6e14e4bffd9af5a693b4fa29633e76b3113 Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 15:21:01 +0200
Subject: [PATCH 16/17] fix: picker items accessibility

---
 .../AttachmentPickerItem.tsx                    | 17 +++++++++++++++--
 package/src/i18n/en.json                        |  4 ++++
 package/src/i18n/es.json                        |  4 ++++
 package/src/i18n/fr.json                        |  4 ++++
 package/src/i18n/he.json                        |  4 ++++
 package/src/i18n/hi.json                        |  4 ++++
 package/src/i18n/it.json                        |  4 ++++
 package/src/i18n/ja.json                        |  4 ++++
 package/src/i18n/ko.json                        |  4 ++++
 package/src/i18n/nl.json                        |  4 ++++
 package/src/i18n/pt-br.json                     |  4 ++++
 package/src/i18n/ru.json                        |  4 ++++
 package/src/i18n/tr.json                        |  4 ++++
 13 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/package/src/components/AttachmentPicker/components/AttachmentMediaPicker/AttachmentPickerItem.tsx b/package/src/components/AttachmentPicker/components/AttachmentMediaPicker/AttachmentPickerItem.tsx
index dbc48c3238..7e274e4273 100644
--- a/package/src/components/AttachmentPicker/components/AttachmentMediaPicker/AttachmentPickerItem.tsx
+++ b/package/src/components/AttachmentPicker/components/AttachmentMediaPicker/AttachmentPickerItem.tsx
@@ -6,6 +6,7 @@ import { FileReference, isLocalImageAttachment, isLocalVideoAttachment } from 's
 
 import { isIosLimited, type PhotoContentItemType } from './shared';
 
+import { useA11yLabel } from '../../../../a11y/hooks/useA11yLabel';
 import { useAttachmentPickerContext } from '../../../../contexts';
 import { useComponentsContext } from '../../../../contexts/componentsContext/ComponentsContext';
 import { useAttachmentManagerState } from '../../../../contexts/messageInputContext/hooks/useAttachmentManagerState';
@@ -52,9 +53,11 @@ const AttachmentVideo = (props: AttachmentPickerItemType) => {
   const { duration: videoDuration, thumb_url } = asset;
 
   const size = vw(100) / (numberOfAttachmentPickerImageColumns || 3) - 2;
+  const selected = selectedIndex !== -1;
+  const accessibilityLabel = useA11yLabel(selected ? 'a11y/Deselect video' : 'a11y/Select video');
 
   const onPressVideo = async () => {
-    if (selectedIndex !== -1) {
+    if (selected) {
       const attachment = attachments[selectedIndex];
       if (attachment) {
         attachmentManager.removeAttachments([attachment.localMetadata.id]);
@@ -70,6 +73,10 @@ const AttachmentVideo = (props: AttachmentPickerItemType) => {
 
   return (
     <BottomSheetTouchableOpacity
+      accessible={accessibilityLabel ? true : undefined}
+      accessibilityLabel={accessibilityLabel}
+      accessibilityRole={accessibilityLabel ? 'button' : undefined}
+      accessibilityState={accessibilityLabel ? { selected } : undefined}
       onPress={onPressVideo}
       style={[
         {
@@ -110,11 +117,13 @@ const AttachmentImage = (props: AttachmentPickerItemType) => {
   );
 
   const size = vw(100) / (numberOfAttachmentPickerImageColumns || 3) - 2;
+  const selected = selectedIndex !== -1;
+  const accessibilityLabel = useA11yLabel(selected ? 'a11y/Deselect image' : 'a11y/Select image');
 
   const { uri } = asset;
 
   const onPressImage = async () => {
-    if (selectedIndex !== -1) {
+    if (selected) {
       const attachment = attachments[selectedIndex];
       if (attachment) {
         await attachmentManager.removeAttachments([attachment.localMetadata.id]);
@@ -130,6 +139,10 @@ const AttachmentImage = (props: AttachmentPickerItemType) => {
 
   return (
     <BottomSheetTouchableOpacity
+      accessible={accessibilityLabel ? true : undefined}
+      accessibilityLabel={accessibilityLabel}
+      accessibilityRole={accessibilityLabel ? 'button' : undefined}
+      accessibilityState={accessibilityLabel ? { selected } : undefined}
       onPress={onPressImage}
       style={[
         {
diff --git a/package/src/i18n/en.json b/package/src/i18n/en.json
index 732f1d745e..b824a9d92c 100644
--- a/package/src/i18n/en.json
+++ b/package/src/i18n/en.json
@@ -271,6 +271,8 @@
   "a11y/Create poll": "Create poll",
   "a11y/Decrease maximum votes": "Decrease maximum votes",
   "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Deselect image": "Deselect image",
+  "a11y/Deselect video": "Deselect video",
   "a11y/Dismiss unread messages": "Dismiss unread messages",
   "a11y/Grid Icon": "Grid Icon",
   "a11y/Hide Overlay": "Hide Overlay",
@@ -285,6 +287,8 @@
   "a11y/Play Pause Button": "Play Pause Button",
   "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
   "a11y/Save edited message": "Save edited message",
+  "a11y/Select image": "Select image",
+  "a11y/Select video": "Select video",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
   "a11y/Start voice recording": "Start voice recording",
diff --git a/package/src/i18n/es.json b/package/src/i18n/es.json
index 53fe6ce2fc..a08d8c2792 100644
--- a/package/src/i18n/es.json
+++ b/package/src/i18n/es.json
@@ -271,6 +271,8 @@
   "a11y/Create poll": "Create poll",
   "a11y/Decrease maximum votes": "Decrease maximum votes",
   "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Deselect image": "Deselect image",
+  "a11y/Deselect video": "Deselect video",
   "a11y/Dismiss unread messages": "Dismiss unread messages",
   "a11y/Grid Icon": "Grid Icon",
   "a11y/Hide Overlay": "Hide Overlay",
@@ -285,6 +287,8 @@
   "a11y/Play Pause Button": "Play Pause Button",
   "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
   "a11y/Save edited message": "Save edited message",
+  "a11y/Select image": "Select image",
+  "a11y/Select video": "Select video",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
   "a11y/Start voice recording": "Start voice recording",
diff --git a/package/src/i18n/fr.json b/package/src/i18n/fr.json
index 58d52130c1..164e7c6436 100644
--- a/package/src/i18n/fr.json
+++ b/package/src/i18n/fr.json
@@ -271,6 +271,8 @@
   "a11y/Create poll": "Create poll",
   "a11y/Decrease maximum votes": "Decrease maximum votes",
   "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Deselect image": "Deselect image",
+  "a11y/Deselect video": "Deselect video",
   "a11y/Dismiss unread messages": "Dismiss unread messages",
   "a11y/Grid Icon": "Grid Icon",
   "a11y/Hide Overlay": "Hide Overlay",
@@ -285,6 +287,8 @@
   "a11y/Play Pause Button": "Play Pause Button",
   "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
   "a11y/Save edited message": "Save edited message",
+  "a11y/Select image": "Select image",
+  "a11y/Select video": "Select video",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
   "a11y/Start voice recording": "Start voice recording",
diff --git a/package/src/i18n/he.json b/package/src/i18n/he.json
index 48c24d4d3f..6a5f4935be 100644
--- a/package/src/i18n/he.json
+++ b/package/src/i18n/he.json
@@ -271,6 +271,8 @@
   "a11y/Create poll": "Create poll",
   "a11y/Decrease maximum votes": "Decrease maximum votes",
   "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Deselect image": "Deselect image",
+  "a11y/Deselect video": "Deselect video",
   "a11y/Dismiss unread messages": "Dismiss unread messages",
   "a11y/Grid Icon": "Grid Icon",
   "a11y/Hide Overlay": "Hide Overlay",
@@ -285,6 +287,8 @@
   "a11y/Play Pause Button": "Play Pause Button",
   "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
   "a11y/Save edited message": "Save edited message",
+  "a11y/Select image": "Select image",
+  "a11y/Select video": "Select video",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
   "a11y/Start voice recording": "Start voice recording",
diff --git a/package/src/i18n/hi.json b/package/src/i18n/hi.json
index 51b0a767b4..849be7797d 100644
--- a/package/src/i18n/hi.json
+++ b/package/src/i18n/hi.json
@@ -271,6 +271,8 @@
   "a11y/Create poll": "Create poll",
   "a11y/Decrease maximum votes": "Decrease maximum votes",
   "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Deselect image": "Deselect image",
+  "a11y/Deselect video": "Deselect video",
   "a11y/Dismiss unread messages": "Dismiss unread messages",
   "a11y/Grid Icon": "Grid Icon",
   "a11y/Hide Overlay": "Hide Overlay",
@@ -285,6 +287,8 @@
   "a11y/Play Pause Button": "Play Pause Button",
   "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
   "a11y/Save edited message": "Save edited message",
+  "a11y/Select image": "Select image",
+  "a11y/Select video": "Select video",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
   "a11y/Start voice recording": "Start voice recording",
diff --git a/package/src/i18n/it.json b/package/src/i18n/it.json
index 7e83e2ad95..a859105182 100644
--- a/package/src/i18n/it.json
+++ b/package/src/i18n/it.json
@@ -271,6 +271,8 @@
   "a11y/Create poll": "Create poll",
   "a11y/Decrease maximum votes": "Decrease maximum votes",
   "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Deselect image": "Deselect image",
+  "a11y/Deselect video": "Deselect video",
   "a11y/Dismiss unread messages": "Dismiss unread messages",
   "a11y/Grid Icon": "Grid Icon",
   "a11y/Hide Overlay": "Hide Overlay",
@@ -285,6 +287,8 @@
   "a11y/Play Pause Button": "Play Pause Button",
   "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
   "a11y/Save edited message": "Save edited message",
+  "a11y/Select image": "Select image",
+  "a11y/Select video": "Select video",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
   "a11y/Start voice recording": "Start voice recording",
diff --git a/package/src/i18n/ja.json b/package/src/i18n/ja.json
index f1a5feaccb..12f181c402 100644
--- a/package/src/i18n/ja.json
+++ b/package/src/i18n/ja.json
@@ -271,6 +271,8 @@
   "a11y/Create poll": "Create poll",
   "a11y/Decrease maximum votes": "Decrease maximum votes",
   "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Deselect image": "Deselect image",
+  "a11y/Deselect video": "Deselect video",
   "a11y/Dismiss unread messages": "Dismiss unread messages",
   "a11y/Grid Icon": "Grid Icon",
   "a11y/Hide Overlay": "Hide Overlay",
@@ -285,6 +287,8 @@
   "a11y/Play Pause Button": "Play Pause Button",
   "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
   "a11y/Save edited message": "Save edited message",
+  "a11y/Select image": "Select image",
+  "a11y/Select video": "Select video",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
   "a11y/Start voice recording": "Start voice recording",
diff --git a/package/src/i18n/ko.json b/package/src/i18n/ko.json
index d6ec9cb847..99828dd22b 100644
--- a/package/src/i18n/ko.json
+++ b/package/src/i18n/ko.json
@@ -271,6 +271,8 @@
   "a11y/Create poll": "Create poll",
   "a11y/Decrease maximum votes": "Decrease maximum votes",
   "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Deselect image": "Deselect image",
+  "a11y/Deselect video": "Deselect video",
   "a11y/Dismiss unread messages": "Dismiss unread messages",
   "a11y/Grid Icon": "Grid Icon",
   "a11y/Hide Overlay": "Hide Overlay",
@@ -285,6 +287,8 @@
   "a11y/Play Pause Button": "Play Pause Button",
   "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
   "a11y/Save edited message": "Save edited message",
+  "a11y/Select image": "Select image",
+  "a11y/Select video": "Select video",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
   "a11y/Start voice recording": "Start voice recording",
diff --git a/package/src/i18n/nl.json b/package/src/i18n/nl.json
index 90867054c7..72b4993f8d 100644
--- a/package/src/i18n/nl.json
+++ b/package/src/i18n/nl.json
@@ -271,6 +271,8 @@
   "a11y/Create poll": "Create poll",
   "a11y/Decrease maximum votes": "Decrease maximum votes",
   "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Deselect image": "Deselect image",
+  "a11y/Deselect video": "Deselect video",
   "a11y/Dismiss unread messages": "Dismiss unread messages",
   "a11y/Grid Icon": "Grid Icon",
   "a11y/Hide Overlay": "Hide Overlay",
@@ -285,6 +287,8 @@
   "a11y/Play Pause Button": "Play Pause Button",
   "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
   "a11y/Save edited message": "Save edited message",
+  "a11y/Select image": "Select image",
+  "a11y/Select video": "Select video",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
   "a11y/Start voice recording": "Start voice recording",
diff --git a/package/src/i18n/pt-br.json b/package/src/i18n/pt-br.json
index 333860faa5..4dfed9d688 100644
--- a/package/src/i18n/pt-br.json
+++ b/package/src/i18n/pt-br.json
@@ -271,6 +271,8 @@
   "a11y/Create poll": "Create poll",
   "a11y/Decrease maximum votes": "Decrease maximum votes",
   "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Deselect image": "Deselect image",
+  "a11y/Deselect video": "Deselect video",
   "a11y/Dismiss unread messages": "Dismiss unread messages",
   "a11y/Grid Icon": "Grid Icon",
   "a11y/Hide Overlay": "Hide Overlay",
@@ -285,6 +287,8 @@
   "a11y/Play Pause Button": "Play Pause Button",
   "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
   "a11y/Save edited message": "Save edited message",
+  "a11y/Select image": "Select image",
+  "a11y/Select video": "Select video",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
   "a11y/Start voice recording": "Start voice recording",
diff --git a/package/src/i18n/ru.json b/package/src/i18n/ru.json
index 1d7bdacba0..85e7839b55 100644
--- a/package/src/i18n/ru.json
+++ b/package/src/i18n/ru.json
@@ -271,6 +271,8 @@
   "a11y/Create poll": "Create poll",
   "a11y/Decrease maximum votes": "Decrease maximum votes",
   "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Deselect image": "Deselect image",
+  "a11y/Deselect video": "Deselect video",
   "a11y/Dismiss unread messages": "Dismiss unread messages",
   "a11y/Grid Icon": "Grid Icon",
   "a11y/Hide Overlay": "Hide Overlay",
@@ -285,6 +287,8 @@
   "a11y/Play Pause Button": "Play Pause Button",
   "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
   "a11y/Save edited message": "Save edited message",
+  "a11y/Select image": "Select image",
+  "a11y/Select video": "Select video",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
   "a11y/Start voice recording": "Start voice recording",
diff --git a/package/src/i18n/tr.json b/package/src/i18n/tr.json
index cd8f6aa61c..f9ee188465 100644
--- a/package/src/i18n/tr.json
+++ b/package/src/i18n/tr.json
@@ -271,6 +271,8 @@
   "a11y/Create poll": "Create poll",
   "a11y/Decrease maximum votes": "Decrease maximum votes",
   "a11y/Delete voice recording": "Delete voice recording",
+  "a11y/Deselect image": "Deselect image",
+  "a11y/Deselect video": "Deselect video",
   "a11y/Dismiss unread messages": "Dismiss unread messages",
   "a11y/Grid Icon": "Grid Icon",
   "a11y/Hide Overlay": "Hide Overlay",
@@ -285,6 +287,8 @@
   "a11y/Play Pause Button": "Play Pause Button",
   "a11y/reaction-button-{{type}}-{{selected}}": "reaction-button-{{type}}-{{selected}}",
   "a11y/Save edited message": "Save edited message",
+  "a11y/Select image": "Select image",
+  "a11y/Select video": "Select video",
   "a11y/Send voice recording": "Send voice recording",
   "a11y/Share Button": "Share Button",
   "a11y/Start voice recording": "Start voice recording",

From bddac6e25c9ee61beeb435f19b8f3b04104478be Mon Sep 17 00:00:00 2001
From: Ivan Sekovanikj <ivan.sekovanikj@getstream.io>
Date: Thu, 7 May 2026 15:40:32 +0200
Subject: [PATCH 17/17] fix: tests and lint

---
 .../__tests__/ChannelListView.test.tsx        | 21 ++++++++++++++-----
 .../__snapshots__/Thread.test.tsx.snap        |  3 +++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/package/src/components/ChannelList/__tests__/ChannelListView.test.tsx b/package/src/components/ChannelList/__tests__/ChannelListView.test.tsx
index 4ea001e435..a6a900a346 100644
--- a/package/src/components/ChannelList/__tests__/ChannelListView.test.tsx
+++ b/package/src/components/ChannelList/__tests__/ChannelListView.test.tsx
@@ -1,13 +1,12 @@
 import React from 'react';
 
 import { cleanup, render, waitFor } from '@testing-library/react-native';
-import type { StreamChat } from 'stream-chat';
+import type { Channel, QueryChannelsRequestType, StreamChat } from 'stream-chat';
 
 import type { ChannelsContextValue } from '../../../contexts/channelsContext/ChannelsContext';
 import { ChannelsProvider } from '../../../contexts/channelsContext/ChannelsContext';
 import { ChatContext, ChatProvider } from '../../../contexts/chatContext/ChatContext';
 import { getOrCreateChannelApi } from '../../../mock-builders/api/getOrCreateChannel';
-import { queryChannelsApi } from '../../../mock-builders/api/queryChannels';
 import { useMockedApis } from '../../../mock-builders/api/useMockedApis';
 import { generateChannelResponse } from '../../../mock-builders/generator/channel';
 import { getTestClientWithUser } from '../../../mock-builders/mock';
@@ -16,6 +15,11 @@ import { ChannelList } from '../ChannelList';
 import { ChannelListView } from '../ChannelListView';
 
 let chatClient: StreamChat;
+let defaultChannels: Channel[];
+let queryChannelsResponse: Channel[];
+
+const queryChannelsOverride: QueryChannelsRequestType = () =>
+  Promise.resolve(queryChannelsResponse);
 
 /**
  * Renders the full ChannelList (which now always uses ChannelListView internally).
@@ -31,6 +35,7 @@ const Component = () => (
                 $in: ['vishal', 'neil'],
               },
             }}
+            queryChannelsOverride={queryChannelsOverride}
           />
         </ChatProvider>
       )}
@@ -90,13 +95,19 @@ describe('ChannelListView', () => {
     chatClient = await getTestClientWithUser({ id: 'vishal' });
     const c1 = generateChannelResponse();
     const c2 = generateChannelResponse();
-    useMockedApis(chatClient, [getOrCreateChannelApi(c1), getOrCreateChannelApi(c2)]);
+    useMockedApis(chatClient, [getOrCreateChannelApi(c1)]);
     const channel1 = chatClient.channel(c1.channel.type, c1.channel.id);
     await channel1.watch();
+    useMockedApis(chatClient, [getOrCreateChannelApi(c2)]);
     const channel2 = chatClient.channel(c2.channel.type, c2.channel.id);
     await channel2.watch();
-    useMockedApis(chatClient, [queryChannelsApi([channel1, channel2])]);
+    defaultChannels = [channel1, channel2];
+  });
+
+  beforeEach(() => {
+    queryChannelsResponse = defaultChannels;
   });
+
   afterEach(cleanup);
 
   it('renders without crashing', async () => {
@@ -107,7 +118,7 @@ describe('ChannelListView', () => {
   });
 
   it('renders the `EmptyStateIndicator` when no channels are present', async () => {
-    useMockedApis(chatClient, [queryChannelsApi([])]);
+    queryChannelsResponse = [];
     const { getByTestId } = render(<Component />);
     await waitFor(() => {
       expect(getByTestId('empty-channel-state-title')).toBeTruthy();
diff --git a/package/src/components/Thread/__tests__/__snapshots__/Thread.test.tsx.snap b/package/src/components/Thread/__tests__/__snapshots__/Thread.test.tsx.snap
index bda6fd5603..a2a3b6e58f 100644
--- a/package/src/components/Thread/__tests__/__snapshots__/Thread.test.tsx.snap
+++ b/package/src/components/Thread/__tests__/__snapshots__/Thread.test.tsx.snap
@@ -1734,6 +1734,9 @@ exports[`Thread should match thread snapshot 1`] = `
         </View>
       </RCTScrollView>
       <View
+        accessibilityElementsHidden={true}
+        accessible={false}
+        importantForAccessibility="no-hide-descendants"
         style={
           {
             "left": 0,