diff --git a/src/components/Accessibility/NotificationAnnouncer.tsx b/src/components/Accessibility/NotificationAnnouncer.tsx
index 7d91d1c52..6f543da2b 100644
--- a/src/components/Accessibility/NotificationAnnouncer.tsx
+++ b/src/components/Accessibility/NotificationAnnouncer.tsx
@@ -60,8 +60,7 @@ const defaultNotificationFilter: NotificationAnnouncementFilter = () => true;
  * satisfies this and no extra setup is needed.
  *
  * Rendered **without** a provider ancestor it mounts successfully but **announces nothing** —
- * `useAriaLiveAnnouncer()` returns a no-op and logs a `console.warn` ("… called outside of an
- * AriaLiveAnnouncerProvider"). This is intentional post-F4: the component no longer carries a
+ * `useAriaLiveAnnouncer()` returns a no-op. This is intentional post-F4: the component no longer carries a
  * fallback live region, so a single announcer owns all output and there are no duplicate/competing
  * regions. If you render it outside `Chat`, wrap it in `AriaLiveAnnouncerProvider` + `AriaLiveOutlet`
  * yourself.
diff --git a/src/components/Accessibility/hooks/useIncomingMessageAnnouncements.ts b/src/components/Accessibility/hooks/useIncomingMessageAnnouncements.ts
index 0f2d3375b..ca4fe5e86 100644
--- a/src/components/Accessibility/hooks/useIncomingMessageAnnouncements.ts
+++ b/src/components/Accessibility/hooks/useIncomingMessageAnnouncements.ts
@@ -51,7 +51,7 @@ export const useIncomingMessageAnnouncements = ({
   threadList = false,
 }: UseIncomingMessageAnnouncementsParams) => {
   const announce = useAriaLiveAnnouncer();
-  const { t } = useTranslationContext('useIncomingMessageAnnouncements');
+  const { t } = useTranslationContext();
   const lastAnnouncementTimestampRef = useRef(0);
   const flushTimeoutRef = useRef<ReturnType<typeof setTimeout> | undefined>(undefined);
   const announcedMessageIdsRef = useRef(new Set<string>());
diff --git a/src/components/Accessibility/useAriaLiveAnnouncer.ts b/src/components/Accessibility/useAriaLiveAnnouncer.ts
index db4448486..c452decde 100644
--- a/src/components/Accessibility/useAriaLiveAnnouncer.ts
+++ b/src/components/Accessibility/useAriaLiveAnnouncer.ts
@@ -41,16 +41,9 @@ export const AriaLiveAnnouncerContext = createContext<
   AriaLiveAnnouncerContextValue | undefined
 >(undefined);
 
-export const useAriaLiveAnnouncer = () => {
-  const contextValue = useContext(AriaLiveAnnouncerContext);
-
-  if (!contextValue) {
-    console.warn(
-      'The useAriaLiveAnnouncer hook was called outside of an AriaLiveAnnouncerProvider.',
-    );
-
-    return noopAnnounce;
-  }
-
-  return contextValue.announce;
-};
+/**
+ * Announcements are a progressive enhancement: outside an `AriaLiveAnnouncerProvider` this is a
+ * no-op rather than an error.
+ */
+export const useAriaLiveAnnouncer = () =>
+  useContext(AriaLiveAnnouncerContext)?.announce ?? noopAnnounce;
diff --git a/src/components/Attachment/AttachmentActions.tsx b/src/components/Attachment/AttachmentActions.tsx
index 87e4324eb..ef5274ab6 100644
--- a/src/components/Attachment/AttachmentActions.tsx
+++ b/src/components/Attachment/AttachmentActions.tsx
@@ -46,7 +46,7 @@ const UnMemoizedAttachmentActions = (props: AttachmentActionsProps) => {
     title,
     type,
   } = props;
-  const { t } = useTranslationContext('UnMemoizedAttachmentActions');
+  const { t } = useTranslationContext();
   const { announceInteraction } = useInteractionAnnouncements();
   const { reserve: reserveFocusReturn, restore: restoreFocusReturn } = useFocusReturn();
   const buttonRefs = useRef<Array<HTMLButtonElement | null>>([]);
diff --git a/src/components/Attachment/Audio.tsx b/src/components/Attachment/Audio.tsx
index 8a8e3cb84..edc08cb6a 100644
--- a/src/components/Attachment/Audio.tsx
+++ b/src/components/Attachment/Audio.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import type { Attachment, VoiceRecordingAttachment } from 'stream-chat';
 
 import {
@@ -8,7 +8,7 @@ import {
 import type { AudioPlayerState } from '../AudioPlayback/AudioPlayer';
 import { useAudioPlayer } from '../AudioPlayback/WithAudioPlayback';
 import { useStateStore } from '../../store';
-import { useComponentContext, useMessageContext } from '../../context';
+import { MessageContext, useComponentContext } from '../../context';
 import type { AudioPlayer } from '../AudioPlayback/AudioPlayer';
 import { PlayButton } from '../Button/PlayButton';
 import { FileIcon } from '../FileIcon';
@@ -102,7 +102,8 @@ export const Audio = (props: AudioProps) => {
    * with the default SDK components, but can be done with custom API calls.In this case all the Audio
    * widgets will share the state.
    */
-  const { message } = useMessageContext() ?? {};
+  // also rendered from composer previews, where there is no message
+  const { message } = useContext(MessageContext) ?? {};
   const threadInstance = useThreadContext();
 
   const audioPlayer = useAudioPlayer({
diff --git a/src/components/Attachment/LinkPreview/CardAudio.tsx b/src/components/Attachment/LinkPreview/CardAudio.tsx
index 1657704d9..28c163b99 100644
--- a/src/components/Attachment/LinkPreview/CardAudio.tsx
+++ b/src/components/Attachment/LinkPreview/CardAudio.tsx
@@ -1,9 +1,9 @@
 import { type AudioPlayerState, ProgressBar, useAudioPlayer } from '../../AudioPlayback';
-import { useMessageContext } from '../../../context';
+import { MessageContext } from '../../../context';
 import { useStateStore } from '../../../store';
 import { PlayButton } from '../../Button';
 import type { AudioProps } from '../Audio';
-import React from 'react';
+import React, { useContext } from 'react';
 import { IconLink } from '../../Icons';
 import { SafeAnchor } from '../../SafeAnchor';
 import type { CardProps } from './Card';
@@ -56,7 +56,8 @@ const AudioWidget = ({ mimeType, src }: { src: string; mimeType?: string }) => {
    * with the default SDK components, but can be done with custom API calls.In this case all the Audio
    * widgets will share the state.
    */
-  const { message } = useMessageContext() ?? {};
+  // also rendered from link previews, where there is no message
+  const { message } = useContext(MessageContext) ?? {};
   const threadInstance = useThreadContext();
 
   const audioPlayer = useAudioPlayer({
diff --git a/src/components/Attachment/LinkPreview/UnableToRenderCard.tsx b/src/components/Attachment/LinkPreview/UnableToRenderCard.tsx
index 7c559c838..d1a429aa4 100644
--- a/src/components/Attachment/LinkPreview/UnableToRenderCard.tsx
+++ b/src/components/Attachment/LinkPreview/UnableToRenderCard.tsx
@@ -4,7 +4,7 @@ import clsx from 'clsx';
 import React from 'react';
 
 export const UnableToRenderCard = ({ type }: { type?: Attachment['type'] }) => {
-  const { t } = useTranslationContext('Card');
+  const { t } = useTranslationContext();
 
   return (
     <div
diff --git a/src/components/Attachment/ModalGallery.tsx b/src/components/Attachment/ModalGallery.tsx
index 907d39fc5..6af5a2c45 100644
--- a/src/components/Attachment/ModalGallery.tsx
+++ b/src/components/Attachment/ModalGallery.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useContext, useMemo, useState } from 'react';
 import clsx from 'clsx';
 
 import type { BaseImageProps } from '../BaseImage';
@@ -7,7 +7,11 @@ import { BaseImage as DefaultBaseImage } from '../BaseImage';
 import { Gallery as DefaultGallery, GalleryUI } from '../Gallery';
 import { LoadingIndicator } from '../Loading';
 import { GlobalModal, type ModalCloseSource } from '../Modal';
-import { useComponentContext, useTranslationContext } from '../../context';
+import {
+  MessageContext,
+  useComponentContext,
+  useTranslationContext,
+} from '../../context';
 import { IconRetry } from '../Icons';
 import { VideoThumbnail } from '../VideoPlayer/VideoThumbnail';
 
@@ -56,8 +60,20 @@ export const ModalGallery = ({
     Gallery = DefaultGallery,
     Modal = GlobalModal,
   } = useComponentContext();
+  // ModalGallery is also usable standalone, outside a message
+  const { message } = useContext(MessageContext) ?? {};
   const [modalOpen, setModalOpen] = useState(false);
   const [selectedIndex, setSelectedIndex] = useState(0);
+  // the gallery header renders outside this provider, so sender and timestamp travel on the items
+  const itemsWithSender = useMemo(
+    () =>
+      items.map((item) => ({
+        ...item,
+        createdAt: item.createdAt ?? message?.created_at,
+        user: item.user ?? message?.user ?? undefined,
+      })),
+    [items, message?.created_at, message?.user],
+  );
   const usesDefaultBaseImage = BaseImage === DefaultBaseImage;
 
   const closeModal = useCallback(() => {
@@ -114,7 +130,7 @@ export const ModalGallery = ({
           closeOnBackgroundClick={closeOnBackgroundClick}
           GalleryUI={GalleryUI}
           initialIndex={selectedIndex}
-          items={items}
+          items={itemsWithSender}
           onRequestClose={closeModal}
         />
       </Modal>
diff --git a/src/components/Attachment/UnsupportedAttachment.tsx b/src/components/Attachment/UnsupportedAttachment.tsx
index fd2c4dd71..66adeb5b9 100644
--- a/src/components/Attachment/UnsupportedAttachment.tsx
+++ b/src/components/Attachment/UnsupportedAttachment.tsx
@@ -8,7 +8,7 @@ export type UnsupportedAttachmentProps = {
 };
 
 export const UnsupportedAttachment = () => {
-  const { t } = useTranslationContext('UnsupportedAttachment');
+  const { t } = useTranslationContext();
   return (
     <div
       className='str-chat__message-attachment-unsupported'
diff --git a/src/components/Attachment/VoiceRecording.tsx b/src/components/Attachment/VoiceRecording.tsx
index 622ec242c..07b30e007 100644
--- a/src/components/Attachment/VoiceRecording.tsx
+++ b/src/components/Attachment/VoiceRecording.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import type { Attachment, VoiceRecordingAttachment } from 'stream-chat';
 
 import { FileSizeIndicator as DefaultFileSizeIndicator } from './components';
 import { FileIcon } from '../FileIcon';
 import {
+  MessageContext,
   useComponentContext,
-  useMessageContext,
   useTranslationContext,
 } from '../../context';
 import {
@@ -122,7 +122,8 @@ export const VoiceRecordingPlayer = ({
    * with the default SDK components, but can be done with custom API calls.In this case all the Audio
    * widgets will share the state.
    */
-  const { message } = useMessageContext() ?? {};
+  // also rendered from composer previews, where there is no message
+  const { message } = useContext(MessageContext) ?? {};
   const threadInstance = useThreadContext();
 
   const audioPlayer = useAudioPlayer({
diff --git a/src/components/AudioPlayback/components/ProgressBar.tsx b/src/components/AudioPlayback/components/ProgressBar.tsx
index bae689479..caf3b430d 100644
--- a/src/components/AudioPlayback/components/ProgressBar.tsx
+++ b/src/components/AudioPlayback/components/ProgressBar.tsx
@@ -25,7 +25,7 @@ export const ProgressBar = ({
   secondsElapsed,
   seek,
 }: ProgressBarProps) => {
-  const { t } = useTranslationContext('ProgressBar');
+  const { t } = useTranslationContext();
   const {
     handleDrag,
     handleDragStart,
diff --git a/src/components/AudioPlayback/components/WaveProgressBar.tsx b/src/components/AudioPlayback/components/WaveProgressBar.tsx
index ce11b8cd6..4fee30ae6 100644
--- a/src/components/AudioPlayback/components/WaveProgressBar.tsx
+++ b/src/components/AudioPlayback/components/WaveProgressBar.tsx
@@ -37,7 +37,7 @@ export const WaveProgressBar = ({
   seek,
   waveformData,
 }: WaveProgressBarProps) => {
-  const { t } = useTranslationContext('WaveProgressBar');
+  const { t } = useTranslationContext();
   const [trackAxisX, setTrackAxisX] = useState<{
     barCount: number;
     barWidth: number;
diff --git a/src/components/Avatar/AvatarStack.tsx b/src/components/Avatar/AvatarStack.tsx
index b04d2ebf2..0165325b7 100644
--- a/src/components/Avatar/AvatarStack.tsx
+++ b/src/components/Avatar/AvatarStack.tsx
@@ -17,7 +17,7 @@ export function AvatarStack({
   badgeSize?: BadgeSize;
   capLimit?: number;
 }) {
-  const { Avatar = DefaultAvatar } = useComponentContext(AvatarStack.name);
+  const { Avatar = DefaultAvatar } = useComponentContext();
 
   const displayInfoToRender = useMemo(
     () => (displayInfo.length > capLimit ? displayInfo.slice(0, capLimit) : displayInfo),
diff --git a/src/components/Channel/Channel.tsx b/src/components/Channel/Channel.tsx
index 5547bfba4..a3e09a5fc 100644
--- a/src/components/Channel/Channel.tsx
+++ b/src/components/Channel/Channel.tsx
@@ -154,9 +154,8 @@ const ChannelInner = (
   const { LoadingErrorIndicator, LoadingIndicator = DefaultLoadingIndicator } =
     useComponentContext();
 
-  const { client, latestMessageDatesByChannels, searchController } =
-    useChatContext('Channel');
-  const { t } = useTranslationContext('Channel');
+  const { client, latestMessageDatesByChannels, searchController } = useChatContext();
+  const { t } = useTranslationContext();
   const windowsEmojiClass = useImageFlagEmojisOnWindowsClass();
 
   const channelConfig = useChannelConfig({ cid: channel.cid });
diff --git a/src/components/Channel/hooks/useChannelConfig.ts b/src/components/Channel/hooks/useChannelConfig.ts
index e430dd904..c25286ca7 100644
--- a/src/components/Channel/hooks/useChannelConfig.ts
+++ b/src/components/Channel/hooks/useChannelConfig.ts
@@ -8,7 +8,7 @@ const channelConfigsSelector = (value: ChannelConfigsState) => ({
 
 // todo: why is channel config stored on client?
 export const useChannelConfig = ({ cid }: { cid: string | undefined }) => {
-  const { client } = useChatContext('useChannelConfig');
+  const { client } = useChatContext();
   const channelConfigsState = useStateStore(client.configsStore, channelConfigsSelector);
 
   if (!cid) return undefined;
diff --git a/src/components/Channel/hooks/useChannelContainerClasses.ts b/src/components/Channel/hooks/useChannelContainerClasses.ts
index a71707845..14fceaa45 100644
--- a/src/components/Channel/hooks/useChannelContainerClasses.ts
+++ b/src/components/Channel/hooks/useChannelContainerClasses.ts
@@ -2,7 +2,7 @@ import { useChatContext } from '../../../context/ChatContext';
 import type { ChatContextValue } from '../../../context/ChatContext';
 
 export const useImageFlagEmojisOnWindowsClass = () => {
-  const { useImageFlagEmojisOnWindows } = useChatContext('Channel');
+  const { useImageFlagEmojisOnWindows } = useChatContext();
   return useImageFlagEmojisOnWindows && navigator.userAgent.match(/Win/)
     ? 'str-chat--windows-flags'
     : '';
diff --git a/src/components/ChannelHeader/ChannelHeader.tsx b/src/components/ChannelHeader/ChannelHeader.tsx
index 6eb42ce0a..14d03c9a6 100644
--- a/src/components/ChannelHeader/ChannelHeader.tsx
+++ b/src/components/ChannelHeader/ChannelHeader.tsx
@@ -16,7 +16,7 @@ const textComposerTypingSelector = ({ typing }: TextComposerState) => ({ typing
 const ChannelHeaderSubtitle = () => {
   const channel = useChannel();
   const channelConfig = useChannelConfig({ cid: channel.cid });
-  const { client } = useChatContext('ChannelHeaderSubtitle');
+  const { client } = useChatContext();
   const messageComposer = useMessageComposerController();
   const { typing = {} } =
     useStateStore(messageComposer.textComposer?.state, textComposerTypingSelector) ?? {};
diff --git a/src/components/ChannelListItem/ChannelListItem.tsx b/src/components/ChannelListItem/ChannelListItem.tsx
index 75e5d3a1f..a04830282 100644
--- a/src/components/ChannelListItem/ChannelListItem.tsx
+++ b/src/components/ChannelListItem/ChannelListItem.tsx
@@ -22,6 +22,7 @@ import {
   useWorkspaceNavigation,
 } from '../../context';
 import { useChannelMembershipState } from '../ChannelList';
+import { requireContext } from '../../context/requireContext';
 
 export type ChannelListItemUIProps = ChannelListItemProps & {
   /**
@@ -73,11 +74,16 @@ export type ChannelListItemProps = {
   watchers?: { limit?: number; offset?: number };
 };
 
-const ChannelListItemContext = React.createContext<{ channel: Channel }>({
-  channel: null as unknown as Channel,
-});
+const ChannelListItemContext = React.createContext<{ channel: Channel } | undefined>(
+  undefined,
+);
 
-export const useChannelListItemContext = () => useContext(ChannelListItemContext);
+export const useChannelListItemContext = () =>
+  requireContext(
+    useContext(ChannelListItemContext),
+    'useChannelListItemContext',
+    'ChannelListItemUI',
+  );
 
 const lastMessageSelector = ({ lastMessage }: MessagePaginatorAggregateState) => ({
   lastMessage: lastMessage ?? undefined,
@@ -86,7 +92,7 @@ const lastMessageSelector = ({ lastMessage }: MessagePaginatorAggregateState) =>
 export const ChannelListItem = (props: ChannelListItemProps) => {
   const { active, channel, channelUpdateCount } = props;
   const { ChannelListItemUI = DefaultChannelListItemUI } = useComponentContext();
-  const { client } = useChatContext('ChannelPreview');
+  const { client } = useChatContext();
   // Active = THIS channel is currently open in the workspace. Keyed on the channel's own
   // cid (never "the first channel slot"), so multiple open channels each highlight independently.
   const channelOpenInSlot = useWorkspaceNavigation().isChannelActive(
diff --git a/src/components/ChannelListItem/ChannelListItemTimestamp.tsx b/src/components/ChannelListItem/ChannelListItemTimestamp.tsx
index 4ed9161f4..9518c94f5 100644
--- a/src/components/ChannelListItem/ChannelListItemTimestamp.tsx
+++ b/src/components/ChannelListItem/ChannelListItemTimestamp.tsx
@@ -12,7 +12,7 @@ export type ChannelListItemTimestampProps = {
 export function ChannelListItemTimestamp({
   previewedMessage,
 }: ChannelListItemTimestampProps) {
-  const { t, tDateTimeParser } = useTranslationContext('ChannelListItemTimestamp');
+  const { t, tDateTimeParser } = useTranslationContext();
 
   const timestamp = previewedMessage?.created_at;
   const normalizedTimestamp =
diff --git a/src/components/ChannelListItem/ChannelListItemUI.tsx b/src/components/ChannelListItem/ChannelListItemUI.tsx
index 977e97f7c..414bb657a 100644
--- a/src/components/ChannelListItem/ChannelListItemUI.tsx
+++ b/src/components/ChannelListItem/ChannelListItemUI.tsx
@@ -40,8 +40,8 @@ const UnMemoizedChannelListItemUI = (props: ChannelListItemUIProps) => {
     ChannelListItemActionButtons = DefaultChannelListItemActionButtons,
     SummarizedMessagePreview = DefaultSummarizedMessagePreview,
   } = useComponentContext();
-  const { client, isMessageAIGenerated } = useChatContext('ChannelListItemUI');
-  const { t, tDateTimeParser, userLanguage } = useTranslationContext('ChannelListItemUI');
+  const { client, isMessageAIGenerated } = useChatContext();
+  const { t, tDateTimeParser, userLanguage } = useTranslationContext();
   const { openChannel } = useWorkspaceNavigation();
   const { announceInteraction } = useInteractionAnnouncements();
 
diff --git a/src/components/ChannelListItem/hooks/useChannelDisplayName.ts b/src/components/ChannelListItem/hooks/useChannelDisplayName.ts
index 20139c251..c08470a59 100644
--- a/src/components/ChannelListItem/hooks/useChannelDisplayName.ts
+++ b/src/components/ChannelListItem/hooks/useChannelDisplayName.ts
@@ -45,8 +45,8 @@ function computeChannelDisplayName(
 export const useChannelDisplayName = (
   channel: Channel | undefined,
 ): string | undefined => {
-  const { client } = useChatContext('useChannelDisplayName');
-  const { t } = useTranslationContext('useChannelDisplayName');
+  const { client } = useChatContext();
+  const { t } = useTranslationContext();
   const directMessageLabel = t(
     'channelListItem.channelDisplayName.directMessage.label',
     'Direct message',
diff --git a/src/components/ChannelListItem/hooks/useIsChannelMuted.ts b/src/components/ChannelListItem/hooks/useIsChannelMuted.ts
index 88d2c15ee..925f38ce9 100644
--- a/src/components/ChannelListItem/hooks/useIsChannelMuted.ts
+++ b/src/components/ChannelListItem/hooks/useIsChannelMuted.ts
@@ -20,7 +20,7 @@ const getMuteStatus = (channel: Channel) =>
     : { createdAt: null, expiresAt: null, muted: false };
 
 export const useIsChannelMuted = (channel: Channel) => {
-  const { client } = useChatContext('useIsChannelMuted');
+  const { client } = useChatContext();
 
   const [muted, setMuted] = useState(() => getMuteStatus(channel));
 
diff --git a/src/components/DateSeparator/DateSeparator.tsx b/src/components/DateSeparator/DateSeparator.tsx
index d130406cf..95a913b78 100644
--- a/src/components/DateSeparator/DateSeparator.tsx
+++ b/src/components/DateSeparator/DateSeparator.tsx
@@ -32,7 +32,7 @@ const UnMemoizedDateSeparator = (props: DateSeparatorProps) => {
     ...restTimestampFormatterOptions
   } = props;
 
-  const { t, tDateTimeParser } = useTranslationContext('DateSeparator');
+  const { t, tDateTimeParser } = useTranslationContext();
 
   const formattedDate = getDateString({
     calendar,
diff --git a/src/components/Dialog/components/ContextMenu.tsx b/src/components/Dialog/components/ContextMenu.tsx
index 5f35cb33b..012f07a79 100644
--- a/src/components/Dialog/components/ContextMenu.tsx
+++ b/src/components/Dialog/components/ContextMenu.tsx
@@ -22,6 +22,7 @@ import { useComponentContext, useTranslationContext } from '../../../context';
 import { createRovingFocusKeyDownHandler } from '../../../a11y/a11yUtils';
 import { VisuallyHidden } from '../../VisuallyHidden';
 import { useStableId } from '../../UtilityComponents/useStableId';
+import { requireContext } from '../../../context/requireContext';
 
 /**
  * ContextMenu module
@@ -589,7 +590,7 @@ const ContextMenuContext = React.createContext<ContextMenuContextValue | undefin
 );
 
 export const useContextMenuContext = () =>
-  useContext(ContextMenuContext) as ContextMenuContextValue;
+  requireContext(useContext(ContextMenuContext), 'useContextMenuContext', 'ContextMenu');
 
 type ContextMenuLevel = {
   focusRestoreRequest?: ContextMenuFocusRestoreRequest;
diff --git a/src/components/EmptyStateIndicator/EmptyStateIndicator.tsx b/src/components/EmptyStateIndicator/EmptyStateIndicator.tsx
index 79d7bb63e..b4fe2ff01 100644
--- a/src/components/EmptyStateIndicator/EmptyStateIndicator.tsx
+++ b/src/components/EmptyStateIndicator/EmptyStateIndicator.tsx
@@ -13,7 +13,7 @@ export type EmptyStateIndicatorProps = {
 const UnMemoizedEmptyStateIndicator = (props: EmptyStateIndicatorProps) => {
   const { listType, messageText } = props;
 
-  const { t } = useTranslationContext('EmptyStateIndicator');
+  const { t } = useTranslationContext();
 
   if (listType === 'thread') return null;
 
diff --git a/src/components/Form/SwitchField.tsx b/src/components/Form/SwitchField.tsx
index ff879c8e0..942a150db 100644
--- a/src/components/Form/SwitchField.tsx
+++ b/src/components/Form/SwitchField.tsx
@@ -51,7 +51,7 @@ export const SwitchField = ({
   // Read the announcer optionally: a SwitchField may render outside an announcer provider (e.g. in
   // isolation), where it simply stays silent rather than warning.
   const announce = useContext(AriaLiveAnnouncerContext)?.announce;
-  const { t } = useTranslationContext('SwitchField');
+  const { t } = useTranslationContext();
 
   const [uncontrolledChecked, setUncontrolledChecked] = useState(Boolean(defaultChecked));
   const isControlled = checked !== undefined;
diff --git a/src/components/Gallery/GalleryContext.tsx b/src/components/Gallery/GalleryContext.tsx
index c7d1c081c..a03adb1ba 100644
--- a/src/components/Gallery/GalleryContext.tsx
+++ b/src/components/Gallery/GalleryContext.tsx
@@ -1,12 +1,18 @@
 import { createContext, useContext } from 'react';
+import type { UserResponse } from 'stream-chat';
 
+import { requireContext } from '../../context/requireContext';
 import { toBaseImageDescriptors } from '../BaseImage';
 import type { BaseImageProps } from '../BaseImage';
 import type { Dimensions } from '../../types/types';
 
 export type GalleryItem = Omit<BaseImageProps, 'src'> & {
+  /** When the media was shared; drives the gallery header timestamp. */
+  createdAt?: string | Date;
   dimensions?: Dimensions;
   imageUrl?: string;
+  /** User who shared the media; drives the gallery header title. */
+  user?: UserResponse;
   videoThumbnailUrl?: string;
   videoUrl?: string;
 };
@@ -51,16 +57,5 @@ export type GalleryContextValue = {
 
 export const GalleryContext = createContext<GalleryContextValue | undefined>(undefined);
 
-export const useGalleryContext = () => {
-  const contextValue = useContext(GalleryContext);
-
-  if (!contextValue) {
-    console.warn(
-      `The useGalleryContext hook was called outside of the GalleryContext provider. Make sure this hook is called within a child of the Gallery component.`,
-    );
-
-    return {} as GalleryContextValue;
-  }
-
-  return contextValue;
-};
+export const useGalleryContext = () =>
+  requireContext(useContext(GalleryContext), 'useGalleryContext', 'Gallery');
diff --git a/src/components/Gallery/GalleryHeader.tsx b/src/components/Gallery/GalleryHeader.tsx
index 0c029b777..6e576edc3 100644
--- a/src/components/Gallery/GalleryHeader.tsx
+++ b/src/components/Gallery/GalleryHeader.tsx
@@ -4,28 +4,56 @@ import { sanitizeUrl } from '@braintree/sanitize-url';
 import { type GalleryItem } from './GalleryContext';
 import { Button } from '../Button';
 import { IconArrowDownCircle, IconXmark } from '../Icons';
-import { MessageTimestamp as DefaultMessageTimestamp } from '../Message/MessageTimestamp';
-import {
-  ModalContext,
-  useComponentContext,
-  useMessageContext,
-  useTranslationContext,
-} from '../../context';
+import { ModalContext, useChatContext, useTranslationContext } from '../../context';
+import { getDateString, isDate } from '../../i18n/utils';
 
 type GalleryHeaderProps = {
   currentItem: GalleryItem;
 };
 
+const normalizeTimestamp = (timestamp: GalleryItem['createdAt']) => {
+  if (!timestamp) return undefined;
+  return isDate(timestamp) ? timestamp.toISOString() : timestamp;
+};
+
+/**
+ * Reads the timestamp off the gallery item: the gallery renders outside any `MessageProvider`, and
+ * channel media mixes items from many messages.
+ */
+const GalleryTimestamp = ({ createdAt }: Pick<GalleryItem, 'createdAt'>) => {
+  const { t, tDateTimeParser } = useTranslationContext();
+  const normalizedTimestamp = normalizeTimestamp(createdAt);
+
+  const when = useMemo(
+    () =>
+      getDateString({
+        messageCreatedAt: normalizedTimestamp,
+        t,
+        tDateTimeParser,
+        timestampTranslationKey: 'timestamp.GalleryTimestamp',
+      }),
+    [normalizedTimestamp, t, tDateTimeParser],
+  );
+
+  if (!when) return null;
+
+  return (
+    <time className='str-chat__gallery__timestamp' dateTime={normalizedTimestamp}>
+      {when}
+    </time>
+  );
+};
+
 export const GalleryHeader = ({ currentItem }: GalleryHeaderProps) => {
   const { t } = useTranslationContext();
-  const { MessageTimestamp = DefaultMessageTimestamp } = useComponentContext('GalleryUI');
-  const { isMyMessage, message } = useMessageContext('GalleryUI');
+  const { client } = useChatContext();
   const modalContext = useContext(ModalContext);
+  const { createdAt, user } = currentItem;
 
   const headerTitle =
-    (isMyMessage?.() && t('common.you.label', 'You')) ||
-    message?.user?.name ||
-    message?.user?.id ||
+    (!!user?.id && user.id === client.userID && t('common.you.label', 'You')) ||
+    user?.name ||
+    user?.id ||
     currentItem.title ||
     t('common.userUploadedContent.label', 'User uploaded content');
   const downloadUrl = useMemo(() => {
@@ -44,9 +72,7 @@ export const GalleryHeader = ({ currentItem }: GalleryHeaderProps) => {
       <div aria-hidden='true' className='str-chat__gallery__header-spacer' />
       <div className='str-chat__gallery__header-meta'>
         <div className='str-chat__gallery__title'>{headerTitle}</div>
-        {message?.created_at ? (
-          <MessageTimestamp customClass='str-chat__gallery__timestamp' />
-        ) : null}
+        <GalleryTimestamp createdAt={createdAt} />
       </div>
       <div className='str-chat__gallery__header-actions'>
         {downloadUrl ? (
diff --git a/src/components/Gallery/__tests__/Gallery.test.tsx b/src/components/Gallery/__tests__/Gallery.test.tsx
index 7d47552d1..9c41b8080 100644
--- a/src/components/Gallery/__tests__/Gallery.test.tsx
+++ b/src/components/Gallery/__tests__/Gallery.test.tsx
@@ -4,12 +4,13 @@ import { act, render, screen } from '@testing-library/react';
 import { Gallery } from '../Gallery';
 import { useGalleryContext } from '../GalleryContext';
 import type { GalleryItem } from '../GalleryContext';
-import { ComponentProvider } from '../../../context';
+import { ChatProvider, ComponentProvider } from '../../../context';
 import {
   generateImageAttachment,
   generateLocalImageUploadAttachmentData,
   mockComponentContext,
 } from '../../../mock-builders';
+import { mockChatContext } from '../../../mock-builders/context';
 import type { Attachment } from 'stream-chat';
 
 const makeImageItem = (overrides?: Partial<Attachment>) =>
@@ -52,7 +53,12 @@ describe('Gallery', () => {
 
   it('should render default GalleryUI when no GalleryUI is provided', () => {
     const items = [makeImageItem()];
-    render(<Gallery items={items} />);
+    // the default GalleryUI renders GalleryHeader, which reads the current user from chat context
+    render(
+      <ChatProvider value={mockChatContext({ client: { userID: 'me' } })}>
+        <Gallery items={items} />
+      </ChatProvider>,
+    );
     expect(screen.getByRole('button', { name: 'Previous image' })).toBeInTheDocument();
     expect(screen.getByRole('button', { name: 'Next image' })).toBeInTheDocument();
   });
diff --git a/src/components/Gallery/__tests__/GalleryContext.test.tsx b/src/components/Gallery/__tests__/GalleryContext.test.tsx
index fddaf7436..aa9135eaf 100644
--- a/src/components/Gallery/__tests__/GalleryContext.test.tsx
+++ b/src/components/Gallery/__tests__/GalleryContext.test.tsx
@@ -6,17 +6,10 @@ import { GalleryContext, useGalleryContext } from '../GalleryContext';
 import type { GalleryContextValue } from '../GalleryContext';
 
 describe('useGalleryContext', () => {
-  it('should warn and return empty object when used outside provider', () => {
-    const warnSpy = vi.spyOn(console, 'warn').mockImplementation(() => null);
-
-    const { result } = renderHook(() => useGalleryContext());
-
-    expect(warnSpy).toHaveBeenCalledWith(
-      expect.stringContaining('useGalleryContext hook was called outside'),
+  it('should throw when used outside provider', () => {
+    expect(() => renderHook(() => useGalleryContext())).toThrow(
+      /useGalleryContext was called outside of Gallery/,
     );
-    expect(result.current).toEqual({});
-
-    warnSpy.mockRestore();
   });
 
   it('should return context value when used inside provider', () => {
diff --git a/src/components/Gallery/__tests__/GalleryUI.test.tsx b/src/components/Gallery/__tests__/GalleryUI.test.tsx
index e8f82cf1f..72d8fce22 100644
--- a/src/components/Gallery/__tests__/GalleryUI.test.tsx
+++ b/src/components/Gallery/__tests__/GalleryUI.test.tsx
@@ -4,14 +4,17 @@ import { act, fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { Gallery } from '../Gallery';
 import { GalleryUI } from '../GalleryUI';
 import {
-  MessageProvider,
+  ChatProvider,
   ModalContextProvider,
   TranslationProvider,
 } from '../../../context';
-import { mockTranslationContextValue } from '../../../mock-builders';
+import {
+  mockChatContext,
+  mockTranslationContextValue,
+} from '../../../mock-builders/context';
 
 import type { GalleryProps } from '../Gallery';
-import type { MessageContextValue, ModalContextValue } from '../../../context';
+import type { ModalContextValue } from '../../../context';
 import type { GalleryItem } from '../GalleryContext';
 
 const makeImageItem = (overrides: Partial<GalleryItem> = {}): GalleryItem =>
@@ -33,17 +36,7 @@ const makeVideoItem = (overrides: Partial<GalleryItem> = {}): GalleryItem =>
     ...overrides,
   }) as unknown as GalleryItem;
 
-const makeMessageContext = (
-  overrides: Partial<MessageContextValue> = {},
-): MessageContextValue =>
-  ({
-    isMyMessage: () => false,
-    message: {
-      created_at: new Date('2025-01-01T12:34:56.000Z'),
-      user: { id: 'jenny', name: 'Jenny' },
-    },
-    ...overrides,
-  }) as MessageContextValue;
+const CURRENT_USER_ID = 'me';
 
 const getSlideContainer = (container: HTMLElement) => {
   const slideContainer = container.querySelector('.str-chat__gallery__slide-container');
@@ -58,12 +51,10 @@ const renderGalleryUI = (
   {
     galleryProps,
     initialIndex = 0,
-    messageContext,
     modalContext,
   }: {
     galleryProps?: Partial<GalleryProps>;
     initialIndex?: number;
-    messageContext?: MessageContextValue;
     modalContext?: ModalContextValue;
   } = {},
 ) => {
@@ -76,10 +67,6 @@ const renderGalleryUI = (
     />
   );
 
-  if (messageContext) {
-    children = <MessageProvider value={messageContext}>{children}</MessageProvider>;
-  }
-
   if (modalContext) {
     children = (
       <ModalContextProvider value={modalContext}>{children}</ModalContextProvider>
@@ -87,9 +74,11 @@ const renderGalleryUI = (
   }
 
   return render(
-    <TranslationProvider value={mockTranslationContextValue()}>
-      {children}
-    </TranslationProvider>,
+    <ChatProvider value={mockChatContext({ client: { userID: CURRENT_USER_ID } })}>
+      <TranslationProvider value={mockTranslationContextValue()}>
+        {children}
+      </TranslationProvider>
+    </ChatProvider>,
   );
 };
 
@@ -248,12 +237,16 @@ describe('GalleryUI', () => {
   });
 
   describe('Header metadata and actions', () => {
-    it('should render sender metadata in the header when message context is available', () => {
-      const items = [makeImageItem({ title: 'beach.png' })];
+    it('should render sender metadata in the header from the current item', () => {
+      const items = [
+        makeImageItem({
+          createdAt: new Date('2025-01-01T12:34:56.000Z'),
+          title: 'beach.png',
+          user: { id: CURRENT_USER_ID, name: 'Me' },
+        }),
+      ];
 
-      const { container } = renderGalleryUI(items, {
-        messageContext: makeMessageContext({ isMyMessage: () => true }),
-      });
+      const { container } = renderGalleryUI(items);
 
       expect(screen.getByText('You')).toBeInTheDocument();
       expect(container.querySelector('.str-chat__gallery__timestamp')).toHaveAttribute(
@@ -262,6 +255,32 @@ describe('GalleryUI', () => {
       );
     });
 
+    it("should render another user's name in the header", () => {
+      const items = [
+        makeImageItem({
+          createdAt: new Date('2025-01-01T12:34:56.000Z'),
+          title: 'beach.png',
+          user: { id: 'jenny', name: 'Jenny' },
+        }),
+      ];
+
+      renderGalleryUI(items);
+
+      expect(screen.getByText('Jenny')).toBeInTheDocument();
+      expect(screen.queryByText('You')).not.toBeInTheDocument();
+    });
+
+    it('should fall back to the item title and omit the timestamp when the item has no sender', () => {
+      const items = [makeImageItem({ title: 'beach.png' })];
+
+      const { container } = renderGalleryUI(items);
+
+      expect(screen.getByText('beach.png')).toBeInTheDocument();
+      expect(
+        container.querySelector('.str-chat__gallery__timestamp'),
+      ).not.toBeInTheDocument();
+    });
+
     it('should render a download action for the current item', () => {
       const items = [
         makeImageItem({
diff --git a/src/components/Gallery/__tests__/Image.test.tsx b/src/components/Gallery/__tests__/Image.test.tsx
index f3f120871..a96dc6cfa 100644
--- a/src/components/Gallery/__tests__/Image.test.tsx
+++ b/src/components/Gallery/__tests__/Image.test.tsx
@@ -6,7 +6,7 @@ import { ImageComponent } from '../../Attachment/Image';
 import { Chat } from '../../Chat';
 import { Channel } from '../../Channel';
 
-import { WithComponents } from '../../../context';
+import { ChatProvider, WithComponents } from '../../../context';
 import { ComponentProvider } from '../../../context/ComponentContext';
 import { TranslationProvider } from '../../../context/TranslationContext';
 import {
@@ -14,6 +14,7 @@ import {
   mockComponentContext,
   mockTranslationContextValue,
 } from '../../../mock-builders';
+import { mockChatContext } from '../../../mock-builders/context';
 
 const mockImageUrl = 'https://placeimg.com/640/480/any';
 
@@ -22,11 +23,14 @@ const NoOpModal = ({ children }) => <div>{children}</div>;
 
 const renderWithProviders = (ui) =>
   render(
-    <TranslationProvider value={mockTranslationContextValue()}>
-      <ComponentProvider value={mockComponentContext({ Modal: NoOpModal })}>
-        {ui}
-      </ComponentProvider>
-    </TranslationProvider>,
+    <ChatProvider value={mockChatContext({ client: { userID: 'me' } })}>
+      <TranslationProvider value={mockTranslationContextValue()}>
+        {/* no MessageProvider: ModalGallery must render standalone */}
+        <ComponentProvider value={mockComponentContext({ Modal: NoOpModal })}>
+          {ui}
+        </ComponentProvider>
+      </TranslationProvider>
+    </ChatProvider>,
   );
 
 describe('Image', () => {
diff --git a/src/components/Gallery/__tests__/ModalGallery.test.tsx b/src/components/Gallery/__tests__/ModalGallery.test.tsx
index a6d4ddbbc..8ff664bc4 100644
--- a/src/components/Gallery/__tests__/ModalGallery.test.tsx
+++ b/src/components/Gallery/__tests__/ModalGallery.test.tsx
@@ -2,12 +2,13 @@ import React from 'react';
 import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
 
 import { ModalGallery } from '../../Attachment/ModalGallery';
-import { TranslationProvider } from '../../../context';
+import { ChatProvider, TranslationProvider } from '../../../context';
 import { ComponentProvider } from '../../../context/ComponentContext';
 import {
   mockComponentContext,
   mockTranslationContextValue,
 } from '../../../mock-builders';
+import { mockChatContext } from '../../../mock-builders/context';
 
 const makeImageItem = (overrides = {}) => ({
   fallback: 'test.png',
@@ -19,17 +20,20 @@ const makeImageItem = (overrides = {}) => ({
 
 const renderComponent = (props = {}, componentOverrides = {}) =>
   render(
-    <TranslationProvider value={mockTranslationContextValue()}>
-      <ComponentProvider
-        value={mockComponentContext({
-          Modal: ({ children, className, open }: any) =>
-            open ? <div className={className}>{children}</div> : null,
-          ...componentOverrides,
-        })}
-      >
-        <ModalGallery items={[]} {...props} />
-      </ComponentProvider>
-    </TranslationProvider>,
+    <ChatProvider value={mockChatContext({ client: { userID: 'me' } })}>
+      <TranslationProvider value={mockTranslationContextValue()}>
+        {/* no MessageProvider: ModalGallery must render standalone */}
+        <ComponentProvider
+          value={mockComponentContext({
+            Modal: ({ children, className, open }: any) =>
+              open ? <div className={className}>{children}</div> : null,
+            ...componentOverrides,
+          })}
+        >
+          <ModalGallery items={[]} {...props} />
+        </ComponentProvider>
+      </TranslationProvider>
+    </ChatProvider>,
   );
 
 describe('ModalGallery', () => {
diff --git a/src/components/Gallery/decisions.md b/src/components/Gallery/decisions.md
index 908060081..4e36daf01 100644
--- a/src/components/Gallery/decisions.md
+++ b/src/components/Gallery/decisions.md
@@ -1,4 +1,32 @@
-## Decision: useGalleryContext uses console.warn instead of throw
+## Decision: useGalleryContext throws when used outside its provider
+
+**Date:** 2026-08-14 (supersedes the 2026-02-09 decision below)
+
+**Context:**
+REACT-1026 normalized missing-provider behavior across every context hook in `src/`. Required
+contexts now throw via the shared `requireContext` helper (`src/context/requireContext.ts`);
+contexts with a meaningful default keep it and carry an honest type.
+
+**Decision:**
+`useGalleryContext` throws. Its sole consumer, `GalleryUI`, destructures ~9 required fields and
+renders from them, so an empty object was never a usable value.
+
+**Reasoning:**
+This reverses the decision recorded below, whose stated rationale — "all existing context hooks in
+the project use `console.warn`" — no longer holds: that pattern is what REACT-1026 removed. The
+`{} as GalleryContextValue` cast was a typed lie that deferred the failure to a downstream
+`Cannot read properties of undefined` several frames from the actual mistake.
+
+**Tradeoffs / Consequences:**
+
+- Rendering a gallery child outside `<Gallery>` now fails immediately, naming the hook and provider,
+  instead of rendering blank and warning.
+- `src/context/__tests__/missingProviderContract.test.tsx` pins this contract alongside the other
+  required contexts.
+
+---
+
+## Decision (superseded 2026-08-14): useGalleryContext uses console.warn instead of throw
 
 **Date:** 2026-02-09
 
diff --git a/src/components/LoadMore/LoadMoreButton.tsx b/src/components/LoadMore/LoadMoreButton.tsx
index ba6e79b3d..442ea1cbc 100644
--- a/src/components/LoadMore/LoadMoreButton.tsx
+++ b/src/components/LoadMore/LoadMoreButton.tsx
@@ -16,7 +16,7 @@ const UnMemoizedLoadMoreButton = ({
   isLoading,
   onClick,
 }: PropsWithChildren<LoadMoreButtonProps>) => {
-  const { t } = useTranslationContext('UnMemoizedLoadMoreButton');
+  const { t } = useTranslationContext();
 
   const childrenOrDefaultString =
     children ?? t('loadMore.button.loadMore.label', 'Load more');
diff --git a/src/components/Loading/LoadingErrorIndicator.tsx b/src/components/Loading/LoadingErrorIndicator.tsx
index 731f1d0ae..17b89bc26 100644
--- a/src/components/Loading/LoadingErrorIndicator.tsx
+++ b/src/components/Loading/LoadingErrorIndicator.tsx
@@ -11,7 +11,7 @@ export type LoadingErrorIndicatorProps = {
  * UI component for error indicator in a Channel
  */
 const UnMemoizedLoadingErrorIndicator = ({ error }: LoadingErrorIndicatorProps) => {
-  const { t } = useTranslationContext('LoadingErrorIndicator');
+  const { t } = useTranslationContext();
 
   if (!error) return null;
 
diff --git a/src/components/Loading/progress-indicators.tsx b/src/components/Loading/progress-indicators.tsx
index 21b694f57..77f09da1d 100644
--- a/src/components/Loading/progress-indicators.tsx
+++ b/src/components/Loading/progress-indicators.tsx
@@ -12,7 +12,7 @@ const RING_CIRCUMFERENCE = 2 * Math.PI * RING_RADIUS;
 
 /** Circular progress indicator with input from 0 to 100. */
 export const CircularProgressIndicator = ({ percent }: ProgressIndicatorProps) => {
-  const { t } = useTranslationContext('CircularProgressIndicator');
+  const { t } = useTranslationContext();
   const dashOffset = RING_CIRCUMFERENCE * (1 - percent / 100);
 
   return (
diff --git a/src/components/MediaRecorder/AudioRecorder/__tests__/AudioRecorder.test.tsx b/src/components/MediaRecorder/AudioRecorder/__tests__/AudioRecorder.test.tsx
index 724bdb2fe..cb2622a78 100644
--- a/src/components/MediaRecorder/AudioRecorder/__tests__/AudioRecorder.test.tsx
+++ b/src/components/MediaRecorder/AudioRecorder/__tests__/AudioRecorder.test.tsx
@@ -19,10 +19,12 @@ import { MessageComposer } from '../../../MessageComposer';
 import { Chat } from '../../../Chat';
 import { Channel } from '../../../Channel';
 import {
+  ChatProvider,
   DialogManagerProvider,
   MessageComposerContextProvider,
   WithComponents,
 } from '../../../../context';
+import { mockChatContext } from '../../../../mock-builders/context';
 import {
   generateAudioAttachment,
   generateFileAttachment,
@@ -434,15 +436,18 @@ const DEFAULT_RECORDING_CONTROLLER = {
 
 const renderAudioRecorder = (controller = {}) =>
   render(
-    <WithAudioPlayback>
-      <MessageComposerContextProvider
-        value={fromPartial<MessageComposerContextValue>({
-          recordingController: { ...DEFAULT_RECORDING_CONTROLLER, ...controller },
-        })}
-      >
-        <AudioRecorder />
-      </MessageComposerContextProvider>
-    </WithAudioPlayback>,
+    // AudioRecorder reaches useChatContext through useNotificationApi, so it needs a ChatProvider.
+    <ChatProvider value={mockChatContext()}>
+      <WithAudioPlayback>
+        <MessageComposerContextProvider
+          value={fromPartial<MessageComposerContextValue>({
+            recordingController: { ...DEFAULT_RECORDING_CONTROLLER, ...controller },
+          })}
+        >
+          <AudioRecorder />
+        </MessageComposerContextProvider>
+      </WithAudioPlayback>
+    </ChatProvider>,
   );
 
 describe('AudioRecorder', () => {
diff --git a/src/components/MediaRecorder/hooks/useMediaRecorder.ts b/src/components/MediaRecorder/hooks/useMediaRecorder.ts
index a96af4b2f..0645e1bb7 100644
--- a/src/components/MediaRecorder/hooks/useMediaRecorder.ts
+++ b/src/components/MediaRecorder/hooks/useMediaRecorder.ts
@@ -32,7 +32,7 @@ export const useMediaRecorder = ({
   generateRecordingTitle,
   recordingConfig,
 }: UseMediaRecorderParams): RecordingController => {
-  const { t } = useTranslationContext('useMediaRecorder');
+  const { t } = useTranslationContext();
   const { announceInteraction } = useInteractionAnnouncements();
   const messageComposer = useMessageComposerController();
   const sendMessageFn = useSendMessageFn();
diff --git a/src/components/Message/Message.tsx b/src/components/Message/Message.tsx
index f359122ab..d34290649 100644
--- a/src/components/Message/Message.tsx
+++ b/src/components/Message/Message.tsx
@@ -66,13 +66,13 @@ const MessageWithContext = (props: MessageWithContextProps) => {
   } = props;
 
   const channel = useChannel();
-  const { isMessageAIGenerated } = useChatContext('Message');
+  const { isMessageAIGenerated } = useChatContext();
   const channelConfig = useChannelConfig({ cid: channel.cid });
   const {
     Message: contextMessage = DefaultMessageUI,
     // TODO: remove this passthrough once we drop Message from the ComponentContext
     MessageUI: contextMessageUI = contextMessage,
-  } = useComponentContext('Message');
+  } = useComponentContext();
   const { getTranslationView, setTranslationView: setTranslationViewInContext } =
     useMessageTranslationViewContext();
 
diff --git a/src/components/Message/MessageBlocked.tsx b/src/components/Message/MessageBlocked.tsx
index d24112e1f..6e1dd5bf1 100644
--- a/src/components/Message/MessageBlocked.tsx
+++ b/src/components/Message/MessageBlocked.tsx
@@ -7,7 +7,7 @@ import { useMessageContext } from '../../context';
 
 export const MessageBlocked = () => {
   const { message } = useMessageContext();
-  const { t } = useTranslationContext('MessageBlocked');
+  const { t } = useTranslationContext();
 
   const { isMyMessage } = useUserRole(message);
 
diff --git a/src/components/Message/MessageEditedIndicator.tsx b/src/components/Message/MessageEditedIndicator.tsx
index 5daf71025..37488ee0d 100644
--- a/src/components/Message/MessageEditedIndicator.tsx
+++ b/src/components/Message/MessageEditedIndicator.tsx
@@ -19,9 +19,9 @@ export type MessageEditedIndicatorProps = TimestampFormatterOptions & {
 
 const UnMemoizedMessageEditedIndicator = (props: MessageEditedIndicatorProps) => {
   const { customClass, message: propMessage, ...timestampProps } = props;
-  const { message: contextMessage } = useMessageContext('MessageEditedIndicator');
-  const { t } = useTranslationContext('MessageEditedIndicator');
-  const { Timestamp = DefaultTimestamp } = useComponentContext('MessageEditedIndicator');
+  const { message: contextMessage } = useMessageContext();
+  const { t } = useTranslationContext();
+  const { Timestamp = DefaultTimestamp } = useComponentContext();
   const message = propMessage ?? contextMessage;
 
   const [referenceElement, setReferenceElement] = useState<HTMLSpanElement | null>(null);
diff --git a/src/components/Message/MessageRepliesCountButton.tsx b/src/components/Message/MessageRepliesCountButton.tsx
index 4f47d6a76..d9063580a 100644
--- a/src/components/Message/MessageRepliesCountButton.tsx
+++ b/src/components/Message/MessageRepliesCountButton.tsx
@@ -1,12 +1,12 @@
 import type { MouseEventHandler } from 'react';
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useContext, useMemo } from 'react';
 import type { UserResponse } from 'stream-chat';
 
 import { useTranslationContext } from '../../context/TranslationContext';
 import {
+  MessageContext,
   useChannel,
   useComponentContext,
-  useMessageContext,
   useWorkspaceNavigation,
 } from '../../context';
 import { useStateStore } from '../../store';
@@ -29,7 +29,7 @@ function UnMemoizedMessageRepliesCountButton(props: MessageRepliesCountButtonPro
   const {
     AvatarStack = DefaultAvatarStack,
     extractDisplayInfo = defaultExtractDisplayInfo,
-  } = useComponentContext(MessageRepliesCountButton.name);
+  } = useComponentContext();
   const {
     labelPlural,
     labelSingle,
@@ -37,7 +37,8 @@ function UnMemoizedMessageRepliesCountButton(props: MessageRepliesCountButtonPro
     reply_count: replyCountFromProps = 0,
     thread_participants: threadParticipantsFromProps = [],
   } = props;
-  const { message: contextMessage } = useMessageContext(MessageRepliesCountButton.name);
+  // reply counts also render outside a message, from props alone
+  const { message: contextMessage } = useContext(MessageContext) ?? {};
   const channel = useChannel();
   const { openThread } = useWorkspaceNavigation();
   const replyMetadataSelector = useMemo(
@@ -59,7 +60,7 @@ function UnMemoizedMessageRepliesCountButton(props: MessageRepliesCountButtonPro
   const threadParticipants =
     threadParticipantsFromPaginator ?? threadParticipantsFromProps;
 
-  const { t } = useTranslationContext('MessageRepliesCountButton');
+  const { t } = useTranslationContext();
 
   const avatarStackDisplayInfo = useMemo(
     () => threadParticipants.slice(0, 3).map((user) => extractDisplayInfo({ user })),
diff --git a/src/components/Message/MessageStatus.tsx b/src/components/Message/MessageStatus.tsx
index e49ce8b7d..54a31ade2 100644
--- a/src/components/Message/MessageStatus.tsx
+++ b/src/components/Message/MessageStatus.tsx
@@ -39,11 +39,11 @@ const UnMemoizedMessageStatus = (props: MessageStatusProps) => {
   const { handleEnter, handleLeave, tooltipVisible } =
     useEnterLeaveHandlers<HTMLSpanElement>();
 
-  const { client } = useChatContext('MessageStatus');
+  const { client } = useChatContext();
   const threadInstance = useThreadContext();
   const { deliveredTo, isMyMessage, lastOwnMessage, message, readBy, returnAllReadData } =
-    useMessageContext('MessageStatus');
-  const { t } = useTranslationContext('MessageStatus');
+    useMessageContext();
+  const { t } = useTranslationContext();
   const [referenceElement, setReferenceElement] = useState<HTMLSpanElement | null>(null);
 
   if (!isMyMessage() || message.type === 'error') return null;
diff --git a/src/components/Message/MessageText.tsx b/src/components/Message/MessageText.tsx
index 507ba6b01..7c06f6343 100644
--- a/src/components/Message/MessageText.tsx
+++ b/src/components/Message/MessageText.tsx
@@ -36,11 +36,11 @@ const UnMemoizedMessageTextComponent = (props: MessageTextProps) => {
     renderText: contextRenderText,
     translationView = 'translated',
     unsafeHTML,
-  } = useMessageContext('MessageText');
+  } = useMessageContext();
 
   const renderText = propsRenderText ?? contextRenderText ?? defaultRenderText;
 
-  const { t, userLanguage } = useTranslationContext('MessageText');
+  const { t, userLanguage } = useTranslationContext();
   const message = propMessage || contextMessage;
   const hasAttachment = messageHasAttachments(message);
   const messageContextId = useStableId();
diff --git a/src/components/Message/MessageTimestamp.tsx b/src/components/Message/MessageTimestamp.tsx
index 77d10357f..8ba1d2599 100644
--- a/src/components/Message/MessageTimestamp.tsx
+++ b/src/components/Message/MessageTimestamp.tsx
@@ -15,8 +15,8 @@ export type MessageTimestampProps = TimestampFormatterOptions & {
 
 const UnMemoizedMessageTimestamp = (props: MessageTimestampProps) => {
   const { message: propMessage, ...timestampProps } = props;
-  const { message: contextMessage } = useMessageContext('MessageTimestamp');
-  const { Timestamp = DefaultTimestamp } = useComponentContext('MessageTimestamp');
+  const { message: contextMessage } = useMessageContext();
+  const { Timestamp = DefaultTimestamp } = useComponentContext();
   const message = propMessage || contextMessage;
   return <Timestamp timestamp={message.created_at} {...timestampProps} />;
 };
diff --git a/src/components/Message/MessageTranslationIndicator.tsx b/src/components/Message/MessageTranslationIndicator.tsx
index 6b523c1a2..ebb62f8ae 100644
--- a/src/components/Message/MessageTranslationIndicator.tsx
+++ b/src/components/Message/MessageTranslationIndicator.tsx
@@ -21,7 +21,7 @@ export const MessageTranslationIndicator = ({
     message: contextMessage,
     setTranslationView,
     translationView,
-  } = useMessageContext('MessageTranslationIndicator');
+  } = useMessageContext();
   const message = propMessage ?? contextMessage;
 
   const translatedTextForUser = useMemo(
diff --git a/src/components/Message/MessageUI.tsx b/src/components/Message/MessageUI.tsx
index 96631f0f0..e14f4264b 100644
--- a/src/components/Message/MessageUI.tsx
+++ b/src/components/Message/MessageUI.tsx
@@ -69,7 +69,7 @@ const MessageUIWithContext = ({
   const channel = useChannel();
   const threadInstance = useThreadContext();
   const { client } = useChatContext();
-  const { t } = useTranslationContext('MessageUI');
+  const { t } = useTranslationContext();
   const [isBounceDialogOpen, setIsBounceDialogOpen] = useState(false);
   const reminder = useMessageReminder(message.id);
 
@@ -93,7 +93,7 @@ const MessageUIWithContext = ({
     QuotedMessage = DefaultQuotedMessage,
     ReminderNotification = DefaultReminderNotification,
     StreamedMessageText = DefaultStreamedMessageText,
-  } = useComponentContext('MessageUI');
+  } = useComponentContext();
 
   const isAIGenerated = useMemo(
     () => isMessageAIGenerated?.(message),
@@ -287,7 +287,7 @@ const MemoizedMessageUI = React.memo(
  * The default UI component that renders a message and receives functionality and logic from the MessageContext.
  */
 export const MessageUI = (props: MessageUIComponentProps) => {
-  const messageContext = useMessageContext('MessageUI');
+  const messageContext = useMessageContext();
 
   return <MemoizedMessageUI {...messageContext} {...props} />;
 };
diff --git a/src/components/Message/QuotedMessage.tsx b/src/components/Message/QuotedMessage.tsx
index 1dea57cb4..65ba39813 100644
--- a/src/components/Message/QuotedMessage.tsx
+++ b/src/components/Message/QuotedMessage.tsx
@@ -7,7 +7,7 @@ import { useMessagePaginator } from '../../hooks';
 export type QuotedMessageProps = Pick<MessageContextValue, 'renderText'>;
 
 export const QuotedMessage = ({ renderText: propsRenderText }: QuotedMessageProps) => {
-  const { message, renderText: contextRenderText } = useMessageContext('QuotedMessage');
+  const { message, renderText: contextRenderText } = useMessageContext();
   const messagePaginator = useMessagePaginator();
 
   const renderText = propsRenderText ?? contextRenderText;
diff --git a/src/components/Message/StreamedMessageText.tsx b/src/components/Message/StreamedMessageText.tsx
index feeabbe99..0447f6936 100644
--- a/src/components/Message/StreamedMessageText.tsx
+++ b/src/components/Message/StreamedMessageText.tsx
@@ -21,7 +21,7 @@ export const StreamedMessageText = (props: StreamedMessageTextProps) => {
     renderText,
     streamingLetterIntervalMs,
   } = props;
-  const { message: messageFromContext } = useMessageContext('StreamedMessageText');
+  const { message: messageFromContext } = useMessageContext();
   const channel = useChannel();
   const message = messageFromProps || messageFromContext;
   const { text = '' } = message;
diff --git a/src/components/Message/Timestamp.tsx b/src/components/Message/Timestamp.tsx
index 58f4f3fda..5ee4cfdc6 100644
--- a/src/components/Message/Timestamp.tsx
+++ b/src/components/Message/Timestamp.tsx
@@ -1,6 +1,6 @@
-import React, { useMemo } from 'react';
+import React, { useContext, useMemo } from 'react';
 
-import { useMessageContext } from '../../context/MessageContext';
+import { MessageContext } from '../../context/MessageContext';
 import { useTranslationContext } from '../../context/TranslationContext';
 import { getDateString, isDate } from '../../i18n/utils';
 import type { TimestampFormatterOptions } from '../../i18n/types';
@@ -15,8 +15,9 @@ export interface TimestampProps extends TimestampFormatterOptions {
 export function Timestamp(props: TimestampProps) {
   const { calendar, calendarFormats, customClass, format, timestamp } = props;
 
-  const { formatDate } = useMessageContext('MessageTimestamp');
-  const { t, tDateTimeParser } = useTranslationContext('MessageTimestamp');
+  // also rendered outside a message (channel list items, composer previews)
+  const { formatDate } = useContext(MessageContext) ?? {};
+  const { t, tDateTimeParser } = useTranslationContext();
 
   const normalizedTimestamp =
     timestamp && isDate(timestamp) ? timestamp.toISOString() : timestamp;
diff --git a/src/components/Message/hooks/useDeleteHandler.ts b/src/components/Message/hooks/useDeleteHandler.ts
index 047fa64fb..861f2b57c 100644
--- a/src/components/Message/hooks/useDeleteHandler.ts
+++ b/src/components/Message/hooks/useDeleteHandler.ts
@@ -21,8 +21,8 @@ export const useDeleteHandler = (
 
   const channel = useChannel();
   const thread = useThreadContext();
-  const { client } = useChatContext('useDeleteHandler');
-  const { t } = useTranslationContext('useDeleteHandler');
+  const { client } = useChatContext();
+  const { t } = useTranslationContext();
   const messagePaginator = useMessagePaginator();
 
   return async (options?: DeleteMessageOptions) => {
diff --git a/src/components/Message/hooks/useFlagHandler.ts b/src/components/Message/hooks/useFlagHandler.ts
index b5cd472a8..ad8cdda91 100644
--- a/src/components/Message/hooks/useFlagHandler.ts
+++ b/src/components/Message/hooks/useFlagHandler.ts
@@ -8,8 +8,8 @@ export const missingUseFlagHandlerParameterWarning =
   'useFlagHandler was called but it is missing one or more necessary parameters.';
 
 export const useFlagHandler = (message?: LocalMessage): ReactEventHandler => {
-  const { client } = useChatContext('useFlagHandler');
-  const { t } = useTranslationContext('useFlagHandler');
+  const { client } = useChatContext();
+  const { t } = useTranslationContext();
 
   return async (event) => {
     event.preventDefault();
diff --git a/src/components/Message/hooks/useMessageAlsoSentInChannelNavigation.ts b/src/components/Message/hooks/useMessageAlsoSentInChannelNavigation.ts
index 4d63f3d36..f6209df74 100644
--- a/src/components/Message/hooks/useMessageAlsoSentInChannelNavigation.ts
+++ b/src/components/Message/hooks/useMessageAlsoSentInChannelNavigation.ts
@@ -35,7 +35,7 @@ export const useMessageAlsoSentInChannelNavigation =
     const channel = useChannel();
     const { isChannelActive, openChannel, openThread } = useWorkspaceNavigation();
     const thread = useThreadContext();
-    const { message } = useMessageContext('useMessageAlsoSentInChannelNavigation');
+    const { message } = useMessageContext();
 
     const addThreadNotFoundNotification = (error: Error) => {
       client.notifications.addError({
diff --git a/src/components/Message/hooks/useMuteHandler.ts b/src/components/Message/hooks/useMuteHandler.ts
index e7fd9e470..133564da8 100644
--- a/src/components/Message/hooks/useMuteHandler.ts
+++ b/src/components/Message/hooks/useMuteHandler.ts
@@ -20,8 +20,8 @@ export const useMuteHandler = (
   message?: LocalMessage,
   notifications: MuteUserNotifications = {},
 ): ReactEventHandler => {
-  const { client } = useChatContext('useMuteHandler');
-  const { t } = useTranslationContext('useMuteHandler');
+  const { client } = useChatContext();
+  const { t } = useTranslationContext();
 
   return async (event) => {
     event.preventDefault();
diff --git a/src/components/Message/hooks/usePinHandler.ts b/src/components/Message/hooks/usePinHandler.ts
index c5858e783..6acc7da86 100644
--- a/src/components/Message/hooks/usePinHandler.ts
+++ b/src/components/Message/hooks/usePinHandler.ts
@@ -46,8 +46,8 @@ export const usePinHandler = (
   const { getErrorNotification, notify } = notifications;
 
   const messagePaginator = useMessagePaginator();
-  const { client } = useChatContext('usePinHandler');
-  const { t } = useTranslationContext('usePinHandler');
+  const { client } = useChatContext();
+  const { t } = useTranslationContext();
 
   const handlePin: ReactEventHandler = async (event) => {
     event.preventDefault();
diff --git a/src/components/Message/hooks/useReactionHandler.ts b/src/components/Message/hooks/useReactionHandler.ts
index d3508bbcf..14330efea 100644
--- a/src/components/Message/hooks/useReactionHandler.ts
+++ b/src/components/Message/hooks/useReactionHandler.ts
@@ -25,9 +25,8 @@ Make sure the ChannelAction and ChannelState contexts are properly set and the h
 export const useReactionHandler = (message?: LocalMessage) => {
   const channel = useChannel();
   const messagePaginator = useMessagePaginator();
-  const { client } = useChatContext('useReactionHandler');
-  const { reactionOptions = defaultReactionOptions } =
-    useComponentContext('useReactionHandler');
+  const { client } = useChatContext();
+  const { reactionOptions = defaultReactionOptions } = useComponentContext();
 
   const updateMessage = useCallback(
     (updatedMessage: LocalMessage | MessageResponse) => {
diff --git a/src/components/Message/hooks/useReactionsFetcher.ts b/src/components/Message/hooks/useReactionsFetcher.ts
index ed17fb627..80908c6ea 100644
--- a/src/components/Message/hooks/useReactionsFetcher.ts
+++ b/src/components/Message/hooks/useReactionsFetcher.ts
@@ -11,7 +11,7 @@ import type { ReactionType } from '../../Reactions/types';
 export const MAX_MESSAGE_REACTIONS_TO_FETCH = 1000;
 
 export function useReactionsFetcher(message: LocalMessage) {
-  const { client } = useChatContext('useRectionsFetcher');
+  const { client } = useChatContext();
 
   return useStableCallback((reactionType?: ReactionType, sort?: ReactionSort) =>
     fetchMessageReactions(client, message.id, reactionType, sort),
diff --git a/src/components/Message/hooks/useUserRole.ts b/src/components/Message/hooks/useUserRole.ts
index 8580498a2..dc9927daf 100644
--- a/src/components/Message/hooks/useUserRole.ts
+++ b/src/components/Message/hooks/useUserRole.ts
@@ -4,7 +4,7 @@ import type { LocalMessage } from 'stream-chat';
 
 export const useUserRole = (message: LocalMessage, disableQuotedMessages?: boolean) => {
   const channel = useChannel();
-  const { client } = useChatContext('useUserRole');
+  const { client } = useChatContext();
   const channelCapabilities = useChannelCapabilities({ cid: channel.cid });
 
   /**
diff --git a/src/components/MessageComposer/AttachmentPreviewList/FileAttachmentPreview.tsx b/src/components/MessageComposer/AttachmentPreviewList/FileAttachmentPreview.tsx
index 2eeab61c0..65b4a4ec7 100644
--- a/src/components/MessageComposer/AttachmentPreviewList/FileAttachmentPreview.tsx
+++ b/src/components/MessageComposer/AttachmentPreviewList/FileAttachmentPreview.tsx
@@ -19,7 +19,7 @@ export const FileAttachmentPreview = ({
   handleRetry,
   removeAttachments,
 }: FileAttachmentPreviewProps) => {
-  const { t } = useTranslationContext('FilePreview');
+  const { t } = useTranslationContext();
   const { id, uploadPermissionCheck, uploadProgress, uploadState } =
     attachment.localMetadata ?? {};
 
diff --git a/src/components/MessageComposer/MessageComposer.tsx b/src/components/MessageComposer/MessageComposer.tsx
index 36193a428..6bd0593f6 100644
--- a/src/components/MessageComposer/MessageComposer.tsx
+++ b/src/components/MessageComposer/MessageComposer.tsx
@@ -76,7 +76,7 @@ export type MessageComposerProps = {
 
 const MessageComposerProvider = (props: PropsWithChildren<MessageComposerProps>) => {
   const messageComposerBindings = useMessageComposerBindings(props);
-  const { emojiSearchIndex } = useComponentContext('MessageComposer');
+  const { emojiSearchIndex } = useComponentContext();
 
   const messageComposerContextValue = useCreateMessageComposerContext({
     ...messageComposerBindings,
@@ -123,8 +123,7 @@ const MessageComposerProvider = (props: PropsWithChildren<MessageComposerProps>)
 };
 
 const UnMemoizedMessageComposer = (props: MessageComposerProps) => {
-  const { MessageComposerUI = DefaultMessageComposerUI } =
-    useComponentContext('MessageComposer');
+  const { MessageComposerUI = DefaultMessageComposerUI } = useComponentContext();
   const messageComposer = useMessageComposerController();
   const id = useStableId();
 
diff --git a/src/components/MessageComposer/MessageComposerUI.tsx b/src/components/MessageComposer/MessageComposerUI.tsx
index f70a90906..fe3f57bd6 100644
--- a/src/components/MessageComposer/MessageComposerUI.tsx
+++ b/src/components/MessageComposer/MessageComposerUI.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useContext } from 'react';
 import clsx from 'clsx';
 
 import {
@@ -17,7 +17,7 @@ import { SendToChannelCheckbox as DefaultSendToChannelCheckbox } from './SendToC
 import { TextareaComposer as DefaultTextareaComposer } from '../TextareaComposer';
 import { useMessageComposerContext as useMessageComposerContext } from '../../context/MessageComposerContext';
 import { useComponentContext } from '../../context/ComponentContext';
-import { useMessageContext } from '../../context';
+import { MessageContext } from '../../context';
 import { restorePreEditSnapshot } from './preEditSnapshot';
 import { WithDragAndDropUpload } from './WithDragAndDropUpload';
 import {
@@ -138,7 +138,8 @@ const MessageComposerPreviews = () => {
 };
 
 export const MessageComposerUI = () => {
-  const { message } = useMessageContext();
+  // a message is present only while editing
+  const { message } = useContext(MessageContext) ?? {};
   const { recordingController } = useMessageComposerContext();
   const messageComposerController = useMessageComposerController();
   const { command } = useStateStore(
diff --git a/src/components/MessageComposer/WithDragAndDropUpload.tsx b/src/components/MessageComposer/WithDragAndDropUpload.tsx
index a40a8c57e..ff2ed4089 100644
--- a/src/components/MessageComposer/WithDragAndDropUpload.tsx
+++ b/src/components/MessageComposer/WithDragAndDropUpload.tsx
@@ -4,7 +4,7 @@ import { useDropzone } from 'react-dropzone';
 import clsx from 'clsx';
 import type { MessageComposerConfig } from 'stream-chat';
 
-import { useMessageComposerContext, useTranslationContext } from '../../context';
+import { useIsWithinMessageComposerContext, useTranslationContext } from '../../context';
 import { useAttachmentManagerState, useMessageComposerController } from './hooks';
 import { useStateStore } from '../../store';
 import { useIsCooldownActive } from './hooks/useIsCooldownActive';
@@ -70,7 +70,6 @@ export const WithDragAndDropUpload = ({
   style?: CSSProperties;
 }>) => {
   const dropHandlersRef = useRef<Set<(f: File[]) => void>>(new Set());
-  const messageComposerContext = useMessageComposerContext();
   const dragAndDropUploadContext = useDragAndDropUploadContext();
   const messageComposer = useMessageComposerController();
   const { isUploadEnabled } = useAttachmentManagerState();
@@ -81,7 +80,7 @@ export const WithDragAndDropUpload = ({
 
   const isCooldownActive = useIsCooldownActive();
   // if message composer context is available, there's no need to use the queue
-  const isWithinMessageComposerContext = Object.keys(messageComposerContext).length > 0;
+  const isWithinMessageComposerContext = useIsWithinMessageComposerContext();
 
   const accept = useMemo(
     () =>
diff --git a/src/components/MessageComposer/__tests__/WithDragAndDropUpload.test.tsx b/src/components/MessageComposer/__tests__/WithDragAndDropUpload.test.tsx
new file mode 100644
index 000000000..3fe43f676
--- /dev/null
+++ b/src/components/MessageComposer/__tests__/WithDragAndDropUpload.test.tsx
@@ -0,0 +1,106 @@
+// Import the root barrel first so the module graph initialises in the same order as in the app
+// (see the note in MessageInput.test.tsx).
+import '../../..';
+import React, { useEffect } from 'react';
+import { act, fireEvent, render, screen } from '@testing-library/react';
+import { fromPartial } from '@total-typescript/shoehorn';
+
+import { Channel } from '../../Channel/Channel';
+import { MessageComposerContextProvider } from '../../../context';
+import { Chat } from '../../Chat';
+import type { MessageComposerContextValue } from '../../../context';
+import {
+  useDragAndDropUploadContext,
+  WithDragAndDropUpload,
+} from '../WithDragAndDropUpload';
+import { initClientWithChannels } from '../../../mock-builders';
+
+const dropFile = (file: File, element: Element) =>
+  fireEvent.drop(element, {
+    dataTransfer: { files: [file], types: ['Files'] },
+  });
+
+const file = () => new File(['content'], 'note.txt', { type: 'text/plain' });
+
+/** Stands in for the MessageComposerProvider, which is what registers drop handlers in the app. */
+const DropSubscriber = ({ onDrop }: { onDrop: (files: File[]) => void }) => {
+  const { subscribeToDrop } = useDragAndDropUploadContext();
+
+  useEffect(() => subscribeToDrop?.(onDrop), [onDrop, subscribeToDrop]);
+
+  return <div data-testid='subscriber' />;
+};
+
+const setup = async () => {
+  const {
+    channels: [channel],
+    client,
+  } = await initClientWithChannels({
+    // the dropzone is disabled in direct mode unless uploads are permitted
+    channelsData: [{ channel: { own_capabilities: ['upload-file'] } }],
+  });
+  const uploadFiles = vi
+    .spyOn(channel.messageComposer.attachmentManager, 'uploadFiles')
+    .mockResolvedValue(undefined);
+
+  return { channel, client, queuedHandler: vi.fn(), uploadFiles };
+};
+
+const dropOnRoot = async () => {
+  const dropped = file();
+  // async act: the direct-mode onDrop (attachmentManager.uploadFiles) returns a promise
+  await act(async () => {
+    await dropFile(dropped, screen.getByTestId('subscriber').parentElement!);
+  });
+  return dropped;
+};
+
+describe('WithDragAndDropUpload', () => {
+  it('uploads straight to the surrounding composer when rendered within MessageComposerContextProvider', async () => {
+    const { channel, client, queuedHandler, uploadFiles } = await setup();
+
+    await act(async () => {
+      await render(
+        <Chat client={client}>
+          <Channel channel={channel}>
+            <MessageComposerContextProvider
+              value={fromPartial<MessageComposerContextValue>({})}
+            >
+              <WithDragAndDropUpload>
+                <DropSubscriber onDrop={queuedHandler} />
+              </WithDragAndDropUpload>
+            </MessageComposerContextProvider>
+          </Channel>
+        </Chat>,
+      );
+    });
+
+    const dropped = await dropOnRoot();
+
+    // react-dropzone invokes onDrop as (acceptedFiles, fileRejections, event)
+    expect(uploadFiles).toHaveBeenCalledTimes(1);
+    expect(uploadFiles.mock.calls[0][0]).toEqual([dropped]);
+    expect(queuedHandler).not.toHaveBeenCalled();
+  });
+
+  it('fans drops out to subscribed composers when rendered outside MessageComposerContextProvider', async () => {
+    const { channel, client, queuedHandler, uploadFiles } = await setup();
+
+    await act(async () => {
+      await render(
+        <Chat client={client}>
+          <Channel channel={channel}>
+            <WithDragAndDropUpload>
+              <DropSubscriber onDrop={queuedHandler} />
+            </WithDragAndDropUpload>
+          </Channel>
+        </Chat>,
+      );
+    });
+
+    const dropped = await dropOnRoot();
+
+    expect(queuedHandler).toHaveBeenCalledWith([dropped]);
+    expect(uploadFiles).not.toHaveBeenCalled();
+  });
+});
diff --git a/src/components/MessageComposer/hooks/useSendMessageFn.ts b/src/components/MessageComposer/hooks/useSendMessageFn.ts
index 86f4178fe..c281750d1 100644
--- a/src/components/MessageComposer/hooks/useSendMessageFn.ts
+++ b/src/components/MessageComposer/hooks/useSendMessageFn.ts
@@ -29,7 +29,7 @@ export const useSendMessageFn = () => {
   const channel = useChannel();
   const thread = useThreadContext();
   const messageComposer = useMessageComposerController();
-  const { t } = useTranslationContext('useSendMessageFn');
+  const { t } = useTranslationContext();
 
   /**
    * Resolves with `true` when the message was sent, `false` when there was nothing to send or the
diff --git a/src/components/MessageComposer/hooks/useUpdateMessageFn.ts b/src/components/MessageComposer/hooks/useUpdateMessageFn.ts
index 9fc21b9f8..a3927de93 100644
--- a/src/components/MessageComposer/hooks/useUpdateMessageFn.ts
+++ b/src/components/MessageComposer/hooks/useUpdateMessageFn.ts
@@ -10,7 +10,7 @@ export const useUpdateMessageFn = () => {
   const channel = useChannel();
   const thread = useThreadContext();
   const messageComposer = useMessageComposerController();
-  const { t } = useTranslationContext('useUpdateMessageFn');
+  const { t } = useTranslationContext();
 
   return useCallback(async () => {
     const composition = await messageComposer.compose();
diff --git a/src/components/MessageComposer/icons.tsx b/src/components/MessageComposer/icons.tsx
index 9cf25ed9c..211013b1b 100644
--- a/src/components/MessageComposer/icons.tsx
+++ b/src/components/MessageComposer/icons.tsx
@@ -1,7 +1,7 @@
 import { useTranslationContext } from '../../context/TranslationContext';
 
 export const UploadIcon = () => {
-  const { t } = useTranslationContext('UploadIcon');
+  const { t } = useTranslationContext();
   return (
     <svg
       data-testid='attach-icon'
diff --git a/src/components/MessageList/FloatingDateSeparator.tsx b/src/components/MessageList/FloatingDateSeparator.tsx
index cb8ff2145..8bff57ca6 100644
--- a/src/components/MessageList/FloatingDateSeparator.tsx
+++ b/src/components/MessageList/FloatingDateSeparator.tsx
@@ -30,9 +30,7 @@ export type FloatingDateSeparatorProps = BaseProps &
  * Use itemsRenderedRef for Virtuoso, listElement for non-virtualized MessageList.
  */
 export const FloatingDateSeparator = (props: FloatingDateSeparatorProps) => {
-  const { DateSeparator = DefaultDateSeparator } = useComponentContext(
-    'FloatingDateSeparator',
-  );
+  const { DateSeparator = DefaultDateSeparator } = useComponentContext();
   const { disableDateSeparator, processedMessages } = props;
 
   const listElement = 'listElement' in props ? props.listElement : null;
diff --git a/src/components/MessageList/MessageList.tsx b/src/components/MessageList/MessageList.tsx
index e01b346df..0c65a42bb 100644
--- a/src/components/MessageList/MessageList.tsx
+++ b/src/components/MessageList/MessageList.tsx
@@ -112,7 +112,7 @@ const MessageListWithContext = (props: MessageListWithContextProps) => {
 
   const [listElement, setListElement] = React.useState<HTMLDivElement | null>(null);
 
-  const { customClasses } = useChatContext('MessageList');
+  const { customClasses } = useChatContext();
 
   const {
     EmptyStateIndicator = DefaultEmptyStateIndicator,
@@ -123,7 +123,7 @@ const MessageListWithContext = (props: MessageListWithContextProps) => {
     NotificationList = DefaultNotificationList,
     TypingIndicator = DefaultTypingIndicator,
     UnreadMessagesNotification = DefaultUnreadMessagesNotification,
-  } = useComponentContext('MessageList');
+  } = useComponentContext();
   const messagePaginator = useMessagePaginator();
 
   const { hasMoreNewer, isLoading, messages } = useStateStore(
diff --git a/src/components/MessageList/UnreadMessagesNotification.tsx b/src/components/MessageList/UnreadMessagesNotification.tsx
index f71fd9db4..a36cdba3d 100644
--- a/src/components/MessageList/UnreadMessagesNotification.tsx
+++ b/src/components/MessageList/UnreadMessagesNotification.tsx
@@ -31,7 +31,7 @@ export const UnreadMessagesNotification = ({
 }: UnreadMessagesNotificationProps) => {
   // todo: move into a hook dedicated to unread count from the snapshot
   const channel = useChannel();
-  const { client } = useChatContext('UnreadMessagesNotification');
+  const { client } = useChatContext();
   const thread = useThreadContext();
   const messagePaginator = useMessagePaginator();
   const { unreadCount } = useStateStore(
@@ -39,7 +39,7 @@ export const UnreadMessagesNotification = ({
     unreadStateSnapshotSelector,
   );
 
-  const { t } = useTranslationContext('UnreadMessagesNotification');
+  const { t } = useTranslationContext();
 
   return (
     <div
diff --git a/src/components/MessageList/UnreadMessagesSeparator.tsx b/src/components/MessageList/UnreadMessagesSeparator.tsx
index 797d36cb3..54f3f4ba4 100644
--- a/src/components/MessageList/UnreadMessagesSeparator.tsx
+++ b/src/components/MessageList/UnreadMessagesSeparator.tsx
@@ -21,9 +21,9 @@ export const UnreadMessagesSeparator = ({
   showCount = true,
   unreadCount,
 }: UnreadMessagesSeparatorProps) => {
-  const { t } = useTranslationContext('UnreadMessagesSeparator');
+  const { t } = useTranslationContext();
   const channel = useChannel();
-  const { client } = useChatContext('UnreadMessagesSeparator');
+  const { client } = useChatContext();
   const messagePaginator = useMessagePaginator();
   return (
     <div
diff --git a/src/components/MessageList/VirtualizedMessageList.tsx b/src/components/MessageList/VirtualizedMessageList.tsx
index 85b4ab3bc..195715e03 100644
--- a/src/components/MessageList/VirtualizedMessageList.tsx
+++ b/src/components/MessageList/VirtualizedMessageList.tsx
@@ -273,10 +273,10 @@ const VirtualizedMessageListWithContext = (
     UnreadMessagesNotification = DefaultUnreadMessagesNotification,
     UnreadMessagesSeparator = DefaultUnreadMessagesSeparator,
     VirtualMessage: MessageUIComponentFromContext = MessageUI,
-  } = useComponentContext('VirtualizedMessageList');
+  } = useComponentContext();
   const MessageUIComponent = MessageUIComponentFromProps || MessageUIComponentFromContext;
 
-  const { client, customClasses } = useChatContext('VirtualizedMessageList');
+  const { client, customClasses } = useChatContext();
   const messagePaginator = useMessagePaginator();
 
   const { hasMoreNewer, isLoading, messages } = useStateStore(
diff --git a/src/components/MessageList/VirtualizedMessageListComponents.tsx b/src/components/MessageList/VirtualizedMessageListComponents.tsx
index 4d01c79d7..4c4eeb747 100644
--- a/src/components/MessageList/VirtualizedMessageListComponents.tsx
+++ b/src/components/MessageList/VirtualizedMessageListComponents.tsx
@@ -67,9 +67,7 @@ export const Item = ({ context, ...props }: ItemProps & CommonVirtuosoComponentP
   );
 };
 export const Header = ({ context }: CommonVirtuosoComponentProps) => {
-  const { LoadingIndicator = DefaultLoadingIndicator } = useComponentContext(
-    'VirtualizedMessageListHeader',
-  );
+  const { LoadingIndicator = DefaultLoadingIndicator } = useComponentContext();
 
   return (
     <>
@@ -85,9 +83,7 @@ export const Header = ({ context }: CommonVirtuosoComponentProps) => {
 export const EmptyPlaceholder = ({ context }: CommonVirtuosoComponentProps) => {
   const thread = useThreadContext();
   const isThreadList = !!thread;
-  const { EmptyStateIndicator = DefaultEmptyStateIndicator } = useComponentContext(
-    'VirtualizedMessageList',
-  );
+  const { EmptyStateIndicator = DefaultEmptyStateIndicator } = useComponentContext();
   // prevent showing that there are no messages if there actually are messages (for some reason virtuoso decides to render empty placeholder first, even though it has the totalCount prop > 0)
   if (
     typeof context?.processedMessages !== 'undefined' &&
diff --git a/src/components/MessageList/hooks/MessageList/useEnrichedMessages.ts b/src/components/MessageList/hooks/MessageList/useEnrichedMessages.ts
index 5d10e87c5..d5c438994 100644
--- a/src/components/MessageList/hooks/MessageList/useEnrichedMessages.ts
+++ b/src/components/MessageList/hooks/MessageList/useEnrichedMessages.ts
@@ -39,8 +39,8 @@ export const useEnrichedMessages = (args: {
     reviewProcessedMessage,
   } = args;
 
-  const { client } = useChatContext('useEnrichedMessages');
-  const { HeaderComponent } = useComponentContext('useEnrichedMessages');
+  const { client } = useChatContext();
+  const { HeaderComponent } = useComponentContext();
 
   const lastRead = useMemo(() => channel.lastRead?.(), [channel]);
 
diff --git a/src/components/MessageList/hooks/MessageList/useMessageListElements.tsx b/src/components/MessageList/hooks/MessageList/useMessageListElements.tsx
index 6ed0b4595..07b981478 100644
--- a/src/components/MessageList/hooks/MessageList/useMessageListElements.tsx
+++ b/src/components/MessageList/hooks/MessageList/useMessageListElements.tsx
@@ -39,9 +39,9 @@ export const useMessageListElements = (props: UseMessageListElementsProps) => {
     returnAllReadData,
   } = props;
 
-  const { customClasses } = useChatContext('useMessageListElements');
+  const { customClasses } = useChatContext();
   const channel = useChannel();
-  const components = useComponentContext('useMessageListElements');
+  const components = useComponentContext();
   const channelUnreadUiState = useStateStore(
     channel.messagePaginator.unreadStateSnapshot,
     unreadStateSnapshotSelector,
diff --git a/src/components/MessageList/hooks/MessageList/useMessageListScrollManager.ts b/src/components/MessageList/hooks/MessageList/useMessageListScrollManager.ts
index ee053e020..2fd1d4769 100644
--- a/src/components/MessageList/hooks/MessageList/useMessageListScrollManager.ts
+++ b/src/components/MessageList/hooks/MessageList/useMessageListScrollManager.ts
@@ -99,7 +99,7 @@ export function useMessageListScrollManager(params: UseMessageListScrollManagerP
     suppressAutoscroll = false,
   } = params;
 
-  const { client } = useChatContext('useMessageListScrollManager');
+  const { client } = useChatContext();
 
   const measures = useRef<ContainerMeasures>({
     offsetHeight: 0,
diff --git a/src/components/MessageList/hooks/VirtualizedMessageList/useGiphyPreview.ts b/src/components/MessageList/hooks/VirtualizedMessageList/useGiphyPreview.ts
index 6607aa92e..5a8015360 100644
--- a/src/components/MessageList/hooks/VirtualizedMessageList/useGiphyPreview.ts
+++ b/src/components/MessageList/hooks/VirtualizedMessageList/useGiphyPreview.ts
@@ -7,7 +7,7 @@ import type { EventPayload, LocalMessage } from 'stream-chat';
 export const useGiphyPreview = (separateGiphyPreview: boolean) => {
   const [giphyPreviewMessage, setGiphyPreviewMessage] = useState<LocalMessage>();
 
-  const { client } = useChatContext('useGiphyPreview');
+  const { client } = useChatContext();
 
   useEffect(() => {
     if (!separateGiphyPreview) return;
diff --git a/src/components/Poll/PollActions/PollActions.tsx b/src/components/Poll/PollActions/PollActions.tsx
index 53085942b..b49c7c874 100644
--- a/src/components/Poll/PollActions/PollActions.tsx
+++ b/src/components/Poll/PollActions/PollActions.tsx
@@ -59,9 +59,9 @@ export const PollActions = ({
 }: PollActionsProps) => {
   const channel = useChannel();
   const { client } = useChatContext();
-  const { t } = useTranslationContext('PollActions');
+  const { t } = useTranslationContext();
   const channelCapabilities = useChannelCapabilities({ cid: channel.cid });
-  const { message } = useMessageContext('PollActions');
+  const { message } = useMessageContext();
   const { poll } = usePollContext();
   const {
     allow_answers,
diff --git a/src/components/Poll/PollCreationDialog/OptionFieldSet.tsx b/src/components/Poll/PollCreationDialog/OptionFieldSet.tsx
index 7efee453d..f31b23f44 100644
--- a/src/components/Poll/PollCreationDialog/OptionFieldSet.tsx
+++ b/src/components/Poll/PollCreationDialog/OptionFieldSet.tsx
@@ -35,7 +35,7 @@ export const OptionFieldSet = () => {
     pollComposer.state,
     pollComposerStateSelector,
   );
-  const { t } = useTranslationContext('OptionFieldSet');
+  const { t } = useTranslationContext();
   const announce = useAriaLiveAnnouncer();
   const { announceInteraction } = useInteractionAnnouncements();
   const optionInputRefs = useRef<Array<HTMLInputElement | null>>([]);
diff --git a/src/components/Poll/PollCreationDialog/PollCreationDialogControls.tsx b/src/components/Poll/PollCreationDialog/PollCreationDialogControls.tsx
index da4197090..46be807d0 100644
--- a/src/components/Poll/PollCreationDialog/PollCreationDialogControls.tsx
+++ b/src/components/Poll/PollCreationDialog/PollCreationDialogControls.tsx
@@ -16,7 +16,7 @@ export type PollCreationDialogControlsProps = {
 export const PollCreationDialogControls = ({
   close,
 }: PollCreationDialogControlsProps) => {
-  const { t } = useTranslationContext('PollCreationDialogControls');
+  const { t } = useTranslationContext();
   const { textareaRef } = useMessageComposerContext();
   const messageComposer = useMessageComposerController();
   const sendMessage = useSendMessageFn();
diff --git a/src/components/Poll/PollHeader.tsx b/src/components/Poll/PollHeader.tsx
index 53b7553af..4380a437e 100644
--- a/src/components/Poll/PollHeader.tsx
+++ b/src/components/Poll/PollHeader.tsx
@@ -19,7 +19,7 @@ const pollStateSelector = (nextValue: PollState): PollStateSelectorReturnValue =
 });
 
 export const PollHeader = () => {
-  const { t } = useTranslationContext('PollHeader');
+  const { t } = useTranslationContext();
 
   const { poll } = usePollContext();
   const { enforce_unique_vote, is_closed, max_votes_allowed, name, options } =
diff --git a/src/components/Poll/PollOptionList.tsx b/src/components/Poll/PollOptionList.tsx
index 34bd312e9..66dabb786 100644
--- a/src/components/Poll/PollOptionList.tsx
+++ b/src/components/Poll/PollOptionList.tsx
@@ -27,7 +27,7 @@ export const PollOptionList = ({
   PollOptionsFullList = DefaultPollOptionsFullList,
 }: PollOptionListProps) => {
   const { PollOptionSelector = DefaultPollOptionSelector } = useComponentContext();
-  const { t } = useTranslationContext('PollOptionList');
+  const { t } = useTranslationContext();
   const { poll } = usePollContext();
   const { options } = useStateStore(poll.state, pollStateSelector);
   const [viewAllOptionsOpen, setViewAllOptionsOpen] = useState(false);
diff --git a/src/components/ReactFileUtilities/UploadButton.tsx b/src/components/ReactFileUtilities/UploadButton.tsx
index 5e0cef11f..a675a49ab 100644
--- a/src/components/ReactFileUtilities/UploadButton.tsx
+++ b/src/components/ReactFileUtilities/UploadButton.tsx
@@ -37,7 +37,7 @@ export const UploadFileInput = forwardRef(function UploadFileInput(
   }: PartialSelected<FileInputProps, 'onFileChange'>,
   ref: React.ForwardedRef<HTMLInputElement>,
 ) {
-  const { t } = useTranslationContext('UploadFileInput');
+  const { t } = useTranslationContext();
   const { textareaRef } = useMessageComposerContext();
   const messageComposer = useMessageComposerController();
   const { attachmentManager } = messageComposer;
diff --git a/src/components/Reactions/MessageReactions.tsx b/src/components/Reactions/MessageReactions.tsx
index d572f569a..b48bb1c1e 100644
--- a/src/components/Reactions/MessageReactions.tsx
+++ b/src/components/Reactions/MessageReactions.tsx
@@ -87,10 +87,10 @@ const UnMemoizedMessageReactions = (props: MessageReactionsProps) => {
   const [selectedReactionType, setSelectedReactionType] = useState<ReactionType | null>(
     null,
   );
-  const { t } = useTranslationContext('MessageReactions');
+  const { t } = useTranslationContext();
   const { MessageReactionsDetail = DefaultMessageReactionsDetail } =
     useComponentContext();
-  const { isMyMessage, message } = useMessageContext('MessageReactions');
+  const { isMyMessage, message } = useMessageContext();
 
   const divRef = useRef<ComponentRef<'div'>>(null);
   const dialogId = DefaultMessageReactionsDetail.getDialogId({
diff --git a/src/components/Reactions/MessageReactionsDetail.tsx b/src/components/Reactions/MessageReactionsDetail.tsx
index c1018cdca..4461912b8 100644
--- a/src/components/Reactions/MessageReactionsDetail.tsx
+++ b/src/components/Reactions/MessageReactionsDetail.tsx
@@ -71,14 +71,14 @@ export const MessageReactionsDetail: MessageReactionsDetailInterface = ({
     LoadingIndicator = MessageReactionsDetailLoadingIndicator,
     reactionOptions = defaultReactionOptions,
     ReactionSelectorExtendedList = ReactionSelector.ExtendedList,
-  } = useComponentContext(MessageReactionsDetail.name);
+  } = useComponentContext();
   const { t } = useTranslationContext();
 
   const {
     handleReaction: contextHandleReaction,
     message,
     reactionDetailsSort: contextReactionDetailsSort,
-  } = useMessageContext(MessageReactionsDetail.name);
+  } = useMessageContext();
 
   const reactionDetailsSort =
     propReactionDetailsSort ?? contextReactionDetailsSort ?? defaultReactionDetailsSort;
diff --git a/src/components/Reactions/ReactionSelector.tsx b/src/components/Reactions/ReactionSelector.tsx
index f03f7b44a..0aaa65763 100644
--- a/src/components/Reactions/ReactionSelector.tsx
+++ b/src/components/Reactions/ReactionSelector.tsx
@@ -43,15 +43,15 @@ export const ReactionSelector: ReactionSelectorInterface = (props) => {
   const {
     reactionOptions = defaultReactionOptions,
     ReactionSelectorExtendedList = ReactionSelector.ExtendedList,
-  } = useComponentContext('ReactionSelector');
+  } = useComponentContext();
 
   const {
     closeReactionSelectorOnClick,
     handleReaction: contextHandleReaction,
     message,
     threadList,
-  } = useMessageContext('ReactionSelector');
-  const { t } = useTranslationContext('ReactionSelector');
+  } = useMessageContext();
+  const { t } = useTranslationContext();
   const dialogId =
     propDialogId ??
     ReactionSelector.getDialogId({
@@ -180,15 +180,13 @@ ReactionSelector.ExtendedList = function ReactionSelectorExtendedList({
   handleReaction: propHandleReaction,
   own_reactions: propOwnReactions,
 }) {
-  const { reactionOptions = defaultReactionOptions } = useComponentContext(
-    'ReactionSelector.ExtendedList',
-  );
+  const { reactionOptions = defaultReactionOptions } = useComponentContext();
   const {
     closeReactionSelectorOnClick,
     handleReaction: contextHandleReaction,
     message,
-  } = useMessageContext('ReactionSelector');
-  const { t } = useTranslationContext('ReactionSelector');
+  } = useMessageContext();
+  const { t } = useTranslationContext();
 
   const handleReaction = propHandleReaction ?? contextHandleReaction;
   const ownReactions = propOwnReactions ?? message?.own_reactions ?? stableOwnReactions;
diff --git a/src/components/Reactions/ReactionSelectorWithButton.tsx b/src/components/Reactions/ReactionSelectorWithButton.tsx
index 11f0dde2c..3ad3fdcc5 100644
--- a/src/components/Reactions/ReactionSelectorWithButton.tsx
+++ b/src/components/Reactions/ReactionSelectorWithButton.tsx
@@ -23,10 +23,9 @@ type ReactionSelectorWithButtonProps = {
 export const ReactionSelectorWithButton = ({
   ReactionIcon,
 }: ReactionSelectorWithButtonProps) => {
-  const { t } = useTranslationContext('ReactionSelectorWithButton');
-  const { isMyMessage, message, threadList } = useMessageContext('MessageOptions');
-  const { ReactionSelector = DefaultReactionSelector } =
-    useComponentContext('MessageOptions');
+  const { t } = useTranslationContext();
+  const { isMyMessage, message, threadList } = useMessageContext();
+  const { ReactionSelector = DefaultReactionSelector } = useComponentContext();
   const buttonRef = useRef<ComponentRef<'button'>>(null);
   // MUST match the id `MessageActions` derives via `ReactionSelector.getDialogId` — it
   // uses that to keep `.str-chat__message-options--active` applied while the reaction
diff --git a/src/components/Reactions/__tests__/MessageReactions.test.tsx b/src/components/Reactions/__tests__/MessageReactions.test.tsx
index e97961c83..f91699e48 100644
--- a/src/components/Reactions/__tests__/MessageReactions.test.tsx
+++ b/src/components/Reactions/__tests__/MessageReactions.test.tsx
@@ -54,9 +54,6 @@ const renderComponent = ({
 describe('MessageReactions', () => {
   afterEach(vi.clearAllMocks);
 
-  // disable warnings (unreachable context)
-  vi.spyOn(console, 'warn').mockImplementation(null);
-
   it('should render the total reaction count in clustered mode', async () => {
     const { container, getByTestId } = renderComponent({
       reaction_groups: {
diff --git a/src/components/Reactions/__tests__/MessageReactionsDetail.test.tsx b/src/components/Reactions/__tests__/MessageReactionsDetail.test.tsx
index c4685c307..0f1e3cfd3 100644
--- a/src/components/Reactions/__tests__/MessageReactionsDetail.test.tsx
+++ b/src/components/Reactions/__tests__/MessageReactionsDetail.test.tsx
@@ -106,11 +106,6 @@ const renderComponent = ({
   );
 
 describe('MessageReactionsDetail', () => {
-  beforeEach(() => {
-    // disable warnings (unreachable context)
-    vi.spyOn(console, 'warn').mockImplementation(() => {});
-  });
-
   afterEach(() => {
     vi.clearAllMocks();
   });
diff --git a/src/components/Reactions/hooks/useFetchReactions.ts b/src/components/Reactions/hooks/useFetchReactions.ts
index 55239dfe6..cefb06aed 100644
--- a/src/components/Reactions/hooks/useFetchReactions.ts
+++ b/src/components/Reactions/hooks/useFetchReactions.ts
@@ -15,9 +15,8 @@ export interface FetchReactionsOptions {
 
 export function useFetchReactions(options: FetchReactionsOptions) {
   const { addNotification } = useNotificationApi();
-  const { handleFetchReactions: contextHandleFetchReactions } =
-    useMessageContext('useFetchReactions');
-  const { t } = useTranslationContext('useFetchReactions');
+  const { handleFetchReactions: contextHandleFetchReactions } = useMessageContext();
+  const { t } = useTranslationContext();
   const [reactions, setReactions] = useState<ReactionResponse[]>([]);
   const {
     handleFetchReactions: propHandleFetchReactions,
diff --git a/src/components/Reactions/hooks/useProcessReactions.tsx b/src/components/Reactions/hooks/useProcessReactions.tsx
index 85739f99f..5c9d3071a 100644
--- a/src/components/Reactions/hooks/useProcessReactions.tsx
+++ b/src/components/Reactions/hooks/useProcessReactions.tsx
@@ -28,10 +28,8 @@ export const useProcessReactions = (params: UseProcessReactionsParams) => {
     reactions: propReactions,
     sortReactions: propSortReactions,
   } = params;
-  const { message, sortReactions: contextSortReactions } =
-    useMessageContext('useProcessReactions');
-  const { reactionOptions = defaultReactionOptions } =
-    useComponentContext('useProcessReactions');
+  const { message, sortReactions: contextSortReactions } = useMessageContext();
+  const { reactionOptions = defaultReactionOptions } = useComponentContext();
 
   const sortReactions = propSortReactions ?? contextSortReactions ?? defaultReactionsSort;
   const latestReactions = propReactions ?? message.latest_reactions;
diff --git a/src/components/Search/SearchContext.tsx b/src/components/Search/SearchContext.tsx
index c53d04016..f677bd008 100644
--- a/src/components/Search/SearchContext.tsx
+++ b/src/components/Search/SearchContext.tsx
@@ -2,6 +2,7 @@ import React, { createContext, useContext } from 'react';
 import type { PropsWithChildren } from 'react';
 import type { SearchController } from 'stream-chat';
 import type { SearchProps } from './Search';
+import { requireContext } from '../../context/requireContext';
 
 export type SearchContextValue = {
   /** Instance of the search controller that handles the data management */
@@ -29,7 +30,5 @@ export const SearchContextProvider = ({
   </SearchContext.Provider>
 );
 
-export const useSearchContext = () => {
-  const contextValue = useContext(SearchContext);
-  return contextValue as unknown as SearchContextValue;
-};
+export const useSearchContext = () =>
+  requireContext(useContext(SearchContext), 'useSearchContext', 'SearchContextProvider');
diff --git a/src/components/Search/SearchResults/SearchResults.tsx b/src/components/Search/SearchResults/SearchResults.tsx
index 76c04ad90..868661af5 100644
--- a/src/components/Search/SearchResults/SearchResults.tsx
+++ b/src/components/Search/SearchResults/SearchResults.tsx
@@ -19,7 +19,7 @@ const searchControllerStateSelector = (nextValue: SearchControllerState) => ({
 });
 
 export const SearchResults = () => {
-  const { t } = useTranslationContext('ResultsContainer');
+  const { t } = useTranslationContext();
   const {
     SearchResultsHeader = DefaultSearchResultsHeader,
     SearchResultsPresearch = DefaultSearchResultsPresearch,
diff --git a/src/components/Search/SearchSourceResultsContext.tsx b/src/components/Search/SearchSourceResultsContext.tsx
index df8f37548..7c8900fcb 100644
--- a/src/components/Search/SearchSourceResultsContext.tsx
+++ b/src/components/Search/SearchSourceResultsContext.tsx
@@ -1,6 +1,7 @@
 import type { PropsWithChildren } from 'react';
 import React, { createContext, useContext } from 'react';
 import type { SearchSource } from 'stream-chat';
+import { requireContext } from '../../context/requireContext';
 
 export type SearchSourceResultsContextValue = {
   searchSource: SearchSource;
@@ -26,7 +27,9 @@ export const SearchSourceResultsContextProvider = ({
   </SearchSourceResultsContext.Provider>
 );
 
-export const useSearchSourceResultsContext = () => {
-  const contextValue = useContext(SearchSourceResultsContext);
-  return contextValue as unknown as SearchSourceResultsContextValue;
-};
+export const useSearchSourceResultsContext = () =>
+  requireContext(
+    useContext(SearchSourceResultsContext),
+    'useSearchSourceResultsContext',
+    'SearchSourceResultsProvider',
+  );
diff --git a/src/components/Search/hooks/useSearchFocusedMessage.ts b/src/components/Search/hooks/useSearchFocusedMessage.ts
index 9558d615f..8d3a4245f 100644
--- a/src/components/Search/hooks/useSearchFocusedMessage.ts
+++ b/src/components/Search/hooks/useSearchFocusedMessage.ts
@@ -7,7 +7,7 @@ const searchControllerStateSelector = (nextValue: InternalSearchControllerState)
 });
 
 export const useSearchFocusedMessage = () => {
-  const { searchController } = useChatContext('Channel');
+  const { searchController } = useChatContext();
   const { focusedMessage } = useStateStore(
     searchController._internalState,
     searchControllerStateSelector,
diff --git a/src/components/SummarizedMessagePreview/hooks/useLatestMessagePreview.ts b/src/components/SummarizedMessagePreview/hooks/useLatestMessagePreview.ts
index 336d34bc1..bb5edd4d6 100644
--- a/src/components/SummarizedMessagePreview/hooks/useLatestMessagePreview.ts
+++ b/src/components/SummarizedMessagePreview/hooks/useLatestMessagePreview.ts
@@ -160,8 +160,8 @@ export const useLatestMessagePreview = ({
   messageDeliveryStatus,
   participantCount,
 }: UseLatestMessagePreviewParams): LatestMessagePreviewData => {
-  const { client } = useChatContext('useLatestMessagePreview');
-  const { t, userLanguage } = useTranslationContext('useLatestMessagePreview');
+  const { client } = useChatContext();
+  const { t, userLanguage } = useTranslationContext();
 
   return useMemo(() => {
     if (!latestMessage) {
diff --git a/src/components/TextareaComposer/TextareaComposer.tsx b/src/components/TextareaComposer/TextareaComposer.tsx
index 33b913bd3..3dfc91491 100644
--- a/src/components/TextareaComposer/TextareaComposer.tsx
+++ b/src/components/TextareaComposer/TextareaComposer.tsx
@@ -122,7 +122,7 @@ const TextareaComposerWithLiveAnnouncements = ({
   } = useMessageComposerContext();
   const cooldownRemaining = useCooldownRemaining();
 
-  const { t } = useTranslationContext('TextareaComposer');
+  const { t } = useTranslationContext();
   const placeholder = useTextareaPlaceholder({ placeholder: placeholderProp });
   const announce = useAriaLiveAnnouncer();
   const { announceInteraction } = useInteractionAnnouncements();
diff --git a/src/components/Thread/Thread.tsx b/src/components/Thread/Thread.tsx
index 6064a96c5..b7c4b5f99 100644
--- a/src/components/Thread/Thread.tsx
+++ b/src/components/Thread/Thread.tsx
@@ -142,13 +142,13 @@ const ThreadInner = (props: ThreadProps & { key: string }) => {
     virtualized,
   } = props;
   const threadInstance = useThreadContext();
-  const { client, customClasses } = useChatContext('Thread');
+  const { client, customClasses } = useChatContext();
   const {
     Message: ContextMessage,
     ThreadHead = DefaultThreadHead,
     ThreadHeader = DefaultThreadHeader,
     VirtualMessage,
-  } = useComponentContext('Thread');
+  } = useComponentContext();
 
   const { isStateStale, parentMessage } =
     useStateStore(threadInstance?.state, selector) ?? {};
diff --git a/src/components/Thread/ThreadHead.tsx b/src/components/Thread/ThreadHead.tsx
index 0bcd1e6a4..1fd2931ca 100644
--- a/src/components/Thread/ThreadHead.tsx
+++ b/src/components/Thread/ThreadHead.tsx
@@ -8,7 +8,7 @@ import { useComponentContext } from '../../context';
 import { DateSeparator } from '../DateSeparator';
 
 export const ThreadHead = (props: MessageProps) => {
-  const { ThreadStart = DefaultThreadStart } = useComponentContext('ThreadHead');
+  const { ThreadStart = DefaultThreadStart } = useComponentContext();
   return (
     <div className='str-chat__parent-message-li'>
       <DateSeparator date={props.message.created_at} />
diff --git a/src/components/Thread/ThreadHeader.tsx b/src/components/Thread/ThreadHeader.tsx
index 85329f730..90d8c0d3f 100644
--- a/src/components/Thread/ThreadHeader.tsx
+++ b/src/components/Thread/ThreadHeader.tsx
@@ -39,7 +39,7 @@ const ThreadHeaderSubtitle = ({
   const channelConfig = useChannelConfig({ cid: channel?.cid });
   const threadInstance = useThreadContext();
   const parentId = threadInstance?.id;
-  const { client } = useChatContext('ThreadHeaderSubtitle');
+  const { client } = useChatContext();
   const messageComposer = useMessageComposerController();
   const { typing = {} } =
     useStateStore(messageComposer.textComposer?.state, textComposerTypingSelector) ?? {};
diff --git a/src/components/Thread/ThreadStart.tsx b/src/components/Thread/ThreadStart.tsx
index f892bbda8..eb7d0053b 100644
--- a/src/components/Thread/ThreadStart.tsx
+++ b/src/components/Thread/ThreadStart.tsx
@@ -11,7 +11,7 @@ const threadStartSelector = ({ parentMessage }: ThreadState) => ({
 
 export const ThreadStart = () => {
   const thread = useThreadContext();
-  const { t } = useTranslationContext('ThreadStart');
+  const { t } = useTranslationContext();
   const { parentMessage } = useStateStore(thread?.state, threadStartSelector) ?? {};
 
   if (!parentMessage?.reply_count) return null;
diff --git a/src/components/Threads/ThreadList/ThreadList.tsx b/src/components/Threads/ThreadList/ThreadList.tsx
index 74d1a91e4..9e0d11f5b 100644
--- a/src/components/Threads/ThreadList/ThreadList.tsx
+++ b/src/components/Threads/ThreadList/ThreadList.tsx
@@ -104,7 +104,7 @@ const useThreadHighlighting = (threadManager: ThreadManager) => {
 
 export const ThreadList = ({ virtuosoProps }: ThreadListProps) => {
   const { client } = useChatContext();
-  const { t } = useTranslationContext('ThreadList');
+  const { t } = useTranslationContext();
   const {
     NotificationList: NotificationListFromContext = NotificationList,
     ThreadListEmptyPlaceholder = DefaultThreadListEmptyPlaceholder,
diff --git a/src/components/Threads/ThreadList/ThreadListEmptyPlaceholder.tsx b/src/components/Threads/ThreadList/ThreadListEmptyPlaceholder.tsx
index 014c53964..e8d9ca67e 100644
--- a/src/components/Threads/ThreadList/ThreadListEmptyPlaceholder.tsx
+++ b/src/components/Threads/ThreadList/ThreadListEmptyPlaceholder.tsx
@@ -4,7 +4,7 @@ import { useTranslationContext } from '../../../context';
 import { IconMessageBubbles } from '../../Icons';
 
 export const ThreadListEmptyPlaceholder = () => {
-  const { t } = useTranslationContext('ThreadListEmptyPlaceholder');
+  const { t } = useTranslationContext();
 
   return (
     <div className='str-chat__thread-list-empty-placeholder'>
diff --git a/src/components/Threads/ThreadList/ThreadListItemUI.tsx b/src/components/Threads/ThreadList/ThreadListItemUI.tsx
index de58c7893..40732e49a 100644
--- a/src/components/Threads/ThreadList/ThreadListItemUI.tsx
+++ b/src/components/Threads/ThreadList/ThreadListItemUI.tsx
@@ -88,7 +88,7 @@ export const ThreadListItemUI = ({
   );
 
   const { displayTitle: channelDisplayTitle } = useChannelPreviewInfo({ channel });
-  const { t, tDateTimeParser, userLanguage } = useTranslationContext('ThreadListItemUI');
+  const { t, tDateTimeParser, userLanguage } = useTranslationContext();
   const { announceInteraction } = useInteractionAnnouncements();
   const { isThreadActive, openThread } = useWorkspaceNavigation();
   const {
diff --git a/src/components/TypingIndicator/TypingIndicator.tsx b/src/components/TypingIndicator/TypingIndicator.tsx
index c9dad919e..e6ffdf8a4 100644
--- a/src/components/TypingIndicator/TypingIndicator.tsx
+++ b/src/components/TypingIndicator/TypingIndicator.tsx
@@ -46,7 +46,7 @@ const UnMemoizedTypingIndicator = (props: TypingIndicatorProps) => {
   } = useComponentContext();
   const messageComposer = useMessageComposerController();
   const channelConfig = useChannelConfig({ cid: messageComposer.channel.cid });
-  const { client } = useChatContext('TypingIndicator');
+  const { client } = useChatContext();
   const { t } = useTranslationContext();
   const { typing = {} } =
     useStateStore(messageComposer.textComposer?.state, textComposerTypingSelector) ?? {};
diff --git a/src/components/TypingIndicator/TypingIndicatorHeader.tsx b/src/components/TypingIndicator/TypingIndicatorHeader.tsx
index 59fa279f0..06d4bc9e9 100644
--- a/src/components/TypingIndicator/TypingIndicatorHeader.tsx
+++ b/src/components/TypingIndicator/TypingIndicatorHeader.tsx
@@ -33,7 +33,7 @@ export const TypingIndicatorHeader = (props: TypingIndicatorHeaderProps) => {
   const channelConfig = useChannelConfig({ cid: channel.cid });
   const threadInstance = useThreadContext();
   const parentId = threadInstance?.id;
-  const { client } = useChatContext('TypingIndicatorHeader');
+  const { client } = useChatContext();
   const messageComposer = useMessageComposerController();
   const { typing = {} } =
     useStateStore(messageComposer.textComposer?.state, textComposerTypingSelector) ?? {};
diff --git a/src/context/ChannelInstanceContext.tsx b/src/context/ChannelInstanceContext.tsx
index aa4dd430a..2769eb8c6 100644
--- a/src/context/ChannelInstanceContext.tsx
+++ b/src/context/ChannelInstanceContext.tsx
@@ -16,19 +16,14 @@ export const ChannelInstanceProvider = ({
 }: PropsWithChildren<{
   value: ChannelInstanceContextValue;
 }>) => (
-  <ChannelInstanceContext.Provider
-    value={value as unknown as ChannelInstanceContextValue}
-  >
+  <ChannelInstanceContext.Provider value={value}>
     {children}
   </ChannelInstanceContext.Provider>
 );
 
-export const useChannelInstanceContext = () => {
-  const contextValue = useContext(ChannelInstanceContext);
-
-  if (!contextValue) {
-    return {} as ChannelInstanceContextValue;
-  }
-
-  return contextValue as unknown as ChannelInstanceContextValue;
-};
+/**
+ * Non-throwing counterpart to {@link useChannel}: returns an empty object outside a `Channel`
+ * subtree, for callers that only need to know whether a channel is in scope.
+ */
+export const useChannelInstanceContext = (): Partial<ChannelInstanceContextValue> =>
+  useContext(ChannelInstanceContext) ?? {};
diff --git a/src/context/ChatContext.tsx b/src/context/ChatContext.tsx
index 6930c3757..5b329db10 100644
--- a/src/context/ChatContext.tsx
+++ b/src/context/ChatContext.tsx
@@ -8,6 +8,7 @@ import type {
 } from 'stream-chat';
 
 import type { ChatProps } from '../components/Chat/Chat';
+import { requireContext } from './requireContext';
 
 type CSSClasses =
   | 'chat'
@@ -59,16 +60,5 @@ export const ChatProvider = ({
   </ChatContext.Provider>
 );
 
-export const useChatContext = (componentName?: string) => {
-  const contextValue = useContext(ChatContext);
-
-  if (!contextValue) {
-    console.warn(
-      `The useChatContext hook was called outside of the ChatContext provider. Make sure this hook is called within a child of the Chat component. The errored call is located in the ${componentName} component.`,
-    );
-
-    return {} as ChatContextValue;
-  }
-
-  return contextValue as unknown as ChatContextValue;
-};
+export const useChatContext = () =>
+  requireContext(useContext(ChatContext), 'useChatContext', 'Chat');
diff --git a/src/context/ComponentContext.tsx b/src/context/ComponentContext.tsx
index 27dde1df3..ea58d9ee5 100644
--- a/src/context/ComponentContext.tsx
+++ b/src/context/ComponentContext.tsx
@@ -331,16 +331,6 @@ export const ComponentProvider = ({
   value,
 }: PropsWithChildren<{
   value: Partial<ComponentContextValue>;
-}>) => (
-  <ComponentContext.Provider value={value as unknown as ComponentContextValue}>
-    {children}
-  </ComponentContext.Provider>
-);
+}>) => <ComponentContext.Provider value={value}>{children}</ComponentContext.Provider>;
 
-export const useComponentContext = (
-  /**
-   * @deprecated
-   */
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  _componentName?: string,
-) => useContext(ComponentContext) as unknown as ComponentContextValue;
+export const useComponentContext = () => useContext(ComponentContext);
diff --git a/src/context/DialogManagerContext.tsx b/src/context/DialogManagerContext.tsx
index b6350615b..71edcea19 100644
--- a/src/context/DialogManagerContext.tsx
+++ b/src/context/DialogManagerContext.tsx
@@ -178,7 +178,7 @@ export const useDialogManager = ({
         if (!managerInPrevState || managerInNewState?.id !== managerInPrevState.id) {
           setDialogManagerContext((prevState) => {
             if (prevState?.dialogManager.id === managerInNewState?.id) return prevState;
-            // fixme: need to handle the possibility that the dialogManager is undefined
+            // an unresolved manager is caught by the guard below
             return {
               dialogManager:
                 managerInNewState || nearestDialogManagerContext?.dialogManager,
@@ -193,12 +193,12 @@ export const useDialogManager = ({
   }, [dialogId, dialogManagerId, nearestDialogManagerContext?.dialogManager]);
 
   if (!dialogManagerContext?.dialogManager) {
-    console.warn(
-      `Dialog manager (manager id: ${dialogManagerId}, dialog id: ${dialogId}) is not available`,
+    throw new Error(
+      `useDialogManager could not resolve a dialog manager (manager id: ${dialogManagerId}, dialog id: ${dialogId}). Make sure the caller is rendered within <DialogManagerProvider>.`,
     );
   }
 
-  return dialogManagerContext as DialogManagerProviderContextValue;
+  return dialogManagerContext;
 };
 
 export const modalDialogManagerId = 'modal-dialog-manager' as const;
diff --git a/src/context/MessageBounceContext.tsx b/src/context/MessageBounceContext.tsx
index ba76b8de6..de70ce05a 100644
--- a/src/context/MessageBounceContext.tsx
+++ b/src/context/MessageBounceContext.tsx
@@ -1,6 +1,7 @@
 import type { ReactEventHandler } from 'react';
 import React, { createContext, useCallback, useContext, useMemo } from 'react';
 import { useMessageContext } from './MessageContext';
+import { requireContext } from './requireContext';
 import { useChannel } from './useChannel';
 import {
   isMessageBounced,
@@ -22,23 +23,17 @@ const MessageBounceContext = createContext<MessageBounceContextValue | undefined
   undefined,
 );
 
-export function useMessageBounceContext(componentName?: string) {
-  const contextValue = useContext(MessageBounceContext);
-
-  if (!contextValue) {
-    console.warn(
-      `The useMessageBounceContext hook was called outside of the MessageBounceContext provider. The errored call is located in the ${componentName} component.`,
-    );
-
-    return {} as MessageBounceContextValue;
-  }
-
-  return contextValue;
+export function useMessageBounceContext() {
+  return requireContext(
+    useContext(MessageBounceContext),
+    'useMessageBounceContext',
+    'MessageBounceProvider',
+  );
 }
 
 export function MessageBounceProvider({ children }: PropsWithChildrenOnly) {
   const messageComposer = useMessageComposerController();
-  const { message } = useMessageContext('MessageBounceProvider');
+  const { message } = useMessageContext();
   const doHandleRetry = useRetryHandler();
 
   if (!isMessageBounced(message)) {
diff --git a/src/context/MessageComposerContext.tsx b/src/context/MessageComposerContext.tsx
index c5de918e3..af86d1f15 100644
--- a/src/context/MessageComposerContext.tsx
+++ b/src/context/MessageComposerContext.tsx
@@ -3,12 +3,13 @@ import type { PropsWithChildren } from 'react';
 
 import type { MessageComposerProps } from '../components/MessageComposer';
 import type { UseMessageComposerBindingsParams } from '../components/MessageComposer/hooks/useMessageComposerBindings';
+import { requireContext } from './requireContext';
 
 export type MessageComposerContextValue = UseMessageComposerBindingsParams &
   Omit<MessageComposerProps, 'Input'>;
 
 export const MessageComposerContext = createContext<
-  UseMessageComposerBindingsParams | undefined
+  MessageComposerContextValue | undefined
 >(undefined);
 
 export const MessageComposerContextProvider = ({
@@ -17,22 +18,21 @@ export const MessageComposerContextProvider = ({
 }: PropsWithChildren<{
   value: MessageComposerContextValue;
 }>) => (
-  <MessageComposerContext.Provider
-    value={value as unknown as MessageComposerContextValue}
-  >
+  <MessageComposerContext.Provider value={value}>
     {children}
   </MessageComposerContext.Provider>
 );
 
-export const useMessageComposerContext = (
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  componentName?: string,
-) => {
-  const contextValue = useContext(MessageComposerContext);
+export const useMessageComposerContext = () =>
+  requireContext(
+    useContext(MessageComposerContext),
+    'useMessageComposerContext',
+    'MessageComposerContextProvider',
+  );
 
-  if (!contextValue) {
-    return {} as MessageComposerContextValue;
-  }
-
-  return contextValue as unknown as MessageComposerContextValue;
-};
+/**
+ * Whether the caller sits beneath a `MessageComposerContextProvider`, for components that render
+ * both inside and outside a composer. See `WithDragAndDropUpload`.
+ */
+export const useIsWithinMessageComposerContext = () =>
+  useContext(MessageComposerContext) !== undefined;
diff --git a/src/context/MessageContext.tsx b/src/context/MessageContext.tsx
index 40280f10c..0119ff16e 100644
--- a/src/context/MessageContext.tsx
+++ b/src/context/MessageContext.tsx
@@ -16,6 +16,7 @@ import type { GroupStyle } from '../components/MessageList/utils';
 import type { ReactionsComparator, ReactionType } from '../components/Reactions/types';
 
 import type { RenderTextFunction } from '../components/Message/renderText';
+import { requireContext } from './requireContext';
 
 export type MessageContextValue = {
   /** If actions such as edit, delete, flag, mute are enabled on Message */
@@ -136,15 +137,5 @@ export const MessageProvider = ({
   </MessageContext.Provider>
 );
 
-export const useMessageContext = (
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  _componentName?: string,
-) => {
-  const contextValue = useContext(MessageContext);
-
-  if (!contextValue) {
-    return {} as MessageContextValue;
-  }
-
-  return contextValue as unknown as MessageContextValue;
-};
+export const useMessageContext = () =>
+  requireContext(useContext(MessageContext), 'useMessageContext', 'MessageProvider');
diff --git a/src/context/MessageListContext.tsx b/src/context/MessageListContext.tsx
index e6e9faa7c..d41c67f2c 100644
--- a/src/context/MessageListContext.tsx
+++ b/src/context/MessageListContext.tsx
@@ -1,6 +1,7 @@
 import React, { createContext, useContext } from 'react';
 import type { PropsWithChildren } from 'react';
 import type { RenderedMessage } from '../components';
+import { requireContext } from './requireContext';
 
 export type MessageListContextValue = {
   /** Enriched message list, including date separators and intro message (if enabled) */
@@ -29,16 +30,9 @@ export const MessageListContextProvider = ({
   </MessageListContext.Provider>
 );
 
-export const useMessageListContext = (componentName?: string) => {
-  const contextValue = useContext(MessageListContext);
-
-  if (!contextValue) {
-    console.warn(
-      `The useMessageListContext hook was called outside of the MessageListContext provider. Make sure this hook is called within the MessageList component. The errored call is located in the ${componentName} component.`,
-    );
-
-    return {} as MessageListContextValue;
-  }
-
-  return contextValue as MessageListContextValue;
-};
+export const useMessageListContext = () =>
+  requireContext(
+    useContext(MessageListContext),
+    'useMessageListContext',
+    'MessageListContextProvider',
+  );
diff --git a/src/context/MessageTranslationViewContext.tsx b/src/context/MessageTranslationViewContext.tsx
index 8b543fe56..87b91806a 100644
--- a/src/context/MessageTranslationViewContext.tsx
+++ b/src/context/MessageTranslationViewContext.tsx
@@ -107,8 +107,6 @@ export const MessageTranslationViewProvider = ({
   );
 };
 
-export const useMessageTranslationViewContext =
-  (): MessageTranslationViewContextValue => {
-    const context = useContext(MessageTranslationViewContext);
-    return context ?? defaultContextValue;
-  };
+// created with a default value, so there is no missing-provider case
+export const useMessageTranslationViewContext = () =>
+  useContext(MessageTranslationViewContext);
diff --git a/src/context/ModalContext.tsx b/src/context/ModalContext.tsx
index d834e72b9..a5bc73110 100644
--- a/src/context/ModalContext.tsx
+++ b/src/context/ModalContext.tsx
@@ -15,16 +15,11 @@ export const ModalContextProvider = ({
   value: ModalContextValue;
 }>) => <ModalContext.Provider value={value}>{children}</ModalContext.Provider>;
 
-export const useModalContext = () => {
-  const contextValue = useContext(ModalContext);
+// module-level to keep a stable identity across renders
+const NO_MODAL_FALLBACK: ModalContextValue = { close: () => undefined };
 
-  if (!contextValue) {
-    console.warn(
-      `The useModalContext hook was called outside of the ModalContext provider. Make sure this hook is called within a child of the GlobalModal.`,
-    );
-
-    return { close: () => null };
-  }
-
-  return contextValue;
-};
+/**
+ * Works outside a modal: `Alert`, `Prompt` and `Viewer` are usable standalone, reading only
+ * `dialogId` for aria wiring, and get a no-op `close`.
+ */
+export const useModalContext = () => useContext(ModalContext) ?? NO_MODAL_FALLBACK;
diff --git a/src/context/PollContext.tsx b/src/context/PollContext.tsx
index c223fb66f..909b913b3 100644
--- a/src/context/PollContext.tsx
+++ b/src/context/PollContext.tsx
@@ -1,6 +1,7 @@
 import React, { useContext } from 'react';
 import type { PropsWithChildren } from 'react';
 import type { Poll } from 'stream-chat';
+import { requireContext } from './requireContext';
 
 export type PollContextValue = {
   poll: Poll;
@@ -20,7 +21,5 @@ export const PollProvider = ({
     </PollContext.Provider>
   ) : null;
 
-export const usePollContext = () => {
-  const contextValue = useContext(PollContext);
-  return contextValue as unknown as PollContextValue;
-};
+export const usePollContext = () =>
+  requireContext(useContext(PollContext), 'usePollContext', 'PollProvider');
diff --git a/src/context/TranslationContext.tsx b/src/context/TranslationContext.tsx
index 561992ef3..bd4b38be3 100644
--- a/src/context/TranslationContext.tsx
+++ b/src/context/TranslationContext.tsx
@@ -29,16 +29,8 @@ export const TranslationProvider = ({
   <TranslationContext.Provider value={value}>{children}</TranslationContext.Provider>
 );
 
-export const useTranslationContext = (componentName?: string) => {
-  const contextValue = useContext(TranslationContext);
-
-  if (!contextValue) {
-    console.warn(
-      `The useTranslationContext hook was called outside of the TranslationContext provider. Make sure this hook is called within a child of the Chat component. The errored call is located in the ${componentName} component.`,
-    );
-
-    return {} as TranslationContextValue;
-  }
-
-  return contextValue;
-};
+/**
+ * Works outside `<Chat>`: the context default's `defaultTranslatorFunction` renders the inline
+ * English `defaultValue` every `t()` call site passes, so SDK primitives render standalone.
+ */
+export const useTranslationContext = () => useContext(TranslationContext);
diff --git a/src/context/VirtualizedMessageListContext.tsx b/src/context/VirtualizedMessageListContext.tsx
index 58cc26976..6c5f693fb 100644
--- a/src/context/VirtualizedMessageListContext.tsx
+++ b/src/context/VirtualizedMessageListContext.tsx
@@ -1,5 +1,6 @@
 import React, { createContext, useContext } from 'react';
 import type { PropsWithChildren } from 'react';
+import { requireContext } from './requireContext';
 
 export type VirtualizedMessageListContextValue = {
   /** Function that scrolls the list to the bottom. */
@@ -27,4 +28,8 @@ export const VirtualizedMessageListContextProvider = ({
 );
 
 export const useVirtualizedMessageListContext = () =>
-  useContext(VirtualizedMessageListContext) as VirtualizedMessageListContextValue;
+  requireContext(
+    useContext(VirtualizedMessageListContext),
+    'useVirtualizedMessageListContext',
+    'VirtualizedMessageListContextProvider',
+  );
diff --git a/src/context/__tests__/missingProviderContract.test.tsx b/src/context/__tests__/missingProviderContract.test.tsx
new file mode 100644
index 000000000..28a0d6c9c
--- /dev/null
+++ b/src/context/__tests__/missingProviderContract.test.tsx
@@ -0,0 +1,100 @@
+import React, { useContext } from 'react';
+import { render, renderHook, screen } from '@testing-library/react';
+
+import {
+  MessageContext,
+  useChannelInstanceContext,
+  useChatContext,
+  useComponentContext,
+  useDialogManager,
+  useMessageBounceContext,
+  useMessageComposerContext,
+  useMessageContext,
+  useMessageListContext,
+  useMessageTranslationViewContext,
+  useModalContext,
+  usePollContext,
+  useTranslationContext,
+  useVirtualizedMessageListContext,
+} from '..';
+import { useChannelListItemContext } from '../../components/ChannelListItem/ChannelListItem';
+import { useContextMenuContext } from '../../components/Dialog/components/ContextMenu';
+import { useGalleryContext } from '../../components/Gallery/GalleryContext';
+import { useSearchContext } from '../../components/Search/SearchContext';
+import { useSearchSourceResultsContext } from '../../components/Search/SearchSourceResultsContext';
+import { useAriaLiveAnnouncer } from '../../components/Accessibility/useAriaLiveAnnouncer';
+import { useChatViewContext } from '../../plugins/SlotLayout/ChatView';
+
+/** Moving a hook between these two lists is an API change, not an accident. */
+const REQUIRED_HOOKS: Array<[name: string, hook: () => unknown]> = [
+  ['useChatContext', useChatContext],
+  ['useMessageListContext', useMessageListContext],
+  ['useVirtualizedMessageListContext', useVirtualizedMessageListContext],
+  ['useMessageBounceContext', useMessageBounceContext],
+  ['useMessageComposerContext', useMessageComposerContext],
+  ['usePollContext', usePollContext],
+  ['useDialogManager', () => useDialogManager()],
+  ['useSearchContext', useSearchContext],
+  ['useSearchSourceResultsContext', useSearchSourceResultsContext],
+  ['useContextMenuContext', useContextMenuContext],
+  ['useChannelListItemContext', useChannelListItemContext],
+  ['useGalleryContext', useGalleryContext],
+  ['useChatViewContext', useChatViewContext],
+  ['useMessageContext', useMessageContext],
+];
+
+describe('context hooks outside their provider', () => {
+  describe('required contexts throw and name themselves', () => {
+    it.each(REQUIRED_HOOKS)('%s', (name, hook) => {
+      expect(() => renderHook(() => hook())).toThrow(new RegExp(name));
+    });
+  });
+
+  describe('contexts that are optional by design keep working', () => {
+    it('useTranslationContext renders English copy outside <Chat>', () => {
+      const Standalone = () => {
+        const { t } = useTranslationContext();
+        return <span>{t('common.you.label', 'You')}</span>;
+      };
+
+      render(<Standalone />);
+
+      expect(screen.getByText('You')).toBeInTheDocument();
+    });
+
+    it('useComponentContext returns an empty override map', () => {
+      const { result } = renderHook(() => useComponentContext());
+      expect(result.current).toEqual({});
+    });
+
+    it('useChannelInstanceContext reports no channel in scope', () => {
+      const { result } = renderHook(() => useChannelInstanceContext());
+      expect(result.current.channel).toBeUndefined();
+    });
+
+    it('useModalContext returns a stable no-op close', () => {
+      const { rerender, result } = renderHook(() => useModalContext());
+      const first = result.current;
+      rerender();
+
+      expect(result.current).toBe(first);
+      expect(() => result.current.close()).not.toThrow();
+    });
+
+    it('useAriaLiveAnnouncer returns a no-op announcer', () => {
+      const { result } = renderHook(() => useAriaLiveAnnouncer());
+      expect(() => result.current('hello')).not.toThrow();
+    });
+
+    it('useMessageTranslationViewContext returns its default view', () => {
+      const { result } = renderHook(() => useMessageTranslationViewContext());
+      expect(result.current.getTranslationView).toBeInstanceOf(Function);
+    });
+
+    it('MessageContext can still be read directly by components that render both inside and outside a message', () => {
+      // the hook throws, the raw context does not
+      const { result } = renderHook(() => useContext(MessageContext));
+      expect(result.current).toBeUndefined();
+    });
+  });
+});
diff --git a/src/context/requireContext.ts b/src/context/requireContext.ts
new file mode 100644
index 000000000..2c77224e1
--- /dev/null
+++ b/src/context/requireContext.ts
@@ -0,0 +1,22 @@
+/**
+ * Guard for context hooks whose provider is mandatory: returns the value, or throws an error naming
+ * the hook and the missing provider. Contexts with a meaningful default return that default
+ * instead, so their components keep rendering outside a provider.
+ *
+ * Compares against `undefined` so a context legitimately holding `null`, `0` or `''` still counts
+ * as present.
+ */
+export const requireContext = <T>(
+  value: T | undefined,
+  hookName: string,
+  providerName: string,
+): T => {
+  if (value === undefined) {
+    throw new Error(
+      `${hookName} was called outside of ${providerName}. Make sure the component calling ` +
+        `${hookName} is rendered within <${providerName}>.`,
+    );
+  }
+
+  return value;
+};
diff --git a/src/context/useChannel.ts b/src/context/useChannel.ts
index 67ea49a00..ea2600ccd 100644
--- a/src/context/useChannel.ts
+++ b/src/context/useChannel.ts
@@ -10,10 +10,9 @@ export const useChannel = (): Channel => {
   const channel = channelFromThread ?? channelFromInstanceContext;
 
   if (!channel) {
-    console.warn(
+    throw new Error(
       'The useChannel hook could not resolve a channel. Make sure this hook is called within a Thread subtree or within a child of Channel (ChannelInstanceContext provider).',
     );
-    throw new Error('The useChannel hook could not resolve a channel.');
   }
 
   return channel;
diff --git a/src/i18n/keys.ts b/src/i18n/keys.ts
index f9984eb35..7fc68eb3a 100644
--- a/src/i18n/keys.ts
+++ b/src/i18n/keys.ts
@@ -631,6 +631,7 @@ export type TranslationCatalog = {
   'timestamp.ChannelMembersLastActive': '{{ timestamp | timestampFormatter(relativeCompact: true) }}';
   'timestamp.ChannelPreviewTimestamp': '{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { "sameDay": "LT", "lastDay": "[Yesterday]", "lastWeek": "dddd", "sameElse": "L" }) }}';
   'timestamp.DateSeparator': '{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { "sameDay": "[Today]", "nextDay": "[Tomorrow]", "lastDay": "[Yesterday]", "nextWeek": "dddd", "lastWeek": "[Last] dddd", "sameElse": "ddd, D MMM" }) }}';
+  'timestamp.GalleryTimestamp': '{{ timestamp | timestampFormatter(calendar: true) }}';
   'timestamp.LiveLocation': '{{ timestamp | timestampFormatter(calendar: true) }}';
   'timestamp.MessageTimestamp': '{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}';
   'timestamp.PollVote': '{{ timestamp | timestampFormatter(relativeCompact: true) }}';
diff --git a/src/i18n/runtimeDefaults.ts b/src/i18n/runtimeDefaults.ts
index 04ff6efbe..8b436a7e9 100644
--- a/src/i18n/runtimeDefaults.ts
+++ b/src/i18n/runtimeDefaults.ts
@@ -86,6 +86,9 @@ export const runtimeDefaults = {
     '{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { "sameDay": "LT", "lastDay": "[Yesterday]", "lastWeek": "dddd", "sameElse": "L" }) }}',
   'timestamp.DateSeparator':
     '{{ timestamp | timestampFormatter(calendar: true; calendarFormats: { "sameDay": "[Today]", "nextDay": "[Tomorrow]", "lastDay": "[Yesterday]", "nextWeek": "dddd", "lastWeek": "[Last] dddd", "sameElse": "ddd, D MMM" }) }}',
+  // No `calendarFormats` override, so the dayjs locale supplies the calendar wording and the key
+  // stays translatable via `dayjsLocaleConfigForLanguage`.
+  'timestamp.GalleryTimestamp': '{{ timestamp | timestampFormatter(calendar: true) }}',
   'timestamp.LiveLocation': '{{ timestamp | timestampFormatter(calendar: true) }}',
   'timestamp.MessageTimestamp':
     '{{ timestamp | timestampFormatter(calendar: false; format: HH:mm) }}',
diff --git a/src/plugins/ChannelDetail/SectionNavigator/SectionNavigatorHeader.tsx b/src/plugins/ChannelDetail/SectionNavigator/SectionNavigatorHeader.tsx
index dffa6af84..ae60f7f95 100644
--- a/src/plugins/ChannelDetail/SectionNavigator/SectionNavigatorHeader.tsx
+++ b/src/plugins/ChannelDetail/SectionNavigator/SectionNavigatorHeader.tsx
@@ -16,7 +16,7 @@ export type SectionNavigatorHeaderProps = Omit<PromptHeaderProps, 'LeadingConten
  * (`goBack`), where it would compete with the back affordance.
  */
 export const SectionNavigatorHeader = (props: SectionNavigatorHeaderProps) => {
-  const { t } = useTranslationContext('SectionNavigatorHeader');
+  const { t } = useTranslationContext();
   const { layout, openNavigation } = useSectionNavigatorContext();
 
   const MenuButton = useMemo(() => {
diff --git a/src/plugins/ChannelDetail/Views/ChannelFilesView/ChannelFilesEmptyList.tsx b/src/plugins/ChannelDetail/Views/ChannelFilesView/ChannelFilesEmptyList.tsx
index 82d9e1e80..65eb63bcf 100644
--- a/src/plugins/ChannelDetail/Views/ChannelFilesView/ChannelFilesEmptyList.tsx
+++ b/src/plugins/ChannelDetail/Views/ChannelFilesView/ChannelFilesEmptyList.tsx
@@ -2,7 +2,7 @@ import { useTranslationContext } from '../../../../context';
 import { IconFolder } from '../../../../components/Icons';
 
 export const ChannelFilesEmptyList = () => {
-  const { t } = useTranslationContext('ChannelFilesEmptyList');
+  const { t } = useTranslationContext();
 
   return (
     <div className='str-chat__channel-detail__files-view__empty-state'>
diff --git a/src/plugins/ChannelDetail/Views/ChannelFilesView/ChannelFilesView.tsx b/src/plugins/ChannelDetail/Views/ChannelFilesView/ChannelFilesView.tsx
index 7847cffdc..e7aed7b13 100644
--- a/src/plugins/ChannelDetail/Views/ChannelFilesView/ChannelFilesView.tsx
+++ b/src/plugins/ChannelDetail/Views/ChannelFilesView/ChannelFilesView.tsx
@@ -48,7 +48,7 @@ const ChannelFilesGroup = forwardRef<HTMLDivElement, ComponentProps<'div'>>(
 );
 
 const ChannelFilesSectionHeader = ({ timestamp }: { timestamp?: string }) => {
-  const { t, tDateTimeParser } = useTranslationContext('ChannelFilesView');
+  const { t, tDateTimeParser } = useTranslationContext();
   const label = getDateString({
     format: 'MMMM YYYY',
     messageCreatedAt: timestamp,
diff --git a/src/plugins/ChannelDetail/Views/ChannelMediaView/ChannelMediaEmptyList.tsx b/src/plugins/ChannelDetail/Views/ChannelMediaView/ChannelMediaEmptyList.tsx
index eb662725e..4b2b6d4e7 100644
--- a/src/plugins/ChannelDetail/Views/ChannelMediaView/ChannelMediaEmptyList.tsx
+++ b/src/plugins/ChannelDetail/Views/ChannelMediaView/ChannelMediaEmptyList.tsx
@@ -2,7 +2,7 @@ import { useTranslationContext } from '../../../../context';
 import { IconImage } from '../../../../components/Icons';
 
 export const ChannelMediaEmptyList = () => {
-  const { t } = useTranslationContext('ChannelMediaEmptyList');
+  const { t } = useTranslationContext();
 
   return (
     <div className='str-chat__channel-detail__media-view__empty-state'>
diff --git a/src/plugins/ChannelDetail/Views/ChannelMediaView/ChannelMediaView.tsx b/src/plugins/ChannelDetail/Views/ChannelMediaView/ChannelMediaView.tsx
index e6d32b41c..10cccbdcc 100644
--- a/src/plugins/ChannelDetail/Views/ChannelMediaView/ChannelMediaView.tsx
+++ b/src/plugins/ChannelDetail/Views/ChannelMediaView/ChannelMediaView.tsx
@@ -51,7 +51,7 @@ const ChannelMediaGridItem = ({
   item,
   onClick,
 }: ChannelMediaGridItemProps) => {
-  const { t } = useTranslationContext('ChannelMediaView');
+  const { t } = useTranslationContext();
   const { Avatar = DefaultAvatar, extractDisplayInfo = defaultExtractDisplayInfo } =
     useComponentContext();
   const displayName = getUserDisplayName(item.user);
@@ -127,7 +127,7 @@ const ChannelMediaPagination = ({
   onPrevious,
   previousDisabled,
 }: ChannelMediaPaginationProps) => {
-  const { t } = useTranslationContext('ChannelMediaView');
+  const { t } = useTranslationContext();
 
   return (
     <div className='str-chat__channel-detail__media-view__pagination'>
diff --git a/src/plugins/ChannelDetail/Views/ChannelMediaView/ChannelMediaView.utils.ts b/src/plugins/ChannelDetail/Views/ChannelMediaView/ChannelMediaView.utils.ts
index e60ac225e..3859c3597 100644
--- a/src/plugins/ChannelDetail/Views/ChannelMediaView/ChannelMediaView.utils.ts
+++ b/src/plugins/ChannelDetail/Views/ChannelMediaView/ChannelMediaView.utils.ts
@@ -65,7 +65,12 @@ export const toChannelMediaItems = (
       items.push({
         durationSeconds:
           typeof attachmentDuration === 'number' ? attachmentDuration : undefined,
-        galleryItem: descriptor,
+        galleryItem: {
+          ...descriptor,
+          // the gallery header reads sender and timestamp off the item
+          createdAt: message.created_at,
+          user: message.user ?? undefined,
+        },
         id: `${message.id}-${index}`,
         type,
         user: message.user ?? undefined,
diff --git a/src/plugins/ChannelDetail/Views/PinnedMessagesView/PinnedMessagesView.tsx b/src/plugins/ChannelDetail/Views/PinnedMessagesView/PinnedMessagesView.tsx
index a1babb1cf..91967df6d 100644
--- a/src/plugins/ChannelDetail/Views/PinnedMessagesView/PinnedMessagesView.tsx
+++ b/src/plugins/ChannelDetail/Views/PinnedMessagesView/PinnedMessagesView.tsx
@@ -52,7 +52,7 @@ const getPinnedMessagePreview = (
 };
 
 const PinnedMessageDate = ({ message }: { message: PinnedMessage }) => {
-  const { t, tDateTimeParser } = useTranslationContext('PinnedMessageDate');
+  const { t, tDateTimeParser } = useTranslationContext();
   const normalizedTimestamp = normalizeTimestamp(message.created_at);
 
   const when = useMemo(
diff --git a/src/plugins/Emojis/EmojiPicker.tsx b/src/plugins/Emojis/EmojiPicker.tsx
index 758e00a36..3d2da2d05 100644
--- a/src/plugins/Emojis/EmojiPicker.tsx
+++ b/src/plugins/Emojis/EmojiPicker.tsx
@@ -49,8 +49,8 @@ const classNames: Pick<
 };
 
 export const EmojiPicker = (props: EmojiPickerProps) => {
-  const { t } = useTranslationContext('EmojiPicker');
-  const { textareaRef } = useMessageComposerContext('EmojiPicker');
+  const { t } = useTranslationContext();
+  const { textareaRef } = useMessageComposerContext();
   const { textComposer } = useMessageComposerController();
   const isCooldownActive = useIsCooldownActive();
   const [displayPicker, setDisplayPicker] = useState(false);
diff --git a/src/plugins/SlotLayout/ChatView.tsx b/src/plugins/SlotLayout/ChatView.tsx
index 5da32cad9..f3bf9f980 100644
--- a/src/plugins/SlotLayout/ChatView.tsx
+++ b/src/plugins/SlotLayout/ChatView.tsx
@@ -71,6 +71,7 @@ import type {
   LayoutDescriptor,
 } from './slotBinding';
 import { getLayoutViewState } from './hooks';
+import { requireContext } from '../../context/requireContext';
 
 // Re-export the binding primitives + renderer types from their leaf modules so
 // existing `stream-chat-react` imports keep resolving through ChatView.
@@ -216,41 +217,14 @@ const resolveSlotTopology = ({
   };
 };
 
-const defaultLayoutController = new LayoutControllerClass({
-  initialState: {
-    activeView: 'channels',
-    layouts: {
-      channels: createLayoutRuntimeState({
-        availableSlots: createGeneratedSlotNames(DEFAULT_MAX_SLOTS),
-      }),
-    },
-  },
-});
-
-export const ChatViewContext = createContext<ChatViewContextValue>({
-  activeView: 'channels',
-  entityInferers: [],
-  layoutController: defaultLayoutController,
-  registerViewActionSlotResolvers: () => undefined,
-  resolveActionTargetSlot: () => undefined,
-  setActiveView: () => undefined,
-});
+// No default: a shared `LayoutController` would let unrelated subtrees write to one instance.
+export const ChatViewContext = createContext<ChatViewContextValue | undefined>(undefined);
 const ChatViewA11yContext = createContext<ChatViewA11yContextValue>(
   DEFAULT_CHAT_VIEW_A11Y_CONTEXT_VALUE,
 );
 
-export const useChatViewContext = () => {
-  const value = useContext(ChatViewContext);
-
-  if (!value) {
-    console.warn(
-      'The useChatViewContext hook was called outside of the ChatView provider.',
-    );
-    return {} as ChatViewContextValue;
-  }
-
-  return value;
-};
+export const useChatViewContext = () =>
+  requireContext(useContext(ChatViewContext), 'useChatViewContext', 'ChatView');
 
 const activeViewSelector = ({ activeView }: ChatViewLayoutState) => ({ activeView });
 const workspaceLayoutStateSelector = (state: ChatViewLayoutState) => ({
diff --git a/src/plugins/SlotLayout/workspaceNavigationAdapter.tsx b/src/plugins/SlotLayout/workspaceNavigationAdapter.tsx
index 90337d69c..41dd65522 100644
--- a/src/plugins/SlotLayout/workspaceNavigationAdapter.tsx
+++ b/src/plugins/SlotLayout/workspaceNavigationAdapter.tsx
@@ -46,7 +46,7 @@ export const WorkspaceNavigationAdapter = ({
 }: PropsWithChildren<WorkspaceNavigationAdapterProps>) => {
   const { close, open } = useChatViewNavigation();
   const { activeView } = useChatViewContext();
-  const { client } = useChatContext('WorkspaceNavigationAdapter');
+  const { client } = useChatContext();
   const { availableSlots, slotBindings } = useLayoutViewState();
 
   const value = useMemo<WorkspaceNavigation>(() => {