diff --git a/.github/workflows/check-pr.yml b/.github/workflows/check-pr.yml
index 0f561fc31f..04ed34cfed 100644
--- a/.github/workflows/check-pr.yml
+++ b/.github/workflows/check-pr.yml
@@ -5,6 +5,9 @@ on:
     branches:
       - develop
       - main
+      # The v10 integration branch. Without it, no PR stacked onto V10 runs build, lint, typecheck or
+      # tests — every gate is manual for the whole release.
+      - V10
       - 'v[0-9]+.[0-9]+.[0-9]+*beta*'
     types: [opened, synchronize]
 
diff --git a/.github/workflows/sdk-size-metrics.yml b/.github/workflows/sdk-size-metrics.yml
index e201f6d94b..73982a2eda 100644
--- a/.github/workflows/sdk-size-metrics.yml
+++ b/.github/workflows/sdk-size-metrics.yml
@@ -9,6 +9,10 @@ on:
     branches:
       - develop
       - main
+      # Needed for the same reason as in check-pr.yml, and specifically for this initiative: moving the
+      # i18n runtime out of `lib/` changes both numbers in the migration guide's size table, and this
+      # workflow is what measures them.
+      - V10
 
 env:
   HOMEBREW_NO_INSTALL_CLEANUP: 1 # Disable cleanup for homebrew, we don't need it on CI
diff --git a/AGENTS.md b/AGENTS.md
index e86f1bff35..8097495dec 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -56,7 +56,7 @@ Respect repo-specific rules. Do not suppress lint rules broadly; justify and sco
 - `state-store/` — client-side stores on `useSyncExternalStore` with a selector pattern (audio player, video player, image gallery, message overlay, attachment picker, …)
 - `store/` — offline SQLite persistence: `OfflineDB.ts`, `SqliteClient.ts`, `schema.ts`, `mappers/`, `apis/`
 - `theme/` — theming system + `topologicalResolution.ts` + `generated/` tokens
-- `i18n/` — the translation key layer: generated `keys.ts` catalog, `types.ts`, `runtimeDefaults.ts`, `externalStrings.ts`. No locale JSON — the SDK ships English only (the `Streami18n` wrapper class lives in `utils/i18n/`)
+- `i18n/` — the translation key layer: generated `keys.ts` catalog, `types.ts`, `runtimeDefaults.ts`, `utils.ts`. No locale JSON — the SDK ships English only. The runtime lives in `stream-chat/i18n`, shared with the React SDK; `utils/i18n/Streami18n.ts` is a thin subclass injecting this package's bundled data
 - `a11y/` — accessibility primitives (`a11yUtils.ts`, `hooks/`)
 - `middlewares/` — command UI middlewares (`attachments.ts`, `emojiControl.ts`)
 - `icons/` — SVG icon components
@@ -278,16 +278,38 @@ Integrators add languages additively — there is nothing in the SDK to fork or
   `package/src/i18n/runtimeDefaults.ts` — the only translation data that ships. `runtimeDefaults`
   holds just the keys with no inline copy to fall back on: `timestamp.*` / `duration.*` formatter
   expressions passed around as prop values, and keys built from a runtime value.
-- `Streami18n` (`package/src/utils/i18n/Streami18n.ts`) wraps i18next; access `t` via
+- **The runtime is `stream-chat/i18n`**, shared with the React SDK — one `Streami18n`, one set of
+  formatters, one date layer. `package/src/utils/i18n/Streami18n.ts` is a ~30-line subclass that
+  injects this package's `runtimeDefaults` (core cannot import them: the catalog is generated from
+  *this* package's call sites). A behavioural fix belongs in `stream-chat`, not here. Access `t` via
   `useTranslationContext()`. `registerTranslation` **merges**, so a partial dictionary can never
   knock out the bundled formatter keys.
+- **Reactivity is a `StateStore`,** not listeners. `i18n.state` publishes
+  `{ t, tDateTimeParser, language, initialized }`; `useStreami18n` subscribes with a module-scope
+  selector. `setLanguage()` returns `void` — the new `t` arrives through the store. There is no
+  `addOnLanguageChangeListener`, and `getTranslators()` is now `init()`. **Nothing is kept as a
+  deprecated alias** — v10 is a breaking release, so an old name is removed rather than carried with a
+  countdown on it. `relativeCompactDateFormatter` is gone the same way: use `timestampFormatter` with
+  `relativeCompact: true`, whose wording goes through `t()`.
+- `language.*` (ISO language names) and `relativeTime.*` are typed into the catalog but come from
+  core, which owns the code that renders them. Neither is declared in `runtimeDefaults`.
+- Notification copy is keyed on `stream-chat`'s `CORE_NOTIFICATION_TYPE`, in
+  `components/Notifications/notificationTranslations.ts`, as a `Record<CoreNotificationType, …>` — so
+  a new core identifier is a compile error until it is mapped. Never match on `notification.message`;
+  that is untranslated English whose wording is not part of core's contract. Poll field errors are
+  keyed the same way, on `POLL_COMPOSER_VALIDATION_CODE`.
+- **`dayjs` must resolve to exactly one copy.** Its range here has to stay compatible with core's
+  (`^1.11.13`) — an exact pin installs a second copy, `instanceof Dayjs` starts failing, and an
+  integrator's `import 'dayjs/locale/de'` lands on an instance the SDK never formats with. Do not
+  declare `i18next` at all; it arrives through `stream-chat`.
 - Only the `en` dayjs locale is bundled, and **no dayjs locale defines `calendar`** (that field
   belongs to the calendar plugin) — a new language needs both `import 'dayjs/locale/xx'` and a
   `calendar` config, or relative dates render English scaffolding around translated day names.
-- Generation: `build-translations` runs `package/scripts/generate-i18n-keys.mts`, which enforces
-  five hard-fail guards (conflicting inline copy, unresolvable key, shadowed key, external-string
-  drift, strict prefix). Its fixture tests are **not** jest — run
-  `cd package && node --test scripts/tests/i18n-tooling-checks.mts`.
+- Generation: `build-translations` runs `package/scripts/generate-i18n-keys.mts`, now a ~40-line
+  config shim over the generator in `stream-chat/i18n/codegen` (also shared with the React SDK). Four
+  hard-fail guards: conflicting inline copy, unresolvable key, shadowed key, strict prefix. The
+  external-string drift guard is gone with `externalStrings.ts`. The fixture tests live in
+  `stream-chat`'s own suite — there is no longer a `node --test` step here.
 - Validation: `validate-translations` runs inside `yarn lint` and in CI. It is a **drift gate** —
   it regenerates `keys.ts` and fails if the result differs from what is committed.
 - Adding a string: call `t('some.dotted.key', 'English copy')` → run `build-translations` → commit
diff --git a/ai-docs/accessibility.md b/ai-docs/accessibility.md
index 3a460f397a..5bb42114b5 100644
--- a/ai-docs/accessibility.md
+++ b/ai-docs/accessibility.md
@@ -23,7 +23,7 @@ When `enabled` is false:
 - `useIncomingMessageAnnouncements` does not subscribe to `channel.on('message.new')`.
 - No `AccessibilityInfo` event listeners attach.
 - Components still render their `accessibilityRole` / `accessibilityState` / etc. attributes (these are passed to native views and only consulted by VO/TalkBack when active — sighted users incur ~zero cost).
-- `useA11yLabel(key, params)` returns `undefined` so `t('a11y/...')` is **not** called on hot list paths.
+- `useA11yLabel(key, params)` returns `undefined` so `t()` is **not** called on hot list paths.
 
 ## Configuration shape
 
@@ -50,13 +50,14 @@ For RN-specific gesture-alternative toggles, the enum semantics are:
 
 ## Localization
 
-All a11y strings flow through the existing `Streami18n` translation pipeline under the `a11y/*` namespace. Defaults ship in English in every locale; integrators can override per-key via the same mechanism they use for other strings:
+All a11y strings flow through the `Streami18n` translation pipeline, the same one every other string uses.
+Integrators override per key:
 
 ```ts
-const i18n = new Streami18n('nl');
+const i18n = new Streami18n({ language: 'nl' });
 i18n.registerTranslation('nl', {
-  'a11y/Avatar of {{name}}': 'Avatar van {{name}}',
-  'a11y/{{count}} new messages': '{{count}} nieuwe berichten',
+  'avatar.accessibilityLabel': 'Avatar van {{name}}',
+  'messageList.scrollToBottom.withCount.accessibilityLabel': '{{count}} nieuwe berichten',
 });
 <OverlayProvider accessibility={{ enabled: true }} i18nInstance={i18n}>
   <Chat client={client} i18nInstance={i18n}>
@@ -65,12 +66,24 @@ i18n.registerTranslation('nl', {
 </OverlayProvider>
 ```
 
-`validate-translations` (run as part of `yarn lint`) enforces non-empty values for every `a11y/*` key in every locale.
+Three things changed in v10, and the old form above fails quietly rather than erroring:
+
+- **The `a11y/*` namespace is gone.** Accessible names are the `.accessibilityLabel` leaf of the owning
+  component's key (`avatar.accessibilityLabel`), so a11y copy sits beside the visible copy it describes. See
+  `ai-docs/i18n-v10-migration.md` for the full old→new table.
+- **The constructor takes an options object**, not a positional language string.
+- **English is the only bundled language**, so "in every locale" no longer applies — a key you do not supply
+  renders its English copy from the inline `defaultValue` at the call site, never a raw dotted path.
+
+Most accessible names reach `t()` as a prop or a lookup value rather than a literal, so they have no inline
+default and live in `package/src/i18n/runtimeDefaults.ts` instead. `validate-translations` (part of `yarn lint`)
+is a drift gate on the generated catalog: it regenerates `src/i18n/keys.ts` and fails on any difference, which
+is what catches a key that was renamed at the call site but not in `runtimeDefaults`.
 
 SDK-owned `Button` components can translate their own accessible names from an i18n key:
 
 ```tsx
-<Button accessibilityLabelKey='a11y/Send message' iconOnly {...buttonProps} />
+<Button accessibilityLabelKey='messageInput.sendMessage.accessibilityLabel' iconOnly {...buttonProps} />
 ```
 
 Use `accessibilityLabelParams` for interpolated labels. SDK-owned buttons should pass the key/params only. When migrating an already-released button, keep the translation value aligned with the existing label unless the label change is intentionally breaking.
@@ -92,7 +105,7 @@ Importable from `stream-chat-react-native`:
 
 ## Cross-SDK parity
 
-API shapes mirror [`stream-chat-react#3146`](https://github.com/GetStream/stream-chat-react/pull/3146) wherever the platforms agree (`useAccessibilityAnnouncer` ≈ `useAriaLiveAnnouncer`, `useIncomingMessageAnnouncements` ≈ identical params and throttle semantics, `a11y/*` i18n namespace shared). Mobile-only deviations:
+API shapes mirror [`stream-chat-react#3146`](https://github.com/GetStream/stream-chat-react/pull/3146) wherever the platforms agree (`useAccessibilityAnnouncer` ≈ `useAriaLiveAnnouncer`, `useIncomingMessageAnnouncements` ≈ identical params and throttle semantics; both SDKs now key accessible names as the `.accessibilityLabel` leaf of the owning component rather than a shared `a11y/*` namespace). Mobile-only deviations:
 
 - `<OverlayProvider accessibility={...}>` config object — RN needs gesture-alternative toggles (audio hold-to-record, gallery pinch/pan) that don't exist on web.
 - No `<VisuallyHidden>`, no `<SkipNavigation>`, no roving-focus utilities — RN announcer is imperative, mobile has no Tab key.
diff --git a/ai-docs/ai-migration-v9-to-v10.md b/ai-docs/ai-migration-v9-to-v10.md
index 85d53d9067..b23b7fd03f 100644
--- a/ai-docs/ai-migration-v9-to-v10.md
+++ b/ai-docs/ai-migration-v9-to-v10.md
@@ -91,6 +91,12 @@ rg '\b(sendMessage|SendMessageDisallowedIndicator)\b' src/
 rg '\b(onAddedToChannel|onRemovedFromChannel|onChannelDeleted|onChannelHidden|onChannelVisible|onChannelUpdated|onChannelTruncated|onChannelMemberUpdated|onNewMessage|onNewMessageNotification|ChannelListEventHandler|useChannelUpdated|queryChannelsOverride)\b' src/
 rg 'useChatContext\(\)' -A6 src/ | rg '\bchannelManager\b'
 rg '<Chat\b' -A10 src/ | rg '\bchannelManager\b'
+
+# §19 — i18n: keys, the Streami18n API, and the a11y namespace
+rg '\bStreami18n\b|registerTranslation|translationsForLanguage|setLanguage|getTranslators' src/
+rg "t\(\s*'a11y/|'[A-Z][a-z]+ [a-z]" src/          # v9 keys WERE the English copy
+rg '\b(enTranslations|deTranslations|frTranslations|esTranslations|itTranslations|nlTranslations|ptBrTranslations|ruTranslations|trTranslations|jaTranslations|koTranslations|hiTranslations|heTranslations|arTranslations)\b' src/
+rg 'getDateString|getDateStringForA11y' -A4 src/ | rg '\bdate:'
 ```
 
 ---
@@ -137,6 +143,18 @@ means changed. Details in the linked section.
 | `useChannelUpdated()` | removed — `channel.updated` is handled by the orchestrator | §18.2 |
 | `loadNextPage(filters, sort, options)` | `loadNextPage()` (no args) | §18.3 |
 | `<Chat channelManager={…}>` / `useChatContext().channelManager` | `client.channelManager` | §18.4 |
+| `t('Send Message')` — the key *was* the English copy | `t('messageInput.sendMessage.accessibilityLabel', 'Send Message')` — stable dotted key, copy inline | §19 |
+| `t('a11y/Send message')` | the `.accessibilityLabel` leaf of the owning component's key | §19 |
+| `import { deTranslations } from 'stream-chat-react-native'` | removed — English is the only bundled language; supply your own dictionary | §19 |
+| `new Streami18n('nl')` | `new Streami18n({ language: 'nl' })` — options object; the class name is unchanged | §19 |
+| `new Streami18n(opts, i18nextConfig)` | `new Streami18n({ ...opts, i18nextConfigOverrides: i18nextConfig })` | §19 |
+| `const t = await i18n.setLanguage('de')` | `await i18n.setLanguage('de')` → `void`; read `i18n.t` or subscribe to `i18n.state` | §19 |
+| `i18n.addOnLanguageChangeListener(fn)` | `i18n.state.subscribeWithSelector(({ t }) => ({ t }), fn)` | §19 |
+| `i18n.getTranslators()` | `i18n.init()` — removed, not aliased; same return value | §19 |
+| `{{ timestamp \| relativeCompactDateFormatter }}` | `{{ timestamp \| timestampFormatter(relativeCompact: true) }}` | §19 |
+| `getDateString({ date, … })` | `getDateString({ messageCreatedAt, … })`; returns `null`, not `undefined`, when unrenderable | §19 |
+| `getDateStringForA11y({ date, … })` | `getCalendarDateStringForA11y({ messageCreatedAt, … })` — same behaviour under a new name | §19 |
+| poll `state.errors.x` as an English string | a `PollComposerValidationError` — key your copy on `error.code`, fall back to `error.message` | §19 |
 
 ---
 
@@ -894,3 +912,33 @@ Configure the shared manager through its own API (`client.channelManager.setEven
   `channel.updated`; pull-to-refresh and reconnect (the list re-queries, no
   blank); and confirm a pinned-first `sort` keeps pinned channels on top when
   other channels receive messages.
+
+---
+
+# Part I — i18n
+
+## 19. English-only bundle, dotted keys, shared runtime
+
+**The full guide is `ai-docs/i18n-v10-migration.md`.** Read it for the migration; this section exists so an
+agent grepping this file finds i18n at all, and knows the three shapes of change:
+
+1. **Keys are stable dotted identifiers**, not the English copy, with the English inline as i18next's
+   `defaultValue`. The reviewed old→new table is `ai-docs/i18n-v10-key-map.json` (389 rows). Renaming is not
+   optional and **it fails silently** — an old key simply never matches, so the override stops applying and
+   English renders with no error. Type your dictionary as `TranslationDictionary` to turn that into a compile
+   error.
+2. **English is the only bundled language.** The 12 non-English dictionaries and the `*Translations` exports
+   are gone. An integrator supplies their own, additively; a key they omit still renders English.
+3. **The runtime moved to `stream-chat/i18n`**, shared with the React SDK. Imports are unchanged — everything
+   is still exported from `stream-chat-react-native` / `stream-chat-expo`, and `Streami18n` keeps its name
+   — but reactivity is a `StateStore` rather than listeners, `setLanguage` returns `void`,
+   `getTranslators()` is now `init()`, and a few date-helper parameters were renamed to the one name both
+   SDKs use. Nothing is kept as a deprecated alias. See the quick-reference rows above.
+
+Two dependency rules that produce silent breakage rather than errors:
+
+- **`dayjs` must resolve to a single copy.** Declare it compatibly with `stream-chat`'s range (`^1.11.13`) or
+  not at all. A disagreeing exact pin installs a second copy, and an app's `import 'dayjs/locale/de'` then
+  extends an instance the SDK never formats with — dates stay English, nothing throws.
+- **Do not declare `i18next`.** It arrives through `stream-chat`. Two copies mean dictionaries registered on
+  one instance and read from the other.
diff --git a/ai-docs/i18n-v10-key-map.json b/ai-docs/i18n-v10-key-map.json
index 4e23aa0455..47f9e16257 100644
--- a/ai-docs/i18n-v10-key-map.json
+++ b/ai-docs/i18n-v10-key-map.json
@@ -1,6 +1,6 @@
 {
-  "$comment": "v9 -> v10 translation key map for stream-chat-react-native. The left-hand side is the old key, which was the English copy itself; the right-hand side is the stable dotted key that replaces it. `plural` entries live in the catalog as <key>_one / <key>_other, while call sites use the bare key and pass `count`. Keys not listed here were dead in v9 and have been removed. Generated keys and their English copy: `yarn i18n:export`.",
-  "count": 391,
+  "$comment": "v9 -> v10 translation key map for stream-chat-react-native. The left-hand side is the old key, which was the English copy itself; the right-hand side is the stable dotted key that replaces it. `plural` entries live in the catalog as <key>_one / <key>_other, while call sites use the bare key and pass `count`. Keys not listed here have no v10 equivalent -- either they were dead in v9, or the component/notification that rendered them is gone; see the \"Removed keys\" table in i18n-v10-migration.md. Generated keys and their English copy: `yarn i18n:export`.",
+  "count": 389,
   "keys": {
     "+{{count}}": {
       "key": "attachment.gallery.moreImages.label",
@@ -517,11 +517,6 @@
       "prose": true,
       "plural": false
     },
-    "Failed to retrieve location": {
-      "key": "notifications.locationRetrieveFailed.error",
-      "prose": true,
-      "plural": false
-    },
     "Failed to share location": {
       "key": "notifications.locationShareFailed.error",
       "prose": true,
@@ -1132,11 +1127,6 @@
       "prose": true,
       "plural": false
     },
-    "Thread has not been found": {
-      "key": "notifications.threadNotFound.error",
-      "prose": true,
-      "plural": false
-    },
     "Typing": {
       "key": "channelPreview.typing.label",
       "prose": true,
@@ -1958,4 +1948,4 @@
       "plural": true
     }
   }
-}
\ No newline at end of file
+}
diff --git a/ai-docs/i18n-v10-migration.md b/ai-docs/i18n-v10-migration.md
index e7e8a6d822..374012fb99 100644
--- a/ai-docs/i18n-v10-migration.md
+++ b/ai-docs/i18n-v10-migration.md
@@ -13,12 +13,19 @@ English. Measured on this branch, `.js` and `.json` in each build target concate
 
 | Target         | Before  | After   | Saved   |
 | -------------- | ------- | ------- | ------- |
-| `lib/commonjs` | 498,708 | 427,743 | −70,965 |
-| `lib/module`   | 499,091 | 426,942 | −72,149 |
+| `lib/commonjs` | 498,708 | 414,618 | −84,090 |
+| `lib/module`   | 499,091 | 414,600 | −84,491 |
 
 The 13 JSON files were 392,103 raw / 70,972 gzip and shipped in both targets. What replaces them is
-`runtimeDefaults.js` at 8,013 raw / 1,977 gzip; `keys.js` compiles to 33 bytes — a sourcemap comment — so the
-408-entry typed catalog costs nothing at runtime.
+`runtimeDefaults.js` at 7,802 raw / 1,911 gzip; `keys.js` compiles to 33 bytes — a sourcemap comment — so the
+409-entry typed catalog costs nothing at runtime.
+
+The extra ~13 KB gzip beyond the locale files is the `Streami18n` runtime itself, which moved to
+`stream-chat/i18n` (see below). **That is a move, not a saving** — the code now ships in `stream-chat`
+instead, at 11,711 bytes gzip for its own subpath bundle, so the total your app downloads is roughly
+unchanged on that portion. What genuinely goes away is the 70,972 gzip of locale JSON. `stream-chat`'s
+root bundle is unaffected: the i18n layer is a separate entry point, and a build-time assertion in
+`stream-chat` fails if `i18next` or `dayjs` reach the root.
 
 ## Why the keys changed at all
 
@@ -31,7 +38,7 @@ The old keys _were_ the English copy, which meant:
 Keys are now stable, and the English copy travels inline at the call site as i18next's `defaultValue`. A key you do not
 supply still renders English rather than a raw dotted path.
 
-The exception is the 97 keys that carry no inline copy. They reach `t()` as runtime values — a JSX prop, a ternary
+The exception is the 94 keys that carry no inline copy. They reach `t()` as runtime values — a JSX prop, a ternary
 branch, a lookup table keyed by something other than the copy — so there is no call site at which a default could be
 written. Those live in `runtimeDefaults` (`package/src/i18n/runtimeDefaults.ts`), and both `registerTranslation()` and
 `translationsForLanguage` merge your dictionary over them, so you inherit the working defaults without listing them.
@@ -356,7 +363,7 @@ timestampFormatter(...) }}` breaks date rendering outright. Pass `--all` for the
 
 ## The old→new key table
 
-Every old key maps to exactly one new key. The full table (391 rows) is
+Every old key maps to exactly one new key. The full table (389 rows) is
 [`i18n-v10-key-map.json`](./i18n-v10-key-map.json). Keys absent from it were dead in v9 and have been removed.
 
 Shape — `key` is the replacement, `prose` is `false` for the formatter expressions, and `plural` marks the keys that
@@ -403,6 +410,188 @@ last segment is the modality: `.label`, `.title`, `.text`, `.placeholder`, `.des
 `.accessibilityLabel`. The `timestamp.*` and `duration.*` leaf stays PascalCase after the consuming component, matching
 the `timestamp/<Component>` keys it replaces.
 
+## The runtime moved to `stream-chat`
+
+`Streami18n` is no longer implemented here. The class, the formatters and the whole date layer live in
+`stream-chat/i18n`, shared with the React SDK, and this package exports a thin subclass that injects its own
+bundled copy. **Your imports do not change** — `Streami18n`, `getDateString`, `predefinedFormatters` and every
+type are still exported from `stream-chat-react-native` / `stream-chat-expo`, and the class keeps its name.
+What changes is behaviour and a handful of signatures.
+
+Why: both UI SDKs carried ~1,300 lines of near-duplicate runtime that had drifted, each reverse-mapping
+`stream-chat`'s English notification prose against its own hand-maintained table. A fix landed in one SDK and
+not the other. One implementation ends that.
+
+### `setLanguage()` returns `void`
+
+It used to return the new `t` (or i18next's own `TFunction`, or `undefined`, depending on how it went). The
+current `t` now comes from a state store, and returning it invited callers to cache a function that is stale
+the moment the language changes again:
+
+```ts
+// Before
+const t = await i18n.setLanguage('de');
+
+// After — `t` arrives through the store, which <Chat> and <OverlayProvider> subscribe to
+await i18n.setLanguage('de');
+```
+
+If you were reading that return value, read `i18n.t` (a getter over the store) or subscribe:
+
+```ts
+const unsubscribe = i18n.state.subscribeWithSelector(
+  ({ t }) => ({ t }),
+  ({ t }) => {
+    /* fires synchronously with the current value first, then on every change */
+  },
+);
+```
+
+`addOnLanguageChangeListener` and the other listener registrations are removed; the store replaces all of them.
+
+### `getTranslators()` is now `init()`
+
+**Removed, not aliased.** Same return value; `init()` is the better name because it initializes rather than
+gets, and it is idempotent and safe to call concurrently — the promise is memoized, which closes a re-entry
+window the old `waitForInitializing` flag left open.
+
+```ts
+// Before
+const { t, tDateTimeParser } = await i18n.getTranslators();
+
+// After
+const { t, tDateTimeParser } = await i18n.init();
+```
+
+### i18next config: one options object
+
+The second positional argument is gone. Any i18next setting now goes through `i18nextConfigOverrides`, and it
+accepts the whole of `InitOptions` rather than a curated subset:
+
+```ts
+// Before
+new Streami18n({ language: 'de' }, { parseMissingKeyHandler: myHandler });
+
+// After
+new Streami18n({ language: 'de', i18nextConfigOverrides: { parseMissingKeyHandler: myHandler } });
+```
+
+### `relativeCompactDateFormatter` is removed
+
+Its behaviour is `timestampFormatter` with `relativeCompact: true`, and that version routes its wording
+through `t()` — the standalone one hardcoded `'Today'` and `` `${n}d ago` ``, which no dictionary could
+reach. It is removed rather than aliased, so a `timestamp.*` expression that used it needs rewriting:
+
+```
+# Before
+{{ timestamp | relativeCompactDateFormatter }}
+
+# After
+{{ timestamp | timestampFormatter(relativeCompact: true) }}
+```
+
+The SDK's own `timestamp.PollVote` is updated. If you overrode that key — or any key whose value used this
+formatter — update your dictionary too: an unknown formatter name does not throw, so the timestamp simply
+renders wrong. The four `relativeTime.*` keys are what you translate to change the wording.
+
+### `getDateString`: `date` → `messageCreatedAt`
+
+The two SDKs named this parameter differently; the shared implementation takes the one name. It also returns
+`null` rather than `undefined` when there is nothing renderable — both mean "render no element", but a strict
+`=== undefined` check needs updating.
+
+```ts
+// Before
+getDateString({ date: message.created_at, t, tDateTimeParser });
+
+// After
+getDateString({ messageCreatedAt: message.created_at, t, tDateTimeParser });
+```
+
+### `getDateStringForA11y` is now `getCalendarDateStringForA11y`
+
+The function this SDK shipped — the one that keeps "Today"/"Yesterday" and substitutes `LL` into the calendar's
+`sameElse` slot, because iOS VoiceOver reads "04/08/2026" character by character — is renamed
+`getCalendarDateStringForA11y`. It behaves identically, including `calendarFormatOverrides` and `userLanguage`.
+
+`getDateStringForA11y` still exists but is the **React SDK's** variant, which spells the date out in full via
+`LLLL`. If you called the old name, rename it; leaving it renders a different (still correct, more verbose)
+string.
+
+### `notification.message` is no longer matched against English
+
+`getNotificationDisplayMessage` dispatches only on `stream-chat`'s stable `notification.type`. The table of
+English sentences (`externalStrings.ts`, `EXTERNAL_STRING_KEYS`, `translateExternalString`) is removed — it went
+stale silently on every `stream-chat` upgrade. An unrecognized identifier renders `notification.message`
+verbatim, so a newer core still shows something readable.
+
+Three keys are **removed** from the catalog, because nothing renders them:
+
+| Removed key                                  | Why                                                                   |
+| -------------------------------------------- | --------------------------------------------------------------------- |
+| `notifications.locationRetrieveFailed.error` | mapped `browser:location:get:failed`, which this SDK does not emit     |
+| `notifications.threadNotFound.error`         | mapped `api:reply:search:failed`, which nothing emits                  |
+| `poll.createPoll.maxVotes.range.error`       | no component displayed the max-votes field error                       |
+
+Four are **added**, all previously falling through to untranslated English:
+
+| Added key                                          | Copy                                  |
+| -------------------------------------------------- | ------------------------------------- |
+| `notifications.commandNotReady.error`              | Command not ready to be sent          |
+| `notifications.messageJumpFailed.error`            | Failed to jump to the message         |
+| `notifications.messageJumpToLatestFailed.error`    | Failed to jump to the latest message  |
+| `poll.createPoll.options.empty.error`              | Option is empty                       |
+
+A removed key in your dictionary is a compile error if you type it as `TranslationDictionary`; a missing added
+key just renders English. `examples/SampleApp/src/i18n/{de,it}.ts` shows both edits applied.
+
+### Poll validation errors carry a code
+
+`stream-chat`'s poll composer used to put plain English in `state.errors`. Each entry is now a
+`PollComposerValidationError` — `{ code, message, metadata? }` — where `code` is a stable
+`POLL_COMPOSER_VALIDATION_CODE` value. If you render those errors yourself, key your copy on `error.code` and fall back
+to `error.message`.
+
+### `getTranslations()` and `getAvailableLanguages()` are gone
+
+Both were public in v9, both leaked internal bookkeeping, and neither had a consumer in this SDK.
+
+```ts
+// v9 — reading the raw i18next resource map
+i18n.getTranslations().en.translation['some.key'];
+
+// v10 — render the key instead; that is the thing you actually wanted to know
+i18n.t('some.key');
+```
+
+`getTranslations()` never held this SDK's English copy in the first place: prose renders from the
+inline `defaultValue` at each call site, so the resource map only ever contained the bundled formatter
+expressions plus whatever had been registered.
+
+```ts
+// v9 — "available" included languages created only to carry the bundled defaults,
+// so a language nobody registered showed up here
+i18n.getAvailableLanguages().includes('de');
+
+// v10
+i18n.registeredLanguages.has('de');
+```
+
+`registeredLanguages` is now a `ReadonlySet<string>`. Reading it is unchanged; `.add()` no longer
+compiles — use `registerTranslation()`, since adding to the set would claim a language is registered
+with no dictionary behind it.
+
+Also now internal, none of them documented before: `translations`, `dayjsLocales`,
+`isCustomDateTimeParser`, `localeExists()`, `addOrUpdateLocale()`, `validateCurrentLanguage()`. To
+register a dayjs locale directly, `stream-chat/i18n` exports `addOrUpdateDayjsLocale()`.
+
+### `dayjs` must resolve to one copy
+
+Declare it compatibly with `stream-chat`'s range (`^1.11.13`), or don't declare it at all. An exact pin that
+disagrees installs a second copy, and then your `import 'dayjs/locale/de'` extends an instance the SDK never
+formats with — dates stay English with no error anywhere. Don't declare `i18next`; it arrives through
+`stream-chat`.
+
 ## Type reference
 
 | Type                          | Use it for                                                                          |
@@ -415,5 +604,10 @@ the `timestamp/<Component>` keys it replaces.
 | `DayjsLocaleConfig`           | `dayjsLocaleConfigForLanguage` and `registerTranslation`'s third argument            |
 | `CalendarFormats`             | the six calendar slots inside a `DayjsLocaleConfig`                                  |
 | `DynamicTranslationKey`       | a key only known at runtime; brand one with `asDynamicKey()`                         |
+| `Streami18nOptions`           | the constructor options — newly exported, though `options.formatters` always referenced it |
+| `PredefinedFormatters` / `CustomFormatters` | `options.formatters`; also newly exported                              |
+| `FormatterFactory`            | writing your own formatter                                                           |
+| `TimestampFormatterOptions`   | the `timestampFormatter` arguments inside a `timestamp.*` expression                 |
 
-All of them are exported from `stream-chat-react-native` and `stream-chat-expo`.
+All of them are exported from `stream-chat-react-native` and `stream-chat-expo`. They are re-exported from
+`stream-chat/i18n`, so importing them from either place gives the same type.
diff --git a/examples/ExpoMessaging/package.json b/examples/ExpoMessaging/package.json
index db1c4b4629..a575ff6512 100644
--- a/examples/ExpoMessaging/package.json
+++ b/examples/ExpoMessaging/package.json
@@ -51,7 +51,7 @@
     "react-native-teleport": "^1.1.12",
     "react-native-web": "^0.21.2",
     "react-native-worklets": "0.11.1",
-    "stream-chat": "^9.51.0",
+    "stream-chat": "^10.0.0-rc.3",
     "stream-chat-expo": "workspace:^",
     "stream-chat-react-native-core": "workspace:^"
   },
diff --git a/examples/SampleApp/package.json b/examples/SampleApp/package.json
index 1fcd0fa999..2fe5d56e50 100644
--- a/examples/SampleApp/package.json
+++ b/examples/SampleApp/package.json
@@ -44,7 +44,7 @@
     "@react-navigation/native": "^7.3.11",
     "@react-navigation/native-stack": "^7.18.3",
     "@shopify/flash-list": "^2.3.2",
-    "dayjs": "1.11.13",
+    "dayjs": "^1.11.13",
     "emoji-mart": "^5.6.0",
     "lodash.mergewith": "^4.6.2",
     "react": "19.2.3",
@@ -64,7 +64,7 @@
     "react-native-teleport": "^1.1.12",
     "react-native-video": "^6.19.2",
     "react-native-worklets": "^0.11.1",
-    "stream-chat": "^9.51.0",
+    "stream-chat": "^10.0.0-rc.3",
     "stream-chat-react-native": "workspace:^",
     "stream-chat-react-native-core": "workspace:^"
   },
diff --git a/examples/SampleApp/src/i18n/README.md b/examples/SampleApp/src/i18n/README.md
index d3acaf9c93..43c97b3e0a 100644
--- a/examples/SampleApp/src/i18n/README.md
+++ b/examples/SampleApp/src/i18n/README.md
@@ -45,6 +45,13 @@ import 'dayjs/locale/de';
 Only the `en` dayjs locale is bundled. Without this import the strings translate but every
 timestamp, month name and numeric date stays English.
 
+**And it has to be the same dayjs the SDK uses.** `import 'dayjs/locale/de'` is a side effect on one
+module instance; if your app resolves a different copy of dayjs than `stream-chat` does, the locale
+registers somewhere the SDK never reads and dates stay English with no error anywhere. Declare `dayjs`
+compatibly with `stream-chat`'s range — `"dayjs": "^1.11.13"`, as this app does — or leave it undeclared
+and take it transitively. An exact pin that disagrees with core's resolved version is what installs the
+second copy.
+
 The import alone is not enough, though. dayjs locale files carry month and day names but **no
 `calendar` block** — that field belongs to the calendar plugin, and no locale ships one, `en`
 included. Miss it and relative dates render the plugin's English scaffolding wrapped around a
@@ -99,8 +106,21 @@ partial dictionary can never knock out the SDK's bundled timestamp formats.
 await streami18n.setLanguage('de');
 ```
 
-`setLanguage` swaps the active language on the live instance and notifies listeners, so the tree
-re-renders. You do not need to remount `<Chat>` or build a new `Streami18n`.
+`setLanguage` swaps the active language on the live instance and publishes the new `t` to
+`streami18n.state`, which `<Chat>` and `<OverlayProvider>` subscribe to, so the tree re-renders. You do
+not need to remount `<Chat>` or build a new instance.
+
+It returns `void`. If you need the fresh `t` outside the React tree, read `streami18n.t` — a getter over
+that store — or subscribe:
+
+```ts
+streami18n.state.subscribeWithSelector(
+  ({ t }) => ({ t }),
+  ({ t }) => {
+    /* fires synchronously with the current value first, then on every change */
+  },
+);
+```
 
 In this app the switcher lives in the drawer's secret menu — open the drawer, tap your own name at
 the top of it seven times, then pick a language under **Language**.
diff --git a/examples/SampleApp/src/i18n/de.ts b/examples/SampleApp/src/i18n/de.ts
index 342934325c..0cfde89dfb 100644
--- a/examples/SampleApp/src/i18n/de.ts
+++ b/examples/SampleApp/src/i18n/de.ts
@@ -407,13 +407,15 @@ export const de: TranslationDictionary = {
   'notifications.attachmentUploadFailed.withReason.error':
     'Hochladen des Anhangs fehlgeschlagen wegen {{reason}}',
   'notifications.attachmentUploadInProgress.error': 'Warte, bis alle Anhänge hochgeladen sind',
+  'notifications.commandNotReady.error': 'Befehl kann noch nicht gesendet werden',
   'notifications.commandUnavailable.error': 'Befehl nicht verfügbar',
   'notifications.commandUnavailable.whileEditing.error': 'Befehl beim Bearbeiten nicht verfügbar',
   'notifications.commandUnavailable.whileReplying.error': 'Befehl beim Antworten nicht verfügbar',
   'notifications.dismiss.accessibilityLabel': 'Benachrichtigung schließen',
   'notifications.list.accessibilityLabel': 'Benachrichtigungen',
-  'notifications.locationRetrieveFailed.error': 'Standort konnte nicht abgerufen werden',
   'notifications.locationShareFailed.error': 'Standort konnte nicht geteilt werden',
+  'notifications.messageJumpFailed.error': 'Sprung zur Nachricht fehlgeschlagen',
+  'notifications.messageJumpToLatestFailed.error': 'Sprung zur neuesten Nachricht fehlgeschlagen',
   'notifications.pollCreateFailed.error': 'Umfrage konnte nicht erstellt werden',
   'notifications.pollCreateFailed.withReason.error':
     'Umfrage konnte nicht erstellt werden wegen {{reason}}',
@@ -421,7 +423,6 @@ export const de: TranslationDictionary = {
     'Umfrage konnte nicht beendet werden wegen {{reason}}',
   'notifications.pollEnded.text': 'Umfrage beendet',
   'notifications.recordingPlaybackFailed.error': 'Fehler beim Abspielen der Aufnahme',
-  'notifications.threadNotFound.error': 'Thread nicht gefunden',
   'notifications.voteLimitReached.error':
     'Stimmenlimit erreicht. Entferne zuerst eine vorhandene Stimme.',
 
@@ -438,10 +439,10 @@ export const de: TranslationDictionary = {
   'poll.createPoll.maxVotes.description': 'Zwischen 2–10 Optionen wählen',
   'poll.createPoll.maxVotes.increase.accessibilityLabel': 'Maximale Stimmenzahl erhöhen',
   'poll.createPoll.maxVotes.label': 'Stimmen pro Person begrenzen',
-  'poll.createPoll.maxVotes.range.error': 'Zahl von 2 bis 10 eingeben',
   'poll.createPoll.multipleVotes.description': 'Mehr als eine Option auswählen',
   'poll.createPoll.multipleVotes.label': 'Mehrere Stimmen',
   'poll.createPoll.options.duplicate.error': 'Option existiert bereits',
+  'poll.createPoll.options.empty.error': 'Option ist leer',
   'poll.createPoll.options.label': 'Optionen',
   'poll.createPoll.options.placeholder': 'Option hinzufügen',
   'poll.createPoll.question.label': 'Fragen',
diff --git a/examples/SampleApp/src/i18n/it.ts b/examples/SampleApp/src/i18n/it.ts
index 05fd931152..8e1fcb8699 100644
--- a/examples/SampleApp/src/i18n/it.ts
+++ b/examples/SampleApp/src/i18n/it.ts
@@ -404,6 +404,7 @@ export const it: TranslationDictionary = {
   'notifications.attachmentUploadFailed.withReason.error':
     "Caricamento dell'allegato non riuscito a causa di {{reason}}",
   'notifications.attachmentUploadInProgress.error': 'Attendi il caricamento di tutti gli allegati',
+  'notifications.commandNotReady.error': 'Il comando non è pronto per essere inviato',
   'notifications.commandUnavailable.error': 'Comando non disponibile',
   'notifications.commandUnavailable.whileEditing.error':
     'Comando non disponibile durante la modifica',
@@ -411,8 +412,9 @@ export const it: TranslationDictionary = {
     'Comando non disponibile durante la risposta',
   'notifications.dismiss.accessibilityLabel': 'Chiudi notifica',
   'notifications.list.accessibilityLabel': 'Notifiche',
-  'notifications.locationRetrieveFailed.error': 'Impossibile recuperare la posizione',
   'notifications.locationShareFailed.error': 'Impossibile condividere la posizione',
+  'notifications.messageJumpFailed.error': 'Impossibile passare al messaggio',
+  'notifications.messageJumpToLatestFailed.error': 'Impossibile passare al messaggio più recente',
   'notifications.pollCreateFailed.error': 'Impossibile creare il sondaggio',
   'notifications.pollCreateFailed.withReason.error':
     'Impossibile creare il sondaggio a causa di {{reason}}',
@@ -421,7 +423,6 @@ export const it: TranslationDictionary = {
   'notifications.pollEnded.text': 'Sondaggio terminato',
   'notifications.recordingPlaybackFailed.error':
     'Errore durante la riproduzione della registrazione',
-  'notifications.threadNotFound.error': 'Thread non trovato',
   'notifications.voteLimitReached.error':
     'Limite di voti raggiunto. Rimuovi prima un voto esistente.',
 
@@ -438,10 +439,10 @@ export const it: TranslationDictionary = {
   'poll.createPoll.maxVotes.description': 'Scegli tra 2 e 10 opzioni',
   'poll.createPoll.maxVotes.increase.accessibilityLabel': 'Aumenta il numero massimo di voti',
   'poll.createPoll.maxVotes.label': 'Limita i voti per persona',
-  'poll.createPoll.maxVotes.range.error': 'Inserisci un numero da 2 a 10',
   'poll.createPoll.multipleVotes.description': "Seleziona più di un'opzione",
   'poll.createPoll.multipleVotes.label': 'Voti multipli',
   'poll.createPoll.options.duplicate.error': "L'opzione esiste già",
+  'poll.createPoll.options.empty.error': "L'opzione è vuota",
   'poll.createPoll.options.label': 'Opzioni',
   'poll.createPoll.options.placeholder': "Aggiungi un'opzione",
   'poll.createPoll.question.label': 'Domande',
diff --git a/package.json b/package.json
index 61e998a893..101c1df6cd 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,6 @@
     "examples/ExpoMessaging"
   ],
   "resolutions": {
-    "stream-chat": "10.0.0-rc.2",
     "@types/react": "^19.2.0"
   },
   "engines": {
diff --git a/package/expo-package/package.json b/package/expo-package/package.json
index c12569fec7..aadd417d20 100644
--- a/package/expo-package/package.json
+++ b/package/expo-package/package.json
@@ -30,7 +30,7 @@
     "stream-chat-react-native-core": "workspace:^"
   },
   "peerDependencies": {
-    "expo": ">=52.0.0",
+    "expo": ">=53.0.0",
     "expo-audio": "*",
     "expo-av": "*",
     "expo-clipboard": "*",
@@ -42,7 +42,7 @@
     "expo-media-library": "*",
     "expo-sharing": "*",
     "expo-video": "*",
-    "react-native": ">=0.76.0"
+    "react-native": ">=0.79.0"
   },
   "peerDependenciesMeta": {
     "expo-audio": {
diff --git a/package/native-package/package.json b/package/native-package/package.json
index 6d5e92b6f0..e46e38b73c 100644
--- a/package/native-package/package.json
+++ b/package/native-package/package.json
@@ -36,7 +36,7 @@
     "@react-native-camera-roll/camera-roll": ">=7.9.0",
     "@react-native-clipboard/clipboard": ">=1.16.0",
     "@react-native-documents/picker": ">=10.1.1",
-    "react-native": ">=0.76.0",
+    "react-native": ">=0.79.0",
     "react-native-audio-recorder-player": ">=3.6.13",
     "react-native-blob-util": ">=0.22.0",
     "react-native-haptic-feedback": ">=2.3.0",
diff --git a/package/package.json b/package/package.json
index f59d1ce6d0..1dc9810798 100644
--- a/package/package.json
+++ b/package/package.json
@@ -69,9 +69,8 @@
   "dependencies": {
     "@gorhom/bottom-sheet": "5.2.9",
     "@ungap/structured-clone": "^1.3.0",
-    "dayjs": "1.11.13",
+    "dayjs": "^1.11.13",
     "emoji-regex": "^10.4.0",
-    "i18next": "^26.3.6",
     "intl-pluralrules": "^2.0.1",
     "linkifyjs": "^4.3.2",
     "lodash-es": "4.18.1",
@@ -79,7 +78,7 @@
     "path": "0.12.7",
     "react-native-markdown-package": "1.8.2",
     "react-native-url-polyfill": "^2.0.0",
-    "stream-chat": "^9.51.0",
+    "stream-chat": "^10.0.0-rc.3",
     "use-sync-external-store": "^1.5.0"
   },
   "peerDependencies": {
@@ -88,7 +87,7 @@
     "@react-native-community/netinfo": ">=11.3.1",
     "@shopify/flash-list": ">=2.1.0",
     "emoji-mart": ">=5.4.0",
-    "react-native": ">=0.76.0",
+    "react-native": ">=0.79.0",
     "react-native-gesture-handler": ">=2.18.0",
     "react-native-reanimated": ">=3.16.0",
     "react-native-safe-area-context": ">=5.4.1",
@@ -137,7 +136,6 @@
     "babel-plugin-module-resolver": "5.0.3",
     "better-sqlite3": "12.11.1",
     "jest": "^30.4.2",
-    "moment-timezone": "^0.6.0",
     "react": "19.2.3",
     "react-native": "0.86.0",
     "react-native-builder-bob": "0.40.11",
diff --git a/package/scripts/generate-i18n-keys.mts b/package/scripts/generate-i18n-keys.mts
index b04d66647f..9edc51883c 100644
--- a/package/scripts/generate-i18n-keys.mts
+++ b/package/scripts/generate-i18n-keys.mts
@@ -1,310 +1,41 @@
-// Generates src/i18n/keys.ts — the type-only catalog of every translation key mapped to its
-// English copy. The i18n types derive `TranslationKey` / `StreamTFunction` from it, so a typo'd
-// key is a compile error.
+// Regenerates src/i18n/keys.ts — the type-only catalog of every translation key mapped to its English
+// copy. The i18n types derive `TranslationKey` / `StreamTFunction` from it, so a typo'd key is a compile
+// error rather than a string that silently stops rendering.
 //
-// It is type-only on purpose: no runtime value is emitted, so it costs nothing in the bundle.
-// (Deriving the type from `typeof import('./en.json')` would not work for consumers either — tsc
-// does not copy JSON into lib/typescript.)
+// The generator itself lives in `stream-chat/i18n/codegen`, shared with the React SDK. Only this
+// package's paths and prefixes are configured here; the call-site reader, the four hard-fail guards and
+// the emitter are all core's, and core owns their fixture tests.
 //
-// The catalog has exactly two sources, and both are the place the copy is actually used:
-//
-//   1. Inline defaults at the call sites — `t('message.status.sent.text', 'Sent')`.
-//      i18next renders these from the `defaultValue`, so they are never bundled as data.
-//   2. src/i18n/runtimeDefaults.ts — hand-maintained, and the only translation data that ships.
-//      Just the keys with no inline copy to fall back on: `timestamp.*` / `duration.*` formatter
-//      expressions passed around as prop values, and keys built from a runtime value.
-//
-// There is deliberately no checked-in en.json. It was a third copy of strings that already exist
-// in those two places, and keeping it in sync needed an extract pass plus a sync pass. Pass
-// `--json <path>` to write the translatable keys out as JSON on demand, for a translator or a TMS,
-// and add `--all` to include the formatter expressions.
-//
-// Run by `yarn build-translations`, from the `package` workspace root — every path below is
-// relative to it.
-import fs from 'node:fs';
-import path from 'node:path';
+// Run by `yarn build-translations`, from the `package` workspace root — every path below is relative to
+// it. `yarn validate-translations` runs it and fails on any diff, which is the drift gate.
 import ts from 'typescript';
-import { readCallSiteCopy } from './i18n-call-sites.mts';
-
-const RUNTIME_DEFAULTS = 'src/i18n/runtimeDefaults.ts';
-const EXTERNAL_STRINGS = 'src/i18n/externalStrings.ts';
-const KEYS_OUT = 'src/i18n/keys.ts';
-
-// Values under these prefixes are dayjs/i18next expressions, not copy. Mirrors `FormatterKey` in
-// the i18n types. Excluded from the JSON export, which is a translator-facing file.
-const FORMATTER_PREFIXES = ['timestamp.', 'duration.'];
-const isFormatterKey = (key: string) => FORMATTER_PREFIXES.some((prefix) => key.startsWith(prefix));
-
-// Some formatter values embed English day words in their `calendarFormats` (dayjs escapes literal
-// text in brackets), so excluding them from the export does drop translatable text. It is not
-// translatable *as copy* — the format string has to be rewritten — so the guide routes it through a
-// key override instead. Detected rather than hardcoded so the list below cannot go stale.
-// Two different ways English hides inside a formatter expression, and both have to be reported —
-// a translator working from the JSON export never sees these keys otherwise.
-const hasEnglishWords = (value: string) =>
-  // Day words baked into a `calendarFormats` argument, e.g. `[Yesterday]`.
-  [...value.matchAll(/\[([^\]]+)\]/g)].some(([, literal]) => /[A-Za-z]{2}/.test(literal)) ||
-  // Prose sitting beside the interpolation, e.g. `Last seen {{ timestamp | … }}`. Each expression
-  // is matched individually — a greedy `{{[\s\S]*}}` would span from the first `{{` to the last
-  // `}}` and swallow the prose between two of them. Stopping at `}}` rather than any `}` is what
-  // keeps the nested braces of a `calendarFormats` argument inside the match.
-  /[A-Za-z]{2}/.test(value.replace(/\{\{(?:[^}]|\}(?!\}))*\}\}/g, ''));
-
-// `EXTERNAL_STRING_KEYS` entries whose low-level-client wording deliberately differs from the SDK's
-// own copy for the same concept. Everything else must match, so a copy edit cannot silently
-// desynchronise the two. See src/i18n/externalStrings.ts.
-const REPHRASED_EXTERNAL_STRINGS = new Set<string>([
-  // e.g. 'Command not ready to be sent', // SDK: 'Command not available'
-]);
+import { generateI18nKeys } from 'stream-chat/i18n/codegen';
 
 const jsonFlag = process.argv.indexOf('--json');
-const JSON_OUT = jsonFlag === -1 ? null : process.argv[jsonFlag + 1];
-if (jsonFlag !== -1 && (!JSON_OUT || JSON_OUT.startsWith('--'))) {
+const jsonOut = jsonFlag === -1 ? undefined : process.argv[jsonFlag + 1];
+
+if (jsonFlag !== -1 && (!jsonOut || jsonOut.startsWith('--'))) {
   console.error('--json requires an output path');
   process.exit(1);
 }
-// Include the formatter expressions in the export. Off by default: they are not copy, and a TMS
-// that "translates" them breaks date rendering.
-const INCLUDE_FORMATS = process.argv.includes('--all');
-
-const fail = (message: string, lines: string[]) => {
-  console.error(`\n${message}`);
-  for (const line of lines) console.error(`  ${line}`);
-  process.exit(1);
-};
-
-// ---------------------------------------------------------------------------------------
-// Read the hand-maintained string maps
-// ---------------------------------------------------------------------------------------
-// Parsed rather than imported: `await import()` works under Node's type stripping but warns
-// MODULE_TYPELESS_PACKAGE_JSON on every run, and the package cannot be `"type": "module"`.
-const readStringMap = (file: string, exportName: string): Map<string, string> => {
-  if (!fs.existsSync(file)) {
-    fail(`could not read the file that is expected to export \`${exportName}\`:`, [file]);
-  }
-  const source = ts.createSourceFile(
-    file,
-    fs.readFileSync(file, 'utf8'),
-    ts.ScriptTarget.Latest,
-    true,
-    ts.ScriptKind.TS,
-  );
-  const out = new Map<string, string>();
-  let found = false;
 
-  ts.forEachChild(source, (node) => {
-    if (!ts.isVariableStatement(node)) return;
-    for (const declaration of node.declarationList.declarations) {
-      if (
-        !ts.isIdentifier(declaration.name) ||
-        declaration.name.text !== exportName ||
-        !declaration.initializer
-      ) {
-        continue;
-      }
-      // `= { … } as const` / `satisfies …` are both fine.
-      let initializer: ts.Expression = declaration.initializer;
-      while (ts.isAsExpression(initializer) || ts.isSatisfiesExpression(initializer)) {
-        initializer = initializer.expression;
-      }
-      if (!ts.isObjectLiteralExpression(initializer)) continue;
-      found = true;
-      for (const property of initializer.properties) {
-        if (!ts.isPropertyAssignment(property)) {
-          fail(`${exportName} in ${file} must be a flat object of string literals.`, [
-            property.getText(source).slice(0, 80),
-          ]);
-        }
-        const assignment = property as ts.PropertyAssignment;
-        if (
-          !ts.isStringLiteralLike(assignment.name) ||
-          !ts.isStringLiteralLike(assignment.initializer)
-        ) {
-          fail(`${exportName} entries must be 'quoted.key': 'string literal'.`, [
-            assignment.getText(source).slice(0, 80),
-          ]);
-        }
-        out.set(
-          (assignment.name as ts.StringLiteralLike).text,
-          (assignment.initializer as ts.StringLiteralLike).text,
-        );
-      }
-    }
+try {
+  generateI18nKeys({
+    emitBundledKeyUnion: true,
+    // `keys.ts` is type-only, so no runtime test can iterate it. This is its data twin, used by
+    // `catalogRenders.test.ts`, and it lives under `__tests__` so it never reaches the published build.
+    fixtureOut: 'src/i18n/__tests__/catalog.fixture.json',
+    // `language.*` comes from `stream-chat/i18n` rather than this package's runtimeDefaults, so it is
+    // excluded from the translator export alongside the formatter expressions.
+    extraFormatterPrefixes: ['language.'],
+    json: jsonOut ? { includeFormats: process.argv.includes('--all'), out: jsonOut } : undefined,
+    keysOut: 'src/i18n/keys.ts',
+    migrationGuideRef: 'ai-docs/i18n-v10-migration.md#date-and-time',
+    runtimeDefaultsPath: 'src/i18n/runtimeDefaults.ts',
+    ts,
   });
-
-  if (!found) {
-    fail(`could not find an exported \`${exportName}\` object literal in`, [file]);
-  }
-  return out;
-};
-
-const runtimeDefaults = readStringMap(RUNTIME_DEFAULTS, 'runtimeDefaults');
-const { conflicts, copy: inlineCopy, withoutCopy } = readCallSiteCopy();
-
-// ---------------------------------------------------------------------------------------
-// Cross-check the two sources
-// ---------------------------------------------------------------------------------------
-if (conflicts.length) {
-  fail(
-    `${conflicts.length} key(s) used with conflicting inline copy — a key must render one thing:`,
-    conflicts.map(
-      (c) => `${c.key}\n    ${JSON.stringify(c.a)}\n    ${JSON.stringify(c.b)}  (${c.file})`,
-    ),
-  );
-}
-
-// A key called without inline copy resolves from the bundled resource or not at all — i18next
-// would render the raw dotted key in the UI.
-const unresolvable = [...withoutCopy].filter(([key]) => !runtimeDefaults.has(key));
-if (unresolvable.length) {
-  fail(
-    `${unresolvable.length} key(s) are called with no inline default and are missing from ${RUNTIME_DEFAULTS}.\n` +
-      `They would render as the raw key. Either pass the English copy inline — t('key', 'Copy') —\n` +
-      `or add an entry to ${RUNTIME_DEFAULTS}:`,
-    unresolvable.map(([key, file]) => `${key}  (${file})`),
-  );
-}
-
-// The bundled resource wins over a `defaultValue`, so a key in both places silently renders the
-// bundled string and ignores the copy at the call site.
-const shadowed = [...runtimeDefaults.keys()].filter((key) => inlineCopy.has(key));
-if (shadowed.length) {
-  fail(
-    `${shadowed.length} key(s) are in both ${RUNTIME_DEFAULTS} and an inline default.\n` +
-      `The bundled value wins, so editing the call site would silently change nothing.\n` +
-      `Remove the runtimeDefaults entry:`,
-    shadowed.map(
-      (key) =>
-        `${key}\n    bundled:   ${JSON.stringify(runtimeDefaults.get(key))}\n    call site: ${JSON.stringify(inlineCopy.get(key))}`,
-    ),
-  );
-}
-
-// ---------------------------------------------------------------------------------------
-// keys.ts
-// ---------------------------------------------------------------------------------------
-const catalog = new Map([...inlineCopy, ...runtimeDefaults]);
-const keys = [...catalog.keys()].sort();
-
-// A key that is a strict dotted prefix of another key cannot be both a leaf and a namespace:
-// with i18next's default `keySeparator: '.'` the shorter key resolves to an object, and a nested
-// resource tree cannot represent the two at once. Compared on segment boundaries, so
-// `poll.title` / `poll.titleText` is fine and `poll.title` / `poll.title.text` is not.
-const keySet = new Set(keys);
-const prefixCollisions: Array<{ leaf: string; nested: string }> = [];
-for (const key of keys) {
-  const segments = key.split('.');
-  for (let i = 1; i < segments.length; i++) {
-    const ancestor = segments.slice(0, i).join('.');
-    if (keySet.has(ancestor)) prefixCollisions.push({ leaf: ancestor, nested: key });
-  }
-}
-if (prefixCollisions.length) {
-  fail(
-    `${prefixCollisions.length} key(s) are a strict prefix of another key — a key cannot be both a leaf\n` +
-      `and a namespace. Rename one of them, usually by giving the shorter key a modality segment\n` +
-      `(.label / .text / .title):`,
-    prefixCollisions.map(({ leaf, nested }) => `${leaf}\n    is a strict prefix of: ${nested}`),
-  );
-}
-
-// `translateExternalString` passes the raw low-level-client sentence as the `defaultValue`, so that
-// is what renders in English — not the key's catalog copy. When the two differ, `TranslationCatalog`
-// and the JSON export advertise a string the external path never produces. Deliberate rephrasings
-// are allowlisted above; anything else means a copy edit desynchronised the two.
-const externalStrings = readStringMap(EXTERNAL_STRINGS, 'EXTERNAL_STRING_KEYS');
-const desynchronised = [...externalStrings]
-  .filter(([raw]) => !REPHRASED_EXTERNAL_STRINGS.has(raw))
-  .filter(([raw, key]) => catalog.get(key) !== raw);
-if (desynchronised.length) {
-  fail(
-    `${desynchronised.length} entr(ies) in ${EXTERNAL_STRINGS} map an external string onto a key\n` +
-      `whose catalog copy differs. English renders the external string, so the catalog would\n` +
-      `advertise copy that never appears. Align the two, or add the external string to\n` +
-      `REPHRASED_EXTERNAL_STRINGS in this script if the wording differs on purpose:`,
-    desynchronised.map(
-      ([raw, key]) =>
-        `${key}\n    catalog:  ${JSON.stringify(catalog.get(key))}\n    external: ${JSON.stringify(raw)}`,
-    ),
-  );
-}
-
-const lines: string[] = [
-  '// AUTO-GENERATED by scripts/generate-i18n-keys.mts — do not edit by hand.',
-  '// Regenerate with `yarn build-translations`. CI fails if this file is out of sync.',
-  '//',
-  '// Type-only: no runtime value is emitted, so this adds nothing to the bundle.',
-  '',
-  '/**',
-  ' * Every translation entry shipped with the SDK, mapped to its English copy.',
-  ' *',
-  ' * Plural entries appear as `<key>_one` / `<key>_other`; call sites use the bare `<key>` and',
-  ' * pass `count`. See {@link TranslationKey}.',
-  ' */',
-  'export type TranslationCatalog = {',
-];
-for (const key of keys) {
-  lines.push(`  ${JSON.stringify(key)}: ${JSON.stringify(catalog.get(key))};`);
-}
-lines.push('};', '');
-
-// The bundled subset, so `StreamTFunction` can let these be called without an inline default.
-// Prefix-matching `timestamp.`/`duration.` is not enough: screen-reader labels and lookup-table
-// entries are ordinary prose that happens to be resolved by name at runtime.
-lines.push(
-  '/**',
-  ' * Keys whose copy is bundled in `runtimeDefaults` rather than passed inline at the call site.',
-  ' *',
-  ' * They reach `t()` as runtime values — a JSX prop, a ternary branch, a lookup table — so there',
-  ' * is nowhere to write a `defaultValue`. Call sites pass the key alone.',
-  ' */',
-  'export type BundledTranslationKey =',
-);
-const bundledKeys = [...runtimeDefaults.keys()].sort();
-for (const key of bundledKeys) {
-  lines.push(`  | ${JSON.stringify(key)}`);
-}
-lines.push(';', '');
-
-fs.writeFileSync(KEYS_OUT, lines.join('\n'));
-
-// `keys.ts` is type-only, so tests cannot iterate it. This is its data twin: same content, JSON,
-// used by `src/i18n/__tests__/catalogRenders.test.ts` to render every key. It lives under
-// `__tests__` so it never reaches the published build.
-const FIXTURE_OUT = 'src/i18n/__tests__/catalog.fixture.json';
-fs.mkdirSync(path.dirname(FIXTURE_OUT), { recursive: true });
-fs.writeFileSync(
-  FIXTURE_OUT,
-  `${JSON.stringify(Object.fromEntries(keys.map((k) => [k, catalog.get(k)])), null, 2)}\n`,
-);
-
-console.log(
-  `generated ${KEYS_OUT} (${keys.length} entries, type-only) — ` +
-    `${inlineCopy.size} from inline defaults, ${runtimeDefaults.size} bundled`,
-);
-
-// ---------------------------------------------------------------------------------------
-// Optional JSON export, for translators / a TMS
-// ---------------------------------------------------------------------------------------
-if (JSON_OUT) {
-  const exported = INCLUDE_FORMATS ? keys : keys.filter((key) => !isFormatterKey(key));
-  const asObject: Record<string, string> = {};
-  for (const key of exported) asObject[key] = catalog.get(key)!;
-  fs.writeFileSync(JSON_OUT, `${JSON.stringify(asObject, null, 2)}\n`);
-
-  const excludedKeys = keys.filter((key) => !exported.includes(key));
-  console.log(
-    `wrote ${JSON_OUT} (${exported.length} ${INCLUDE_FORMATS ? 'entries, formatter expressions included' : 'translatable entries'})`,
-  );
-  if (excludedKeys.length) {
-    const withEnglish = excludedKeys.filter((key) => hasEnglishWords(catalog.get(key)!));
-    console.log(
-      `  excluded ${excludedKeys.length} formatter expressions (${FORMATTER_PREFIXES.join(', ')}) — ` +
-        `not copy, and\n  a TMS that translates them breaks date rendering. ` +
-        `Pass --all to include them.\n  ${withEnglish.length} of them do carry English copy and ` +
-        `must be translated by overriding the key:\n` +
-        withEnglish.map((key) => `    ${key}`).join('\n') +
-        `\n  see ai-docs/i18n-v10-migration.md#date-and-time.`,
-    );
-  }
+} catch (error) {
+  // The generator throws with every guard failure formatted; exit non-zero so CI fails.
+  console.error(error instanceof Error ? error.message : String(error));
+  process.exit(1);
 }
diff --git a/package/scripts/i18n-call-sites.mts b/package/scripts/i18n-call-sites.mts
deleted file mode 100644
index 30928c64f0..0000000000
--- a/package/scripts/i18n-call-sites.mts
+++ /dev/null
@@ -1,106 +0,0 @@
-// Reads every `t()` call in the library source and reports the translation keys it declares.
-//
-// The call sites are the source of truth for the catalog. A prose key exists because some
-// component asks for it and passes its English copy inline; delete the call and the key is gone.
-// That is what removed the need for a checked-in en.json and for `i18next-cli`'s
-// extract/removeUnusedKeys pass.
-//
-// The only keys that cannot be described this way are the ones with no inline copy — a formatter
-// expression or a key built from a runtime value. Those live in `src/i18n/runtimeDefaults.ts`,
-// which is hand-maintained; `generate-i18n-keys.mts` joins the two and cross-checks them.
-//
-// Run by `node` directly — Node 24 strips the types. No loader, no ts-morph: only the TypeScript
-// parser API, no `Program` and no type checker, so it needs no tsconfig and is fast.
-import fs from 'node:fs';
-import path from 'node:path';
-import ts from 'typescript';
-
-export type CallSiteCopy = {
-  /** `key -> English copy` for every key written with an inline default. */
-  copy: Map<string, string>;
-  /**
-   * `key -> file` for keys called with no inline copy — `t('timestamp.MessageTimestamp', {…})`.
-   * These must be present in `runtimeDefaults.ts` or they render as the raw key.
-   */
-  withoutCopy: Map<string, string>;
-  /** Keys seen with two different inline copies — a key must render one thing. */
-  conflicts: Array<{ key: string; a: string; b: string; file: string }>;
-};
-
-const isTCallee = (expr: ts.Expression): boolean =>
-  (ts.isIdentifier(expr) && expr.text === 't') ||
-  (ts.isPropertyAccessExpression(expr) && expr.name.text === 't');
-
-export const sourceFiles = (root = 'src'): string[] => {
-  const out: string[] = [];
-  (function walk(dir: string) {
-    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-      const full = path.join(dir, entry.name);
-      if (entry.isDirectory()) {
-        if (entry.name === '__tests__' || entry.name === 'mock-builders') continue;
-        walk(full);
-      } else if (/\.tsx?$/.test(entry.name) && !entry.name.endsWith('.d.ts')) {
-        out.push(full);
-      }
-    }
-  })(root);
-  return out;
-};
-
-export const readCallSiteCopy = (root = 'src'): CallSiteCopy => {
-  const copy = new Map<string, string>();
-  const withoutCopy = new Map<string, string>();
-  const conflicts: CallSiteCopy['conflicts'] = [];
-
-  const record = (key: string, value: string, file: string) => {
-    const existing = copy.get(key);
-    if (existing !== undefined && existing !== value) {
-      conflicts.push({ a: existing, b: value, file, key });
-      return;
-    }
-    copy.set(key, value);
-  };
-
-  for (const file of sourceFiles(root)) {
-    const sourceFile = ts.createSourceFile(
-      file,
-      fs.readFileSync(file, 'utf8'),
-      ts.ScriptTarget.Latest,
-      true,
-      file.endsWith('.tsx') ? ts.ScriptKind.TSX : ts.ScriptKind.TS,
-    );
-
-    (function visit(node: ts.Node) {
-      if (ts.isCallExpression(node) && isTCallee(node.expression)) {
-        const [keyArg, second] = node.arguments;
-        if (keyArg && ts.isStringLiteralLike(keyArg)) {
-          const key = keyArg.text;
-          if (second && ts.isStringLiteralLike(second)) {
-            // t('key', 'Copy')
-            record(key, second.text, file);
-          } else if (second && ts.isObjectLiteralExpression(second)) {
-            // t('key', { count, defaultValue_one, defaultValue_other }) — the catalog holds the
-            // `_one` / `_other` forms, never the bare key.
-            let plurals = 0;
-            for (const prop of second.properties) {
-              if (!ts.isPropertyAssignment(prop)) continue;
-              const name = prop.name.getText(sourceFile).replace(/['"]/g, '');
-              const suffix = name.match(/^defaultValue_(\w+)$/)?.[1];
-              if (suffix && ts.isStringLiteralLike(prop.initializer)) {
-                record(`${key}_${suffix}`, prop.initializer.text, file);
-                plurals++;
-              }
-            }
-            if (!plurals) withoutCopy.set(key, file);
-          } else {
-            // t('key') — carries no inline copy, so it has to resolve from runtimeDefaults.
-            withoutCopy.set(key, file);
-          }
-        }
-      }
-      ts.forEachChild(node, visit);
-    })(sourceFile);
-  }
-
-  return { conflicts, copy, withoutCopy };
-};
diff --git a/package/scripts/tests/i18n-tooling-checks.mts b/package/scripts/tests/i18n-tooling-checks.mts
deleted file mode 100644
index 6783bbe87a..0000000000
--- a/package/scripts/tests/i18n-tooling-checks.mts
+++ /dev/null
@@ -1,381 +0,0 @@
-// Fixture tests for the i18n build scripts. Run with:
-//
-//   node --test scripts/tests/i18n-tooling-checks.mts     (from the `package` workspace root)
-//
-// Deliberately NOT a jest test, and deliberately named neither `*.test.*` nor `__tests__/`:
-// jest.config.js leaves `testRegex` empty, so jest falls back to its default `testMatch`
-// (`**/__tests__/**/*.?([mc])[jt]s?(x)` and `**/?(*.)+(spec|test).?([mc])[jt]s?(x)`) over the whole
-// package — either name would pull this file, and any checked-in fixture, into `yarn test:unit`.
-//
-// The fixtures are synthetic sources that must not be type-checked, linted or run by jest, so they
-// are written to a scratch directory at run time and the generator is spawned with its cwd pointed
-// at them — which is exactly how it runs in the workspace, since every path it uses is relative.
-import assert from 'node:assert/strict';
-import { spawnSync } from 'node:child_process';
-import fs from 'node:fs';
-import os from 'node:os';
-import path from 'node:path';
-import { test } from 'node:test';
-import { fileURLToPath } from 'node:url';
-
-const HERE = path.dirname(fileURLToPath(import.meta.url));
-const GENERATOR = path.join(HERE, '..', 'generate-i18n-keys.mts');
-
-/** The two hand-maintained maps, in their simplest valid form. */
-const emptyRuntimeDefaults = 'export const runtimeDefaults = {};\n';
-const emptyExternalStrings = 'export const EXTERNAL_STRING_KEYS = {};\n';
-
-type Fixture = Record<string, string>;
-
-const run = (files: Fixture, args: string[] = []) => {
-  const dir = fs.mkdtempSync(path.join(os.tmpdir(), 'i18n-fixture-'));
-  const all: Fixture = {
-    'src/i18n/externalStrings.ts': emptyExternalStrings,
-    'src/i18n/runtimeDefaults.ts': emptyRuntimeDefaults,
-    ...files,
-  };
-  for (const [relative, contents] of Object.entries(all)) {
-    const full = path.join(dir, relative);
-    fs.mkdirSync(path.dirname(full), { recursive: true });
-    fs.writeFileSync(full, contents);
-  }
-  const result = spawnSync(process.execPath, [GENERATOR, ...args], {
-    cwd: dir,
-    encoding: 'utf8',
-  });
-  const keysPath = path.join(dir, 'src/i18n/keys.ts');
-  return {
-    dir,
-    keys: fs.existsSync(keysPath) ? fs.readFileSync(keysPath, 'utf8') : null,
-    status: result.status,
-    stderr: result.stderr,
-    stdout: result.stdout,
-    read: (relative: string) => fs.readFileSync(path.join(dir, relative), 'utf8'),
-  };
-};
-
-// ---------------------------------------------------------------------------------------
-// Recognised call forms
-// ---------------------------------------------------------------------------------------
-test('records every recognised t() call form and ignores the rest', () => {
-  const result = run({
-    // A .d.ts file is skipped entirely.
-    'src/components/legacy.d.ts': `declare const t: (k: string, d?: string) => string;\n`,
-    'src/components/Widget.tsx': `
-      declare const t: (k: string, d?: unknown) => string;
-      declare const props: { t: typeof t };
-      declare const count: number;
-      declare const timestamp: Date;
-      declare const cond: boolean;
-
-      export const Widget = () => (
-        <View
-          accessibilityLabel={t('widget.close.ariaLabel', 'Close')}
-          title={props.t('widget.header.title', 'Widget')}
-        >
-          {t(\`widget.body.text\`, 'Body')}
-          {t('widget.replies.label', {
-            count,
-            defaultValue_one: '{{count}} reply',
-            defaultValue_other: '{{count}} replies',
-          })}
-          {t('timestamp.WidgetTimestamp', { timestamp })}
-          {t('duration.widget')}
-          {t(cond ? 'widget.ignored.a' : 'widget.ignored.b')}
-          {[t('widget.nested.text', 'Nested')]}
-        </View>
-      );
-    `,
-    // Both excluded directory names.
-    'src/components/__tests__/Widget.test.tsx': `t('never.seen.text', 'Never');\n`,
-    'src/mock-builders/fake.ts': `t('also.never.text', 'Never');\n`,
-    'src/i18n/runtimeDefaults.ts': `
-      export const runtimeDefaults = {
-        'duration.widget': 'mm:ss',
-        'timestamp.WidgetTimestamp': '{{ timestamp | timestampFormatter }}',
-      } as const;
-    `,
-  });
-
-  assert.equal(result.status, 0, result.stderr);
-  // Sliced to the catalog block rather than compared against the whole tail of the file, so the
-  // prose of the `BundledTranslationKey` doc comment is not load-bearing for this assertion.
-  const catalogStart = result.keys!.indexOf('export type TranslationCatalog');
-  assert.equal(
-    result.keys!.slice(catalogStart, result.keys!.indexOf('};', catalogStart) + 3),
-    [
-      'export type TranslationCatalog = {',
-      '  "duration.widget": "mm:ss";',
-      '  "timestamp.WidgetTimestamp": "{{ timestamp | timestampFormatter }}";',
-      '  "widget.body.text": "Body";',
-      '  "widget.close.ariaLabel": "Close";',
-      '  "widget.header.title": "Widget";',
-      '  "widget.nested.text": "Nested";',
-      '  "widget.replies.label_one": "{{count}} reply";',
-      '  "widget.replies.label_other": "{{count}} replies";',
-      '};',
-      '',
-    ].join('\n'),
-  );
-  // The two keys with no inline copy are also emitted as the bundled union, which is what the
-  // `t()` overloads use to tell a key that needs a `defaultValue` from one that does not.
-  const bundled = result.keys!.slice(result.keys!.indexOf('export type BundledTranslationKey'));
-  assert.match(bundled, /\|\s+"duration\.widget"/);
-  assert.match(bundled, /\|\s+"timestamp\.WidgetTimestamp"/);
-  assert.doesNotMatch(bundled, /widget\.close\.ariaLabel/);
-  // Conditional keys are invisible to the scanner — neither branch is recorded, and it is not
-  // reported as an error.
-  assert.ok(!result.keys?.includes('widget.ignored'));
-  assert.match(result.stdout, /8 entries, type-only/);
-  assert.match(result.stdout, /6 from inline defaults, 2 bundled/);
-});
-
-// ---------------------------------------------------------------------------------------
-// Guard 1 — conflicting inline copy
-// ---------------------------------------------------------------------------------------
-test('guard 1: one key used with two different inline copies', () => {
-  const result = run({
-    'src/a.tsx': `t('widget.close.label', 'Close');\n`,
-    'src/b.tsx': `t('widget.close.label', 'Dismiss');\n`,
-  });
-
-  assert.equal(result.status, 1);
-  assert.match(
-    result.stderr,
-    /1 key\(s\) used with conflicting inline copy — a key must render one thing:/,
-  );
-  assert.match(result.stderr, /widget\.close\.label/);
-  assert.match(result.stderr, /"Close"/);
-  assert.match(result.stderr, /"Dismiss"/);
-  assert.equal(result.keys, null);
-});
-
-// ---------------------------------------------------------------------------------------
-// Guard 2 — no inline default and no runtimeDefaults entry
-// ---------------------------------------------------------------------------------------
-test('guard 2: key called with no inline default and no runtimeDefaults entry', () => {
-  const result = run({
-    'src/a.tsx': `t('widget.orphan.text');\nt('widget.interpolated.text', { name });\n`,
-  });
-
-  assert.equal(result.status, 1);
-  assert.match(
-    result.stderr,
-    /2 key\(s\) are called with no inline default and are missing from src\/i18n\/runtimeDefaults\.ts\./,
-  );
-  assert.match(result.stderr, /They would render as the raw key\./);
-  assert.match(result.stderr, /widget\.orphan\.text {2}\(src\/a\.tsx\)/);
-  assert.match(result.stderr, /widget\.interpolated\.text {2}\(src\/a\.tsx\)/);
-  assert.equal(result.keys, null);
-});
-
-// ---------------------------------------------------------------------------------------
-// Guard 3 — key in both the call sites and runtimeDefaults
-// ---------------------------------------------------------------------------------------
-test('guard 3: key present in both an inline default and runtimeDefaults', () => {
-  const result = run({
-    'src/a.tsx': `t('widget.close.label', 'Close');\n`,
-    'src/i18n/runtimeDefaults.ts': `
-      export const runtimeDefaults = {
-        'widget.close.label': 'Shut',
-      };
-    `,
-  });
-
-  assert.equal(result.status, 1);
-  assert.match(
-    result.stderr,
-    /1 key\(s\) are in both src\/i18n\/runtimeDefaults\.ts and an inline default\./,
-  );
-  assert.match(result.stderr, /The bundled value wins, so editing the call site would silently/);
-  assert.match(result.stderr, /bundled: {3}"Shut"/);
-  assert.match(result.stderr, /call site: "Close"/);
-  assert.equal(result.keys, null);
-});
-
-// ---------------------------------------------------------------------------------------
-// Guard 4 — externalStrings desynchronised from the catalog
-// ---------------------------------------------------------------------------------------
-test('guard 4: external string no longer matches its key catalog copy', () => {
-  const files = (external: string) => ({
-    'src/a.tsx': `t('notification.locationShareFailed', 'Failed to share location');\n`,
-    'src/i18n/externalStrings.ts': external,
-  });
-
-  const desynchronised = run(
-    files(`
-      export const EXTERNAL_STRING_KEYS = {
-        'Failed to share the location': 'notification.locationShareFailed',
-      } as const;
-    `),
-  );
-  assert.equal(desynchronised.status, 1);
-  assert.match(
-    desynchronised.stderr,
-    /1 entr\(ies\) in src\/i18n\/externalStrings\.ts map an external string onto a key/,
-  );
-  assert.match(desynchronised.stderr, /catalog: {2}"Failed to share location"/);
-  assert.match(desynchronised.stderr, /external: "Failed to share the location"/);
-  assert.equal(desynchronised.keys, null);
-
-  // The aligned spelling passes.
-  const aligned = run(
-    files(`
-      export const EXTERNAL_STRING_KEYS = {
-        'Failed to share location': 'notification.locationShareFailed',
-      } as const;
-    `),
-  );
-  assert.equal(aligned.status, 0, aligned.stderr);
-});
-
-// ---------------------------------------------------------------------------------------
-// Guard 5 — strict-prefix collision (RN only; web has no equivalent)
-// ---------------------------------------------------------------------------------------
-test('guard 5: a key that is a strict prefix of another key', () => {
-  const result = run({
-    'src/a.tsx': `
-      t('poll.title', 'Poll');
-      t('poll.title.text', 'Poll title');
-    `,
-  });
-
-  assert.equal(result.status, 1);
-  assert.match(
-    result.stderr,
-    /1 key\(s\) are a strict prefix of another key — a key cannot be both a/,
-  );
-  assert.match(result.stderr, /^ {2}poll\.title$/m);
-  assert.match(result.stderr, /^ {4}is a strict prefix of: poll\.title\.text$/m);
-  assert.equal(result.keys, null);
-});
-
-test('guard 5: compares on segment boundaries, so poll.title / poll.titleText is fine', () => {
-  const result = run({
-    'src/a.tsx': `
-      t('poll.title', 'Poll');
-      t('poll.titleText', 'Poll title');
-      t('poll.title_one', 'One poll');
-    `,
-  });
-
-  assert.equal(result.status, 0, result.stderr);
-  assert.ok(result.keys?.includes('"poll.title": "Poll";'));
-  assert.ok(result.keys?.includes('"poll.titleText": "Poll title";'));
-});
-
-test('guard 5: also catches a collision introduced by runtimeDefaults', () => {
-  const result = run({
-    'src/a.tsx': `t('duration.remindMe.short', 'mm:ss');\n`,
-    'src/i18n/runtimeDefaults.ts': `
-      export const runtimeDefaults = {
-        'duration.remindMe': 'hh:mm',
-      };
-    `,
-  });
-
-  assert.equal(result.status, 1);
-  assert.match(result.stderr, /are a strict prefix of another key/);
-  assert.match(result.stderr, /^ {2}duration\.remindMe$/m);
-  assert.match(result.stderr, /^ {4}is a strict prefix of: duration\.remindMe\.short$/m);
-});
-
-// ---------------------------------------------------------------------------------------
-// readStringMap guards, ported from web
-// ---------------------------------------------------------------------------------------
-test('readStringMap: the exported object must exist and be flat string literals', () => {
-  const missing = run({ 'src/i18n/runtimeDefaults.ts': `export const somethingElse = {};\n` });
-  assert.equal(missing.status, 1);
-  assert.match(missing.stderr, /could not find an exported `runtimeDefaults` object literal in/);
-
-  const notFlat = run({
-    'src/i18n/runtimeDefaults.ts': `
-      export const runtimeDefaults = {
-        ...spread,
-      };
-    `,
-  });
-  assert.equal(notFlat.status, 1);
-  assert.match(
-    notFlat.stderr,
-    /runtimeDefaults in src\/i18n\/runtimeDefaults\.ts must be a flat object of string literals\./,
-  );
-
-  const notStrings = run({
-    'src/i18n/runtimeDefaults.ts': `
-      export const runtimeDefaults = {
-        'duration.widget': someValue,
-      };
-    `,
-  });
-  assert.equal(notStrings.status, 1);
-  assert.match(
-    notStrings.stderr,
-    /runtimeDefaults entries must be 'quoted\.key': 'string literal'\./,
-  );
-
-  const absent = run({ 'src/i18n/runtimeDefaults.ts': '' });
-  fs.rmSync(path.join(absent.dir, 'src/i18n/runtimeDefaults.ts'));
-  const rerun = spawnSync(process.execPath, [GENERATOR], { cwd: absent.dir, encoding: 'utf8' });
-  assert.equal(rerun.status, 1);
-  assert.match(
-    rerun.stderr,
-    /could not read the file that is expected to export `runtimeDefaults`/,
-  );
-});
-
-// ---------------------------------------------------------------------------------------
-// JSON export
-// ---------------------------------------------------------------------------------------
-test('--json writes the joined catalog, excluding formatter keys unless --all is passed', () => {
-  const files = {
-    'src/a.tsx': `t('widget.close.label', 'Close');\nt('timestamp.Foo', { t: 1 });\n`,
-    'src/i18n/runtimeDefaults.ts': `
-      export const runtimeDefaults = {
-        'timestamp.Foo': '[Today at] LT',
-      };
-    `,
-  };
-
-  const translatable = run(files, ['--json', 'out.json']);
-  assert.equal(translatable.status, 0, translatable.stderr);
-  assert.deepEqual(JSON.parse(translatable.read('out.json')), { 'widget.close.label': 'Close' });
-  assert.match(translatable.stdout, /excluded 1 formatter expressions \(timestamp\., duration\.\)/);
-  assert.match(translatable.stdout, /1 of them do carry English copy/);
-  // The excluded keys are named, not just counted — a translator working from the JSON export
-  // never sees them otherwise.
-  assert.match(translatable.stdout, /^ {4}timestamp\.Foo$/m);
-
-  const all = run(files, ['--json', 'out.json', '--all']);
-  assert.equal(all.status, 0, all.stderr);
-  assert.deepEqual(JSON.parse(all.read('out.json')), {
-    'timestamp.Foo': '[Today at] LT',
-    'widget.close.label': 'Close',
-  });
-
-  const noPath = run(files, ['--json']);
-  assert.equal(noPath.status, 1);
-  assert.match(noPath.stderr, /--json requires an output path/);
-});
-
-test('--json reports English prose beside an interpolation, not just bracketed day words', () => {
-  // The real case is `timestamp.UserActivityStatus`: 'Last seen {{ timestamp | fromNowFormatter }}'.
-  // Its English sits outside the brackets, so a bracket-only check misses it and the string ships
-  // untranslated — invisible, because the key is excluded from the export a translator works from.
-  const files = {
-    'src/a.tsx': `t('widget.close.label', 'Close');\nt('timestamp.Seen', { t: 1 });\nt('timestamp.Plain', { t: 1 });\n`,
-    'src/i18n/runtimeDefaults.ts': `
-      export const runtimeDefaults = {
-        'timestamp.Seen': 'Last seen {{ timestamp | fromNowFormatter }}',
-        'timestamp.Plain': '{{ timestamp | timestampFormatter(format: LT) }}',
-      };
-    `,
-  };
-
-  const result = run(files, ['--json', 'out.json']);
-  assert.equal(result.status, 0, result.stderr);
-  assert.match(result.stdout, /1 of them do carry English copy/);
-  assert.match(result.stdout, /^ {4}timestamp\.Seen$/m);
-  // A pure formatter expression has no copy in it and must not be reported.
-  assert.doesNotMatch(result.stdout, /timestamp\.Plain/);
-});
diff --git a/package/src/components/ChannelDetails/__tests__/useFileAttachmentListSections.test.tsx b/package/src/components/ChannelDetails/__tests__/useFileAttachmentListSections.test.tsx
index 27280ca2e5..a37029ce2d 100644
--- a/package/src/components/ChannelDetails/__tests__/useFileAttachmentListSections.test.tsx
+++ b/package/src/components/ChannelDetails/__tests__/useFileAttachmentListSections.test.tsx
@@ -21,7 +21,7 @@ let translators: TranslationContextValue;
 
 beforeAll(async () => {
   const i18nInstance = new Streami18n();
-  translators = (await i18nInstance.getTranslators()) as unknown as TranslationContextValue;
+  translators = (await i18nInstance.init()) as unknown as TranslationContextValue;
 });
 
 const wrapper = ({ children }: PropsWithChildren) => (
diff --git a/package/src/components/ChannelDetails/__tests__/useUserActivityStatus.test.tsx b/package/src/components/ChannelDetails/__tests__/useUserActivityStatus.test.tsx
index fe23da39c4..e4f160ecfc 100644
--- a/package/src/components/ChannelDetails/__tests__/useUserActivityStatus.test.tsx
+++ b/package/src/components/ChannelDetails/__tests__/useUserActivityStatus.test.tsx
@@ -14,7 +14,7 @@ let translators: TranslationContextValue;
 
 beforeAll(async () => {
   const i18nInstance = new Streami18n();
-  translators = (await i18nInstance.getTranslators()) as unknown as TranslationContextValue;
+  translators = (await i18nInstance.init()) as unknown as TranslationContextValue;
 });
 
 const wrapper = ({ children }: PropsWithChildren) => (
diff --git a/package/src/components/ChannelDetails/components/__tests__/navigation-section/FileAttachmentList.test.tsx b/package/src/components/ChannelDetails/components/__tests__/navigation-section/FileAttachmentList.test.tsx
index d076564a5a..403b83b973 100644
--- a/package/src/components/ChannelDetails/components/__tests__/navigation-section/FileAttachmentList.test.tsx
+++ b/package/src/components/ChannelDetails/components/__tests__/navigation-section/FileAttachmentList.test.tsx
@@ -150,7 +150,7 @@ describe('FileAttachmentList', () => {
 
   beforeAll(async () => {
     const i18nInstance = new Streami18n();
-    realTranslators = (await i18nInstance.getTranslators()) as unknown as TranslationContextValue;
+    realTranslators = (await i18nInstance.init()) as unknown as TranslationContextValue;
   });
 
   beforeEach(() => {
diff --git a/package/src/components/ChannelDetails/hooks/useFileAttachmentListSections.ts b/package/src/components/ChannelDetails/hooks/useFileAttachmentListSections.ts
index a1a03ffc0b..f8105020f7 100644
--- a/package/src/components/ChannelDetails/hooks/useFileAttachmentListSections.ts
+++ b/package/src/components/ChannelDetails/hooks/useFileAttachmentListSections.ts
@@ -9,7 +9,7 @@ import {
 } from 'stream-chat';
 
 import { useTranslationContext } from '../../../contexts/translationContext/TranslationContext';
-import { getDateString } from '../../../utils/i18n/getDateString';
+import { getDateString } from '../../../i18n/utils';
 
 /**
  * A single file/audio attachment paired with the message it belongs to. The file attachment list
@@ -60,7 +60,7 @@ export const useFileAttachmentListSections = (
         continue;
       }
       const formatted = getDateString({
-        date: message.created_at as string | Date | undefined,
+        messageCreatedAt: message.created_at as string | Date | undefined,
         t,
         tDateTimeParser,
         timestampTranslationKey: 'timestamp.FileAttachmentListSection',
diff --git a/package/src/components/ChannelDetails/hooks/useUserActivityStatus.ts b/package/src/components/ChannelDetails/hooks/useUserActivityStatus.ts
index ec444a99fa..01c8536d0f 100644
--- a/package/src/components/ChannelDetails/hooks/useUserActivityStatus.ts
+++ b/package/src/components/ChannelDetails/hooks/useUserActivityStatus.ts
@@ -3,7 +3,7 @@ import { useMemo } from 'react';
 import type { UserResponse } from 'stream-chat';
 
 import { useTranslationContext } from '../../../contexts/translationContext/TranslationContext';
-import { getDateString } from '../../../utils/i18n/getDateString';
+import { getDateString } from '../../../i18n/utils';
 
 /**
  * Returns the localized presence status string for a user:
@@ -23,7 +23,7 @@ export const useUserActivityStatus = (user?: UserResponse): string => {
 
     if (user?.last_active) {
       const lastSeen = getDateString({
-        date: user.last_active,
+        messageCreatedAt: user.last_active,
         t,
         tDateTimeParser,
         timestampTranslationKey: 'timestamp.UserActivityStatus',
diff --git a/package/src/components/ChannelPreview/ChannelPreviewStatus.tsx b/package/src/components/ChannelPreview/ChannelPreviewStatus.tsx
index 3099d4e187..6ebdf242cf 100644
--- a/package/src/components/ChannelPreview/ChannelPreviewStatus.tsx
+++ b/package/src/components/ChannelPreview/ChannelPreviewStatus.tsx
@@ -8,8 +8,8 @@ import { useA11yLabel } from '../../a11y/hooks/useA11yLabel';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useTranslationContext } from '../../contexts/translationContext/TranslationContext';
 
+import { getCalendarDateStringForA11y, getDateString } from '../../i18n/utils';
 import { primitives } from '../../theme';
-import { getDateString, getDateStringForA11y } from '../../utils/i18n/getDateString';
 
 export type ChannelPreviewStatusProps = Pick<
   ChannelPreviewViewPropsWithContext,
@@ -28,7 +28,7 @@ export const ChannelPreviewStatus = (props: ChannelPreviewStatusProps) => {
   const formattedDate = useMemo(
     () =>
       getDateString({
-        date: created_at,
+        messageCreatedAt: created_at,
         t,
         tDateTimeParser,
         timestampTranslationKey: 'timestamp.ChannelPreviewStatus',
@@ -38,9 +38,9 @@ export const ChannelPreviewStatus = (props: ChannelPreviewStatusProps) => {
 
   const a11yDate = useMemo(
     () =>
-      getDateStringForA11y({
+      getCalendarDateStringForA11y({
         calendarFormatOverrides: { sameDay: 'LT' },
-        date: created_at,
+        messageCreatedAt: created_at,
         tDateTimeParser,
         userLanguage,
       }),
diff --git a/package/src/components/Chat/__tests__/Chat.test.tsx b/package/src/components/Chat/__tests__/Chat.test.tsx
index 9bd8c63d10..c4e2d308f9 100644
--- a/package/src/components/Chat/__tests__/Chat.test.tsx
+++ b/package/src/components/Chat/__tests__/Chat.test.tsx
@@ -166,10 +166,14 @@ describe('TranslationContext', () => {
   it('uses the i18nInstance provided in props', async () => {
     let context: TranslationContextValue = {} as TranslationContextValue;
     const i18nInstance = new Streami18n();
-    const { t, tDateTimeParser } = await i18nInstance.getTranslators();
+    const { t, tDateTimeParser } = await i18nInstance.init();
 
-    i18nInstance.t = (() => 't') as typeof i18nInstance.t;
-    i18nInstance.tDateTimeParser = (() => 'tDateTimeParser') as typeof i18nInstance.tDateTimeParser;
+    // `t` and `tDateTimeParser` are getters over the state store now, so the sentinels go in through
+    // the store rather than being assigned onto the instance.
+    i18nInstance.state.partialNext({
+      t: (() => 't') as typeof i18nInstance.t,
+      tDateTimeParser: (() => 'tDateTimeParser') as typeof i18nInstance.tDateTimeParser,
+    });
 
     render(
       <Chat client={chatClient} i18nInstance={i18nInstance}>
@@ -193,8 +197,12 @@ describe('TranslationContext', () => {
     let context: TranslationContextValue = {} as TranslationContextValue;
     const i18nInstance = new Streami18n();
 
-    i18nInstance.t = (() => 't') as typeof i18nInstance.t;
-    i18nInstance.tDateTimeParser = (() => 'tDateTimeParser') as typeof i18nInstance.tDateTimeParser;
+    // `t` and `tDateTimeParser` are getters over the state store now, so the sentinels go in through
+    // the store rather than being assigned onto the instance.
+    i18nInstance.state.partialNext({
+      t: (() => 't') as typeof i18nInstance.t,
+      tDateTimeParser: (() => 'tDateTimeParser') as typeof i18nInstance.tDateTimeParser,
+    });
 
     const { rerender } = render(
       <Chat client={chatClient} i18nInstance={i18nInstance}>
@@ -213,9 +221,10 @@ describe('TranslationContext', () => {
 
     const newI18nInstance = new Streami18n();
 
-    newI18nInstance.t = (() => 'newT') as typeof newI18nInstance.t;
-    newI18nInstance.tDateTimeParser = (() =>
-      'newtDateTimeParser') as typeof newI18nInstance.tDateTimeParser;
+    newI18nInstance.state.partialNext({
+      t: (() => 'newT') as typeof newI18nInstance.t,
+      tDateTimeParser: (() => 'newtDateTimeParser') as typeof newI18nInstance.tDateTimeParser,
+    });
 
     rerender(
       <Chat client={chatClient} i18nInstance={newI18nInstance}>
diff --git a/package/src/components/ImageGallery/components/ImageGalleryHeader.tsx b/package/src/components/ImageGallery/components/ImageGalleryHeader.tsx
index db54d6f988..6417697e8a 100644
--- a/package/src/components/ImageGallery/components/ImageGalleryHeader.tsx
+++ b/package/src/components/ImageGallery/components/ImageGalleryHeader.tsx
@@ -14,9 +14,9 @@ import { useTheme } from '../../../contexts/themeContext/ThemeContext';
 import { useTranslationContext } from '../../../contexts/translationContext/TranslationContext';
 import { useStateStore } from '../../../hooks/useStateStore';
 
+import { getDateString } from '../../../i18n/utils';
 import { ImageGalleryState } from '../../../state-store/image-gallery-state-store';
 import { primitives } from '../../../theme';
-import { getDateString } from '../../../utils/i18n/getDateString';
 import { Button } from '../../ui/Button/Button';
 
 const imageGallerySelector = (state: ImageGalleryState) => ({
@@ -37,7 +37,7 @@ export const ImageGalleryHeader = (props: ImageGalleryHeaderProps) => {
   const date = useMemo(
     () =>
       getDateString({
-        date: asset?.created_at,
+        messageCreatedAt: asset?.created_at,
         t,
         tDateTimeParser,
         timestampTranslationKey: 'timestamp.ImageGalleryHeader',
diff --git a/package/src/components/Message/MessageItemView/MessageTimestamp.tsx b/package/src/components/Message/MessageItemView/MessageTimestamp.tsx
index ffdcb4ed24..3828960b2c 100644
--- a/package/src/components/Message/MessageItemView/MessageTimestamp.tsx
+++ b/package/src/components/Message/MessageItemView/MessageTimestamp.tsx
@@ -6,8 +6,8 @@ import {
   TranslationContextValue,
   useTranslationContext,
 } from '../../../contexts/translationContext/TranslationContext';
+import { getDateString } from '../../../i18n/utils';
 import { primitives } from '../../../theme';
-import { getDateString } from '../../../utils/i18n/getDateString';
 import { useShouldUseOverlayStyles } from '../hooks/useShouldUseOverlayStyles';
 
 export type MessageTimestampProps = Partial<Pick<TranslationContextValue, 'tDateTimeParser'>> & {
@@ -39,7 +39,7 @@ export const MessageTimestamp = (props: MessageTimestampProps) => {
   const dateString = useMemo(
     () =>
       getDateString({
-        date: timestamp,
+        messageCreatedAt: timestamp,
         t,
         tDateTimeParser,
         timestampTranslationKey,
diff --git a/package/src/components/MessageList/InlineDateSeparator.tsx b/package/src/components/MessageList/InlineDateSeparator.tsx
index 0297d5d506..5e04284cea 100644
--- a/package/src/components/MessageList/InlineDateSeparator.tsx
+++ b/package/src/components/MessageList/InlineDateSeparator.tsx
@@ -3,8 +3,8 @@ import { StyleSheet, Text, View } from 'react-native';
 
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useTranslationContext } from '../../contexts/translationContext/TranslationContext';
+import { getCalendarDateStringForA11y, getDateString } from '../../i18n/utils';
 import { primitives } from '../../theme';
-import { getDateString, getDateStringForA11y } from '../../utils/i18n/getDateString';
 
 /**
  * Props for the `InlineDateSeparator` component.
@@ -23,7 +23,7 @@ export const InlineDateSeparator = ({ date }: InlineDateSeparatorProps) => {
   const dateString = useMemo(
     () =>
       getDateString({
-        date,
+        messageCreatedAt: date,
         t,
         tDateTimeParser,
         timestampTranslationKey: 'timestamp.InlineDateSeparator',
@@ -32,7 +32,7 @@ export const InlineDateSeparator = ({ date }: InlineDateSeparatorProps) => {
   );
 
   const a11yDateString = useMemo(
-    () => getDateStringForA11y({ date, tDateTimeParser, userLanguage }),
+    () => getCalendarDateStringForA11y({ messageCreatedAt: date, tDateTimeParser, userLanguage }),
     [date, tDateTimeParser, userLanguage],
   );
 
diff --git a/package/src/components/MessageList/MessageSystem.tsx b/package/src/components/MessageList/MessageSystem.tsx
index 815e9e57be..3e5161e709 100644
--- a/package/src/components/MessageList/MessageSystem.tsx
+++ b/package/src/components/MessageList/MessageSystem.tsx
@@ -6,8 +6,8 @@ import { LocalMessage } from 'stream-chat';
 import { useTheme } from '../../contexts/themeContext/ThemeContext';
 import { useTranslationContext } from '../../contexts/translationContext/TranslationContext';
 
+import { getDateString } from '../../i18n/utils';
 import { primitives } from '../../theme';
-import { getDateString } from '../../utils/i18n/getDateString';
 
 export type MessageSystemProps = {
   /** Current [message object](https://getstream.io/chat/docs/#message_format) */
@@ -44,7 +44,7 @@ export const MessageSystem = (props: MessageSystemProps) => {
   const formattedDate = useMemo(
     () =>
       getDateString({
-        date: createdAt,
+        messageCreatedAt: createdAt,
         t,
         tDateTimeParser,
         timestampTranslationKey: 'timestamp.MessageSystem',
diff --git a/package/src/components/MessageList/StickyHeader.tsx b/package/src/components/MessageList/StickyHeader.tsx
index 9f31d6c14d..76044139da 100644
--- a/package/src/components/MessageList/StickyHeader.tsx
+++ b/package/src/components/MessageList/StickyHeader.tsx
@@ -3,7 +3,7 @@ import React, { useMemo } from 'react';
 import { useComponentsContext } from '../../contexts/componentsContext/ComponentsContext';
 import { useTranslationContext } from '../../contexts/translationContext/TranslationContext';
 
-import { getDateString } from '../../utils/i18n/getDateString';
+import { getDateString } from '../../i18n/utils';
 
 /**
  * Props for the StickyHeader component.
@@ -29,7 +29,7 @@ export const StickyHeader = ({ date, dateString }: StickyHeaderProps) => {
     }
 
     return getDateString({
-      date,
+      messageCreatedAt: date,
       t,
       tDateTimeParser,
       timestampTranslationKey: 'timestamp.StickyHeader',
@@ -41,5 +41,5 @@ export const StickyHeader = ({ date, dateString }: StickyHeaderProps) => {
     return null;
   }
 
-  return <DateHeader dateString={stickyHeaderDateString} />;
+  return <DateHeader dateString={stickyHeaderDateString ?? undefined} />;
 };
diff --git a/package/src/components/MessageList/__tests__/MessageSystem.test.tsx b/package/src/components/MessageList/__tests__/MessageSystem.test.tsx
index da2a6a20a2..a83ca012e8 100644
--- a/package/src/components/MessageList/__tests__/MessageSystem.test.tsx
+++ b/package/src/components/MessageList/__tests__/MessageSystem.test.tsx
@@ -22,7 +22,7 @@ describe('MessageSystem', () => {
   afterEach(cleanup);
 
   it('should render the message system', async () => {
-    const translators = await i18nInstance.getTranslators();
+    const translators = await i18nInstance.init();
     const message = generateMessage();
     const { queryByTestId } = render(
       <ThemeProvider
@@ -42,7 +42,7 @@ describe('MessageSystem', () => {
   });
 
   it('should match the snapshot for message system', async () => {
-    const translators = await i18nInstance.getTranslators();
+    const translators = await i18nInstance.init();
     const user = generateStaticUser(0);
     const message = generateStaticMessage('Hello World', { user });
     render(
diff --git a/package/src/components/MessageList/__tests__/ScrollToBottomButton.test.tsx b/package/src/components/MessageList/__tests__/ScrollToBottomButton.test.tsx
index 48484cd03c..2177c17362 100644
--- a/package/src/components/MessageList/__tests__/ScrollToBottomButton.test.tsx
+++ b/package/src/components/MessageList/__tests__/ScrollToBottomButton.test.tsx
@@ -22,10 +22,10 @@ describe('ScrollToBottomButton', () => {
 
   it('should render nothing if showNotification is false', async () => {
     const i18nInstance = new Streami18n();
-    const translators = await i18nInstance.getTranslators();
+    const translators = await i18nInstance.init();
     const { queryByTestId } = render(
       <ThemeProvider>
-        <TranslationProvider value={translators as TranslationContextValue}>
+        <TranslationProvider value={{ ...translators, userLanguage: 'en' }}>
           <ScrollToBottomButton onPress={() => null} showNotification={false} />
         </TranslationProvider>
       </ThemeProvider>,
@@ -38,10 +38,10 @@ describe('ScrollToBottomButton', () => {
 
   it('should render if showNotification is true', async () => {
     const i18nInstance = new Streami18n();
-    const translators = await i18nInstance.getTranslators();
+    const translators = await i18nInstance.init();
     const { queryByTestId } = render(
       <ThemeProvider>
-        <TranslationProvider value={translators as TranslationContextValue}>
+        <TranslationProvider value={{ ...translators, userLanguage: 'en' }}>
           <ScrollToBottomButton onPress={() => null} showNotification={true} />
         </TranslationProvider>
       </ThemeProvider>,
@@ -54,11 +54,11 @@ describe('ScrollToBottomButton', () => {
 
   it('should trigger onPress when pressed', async () => {
     const i18nInstance = new Streami18n();
-    const translators = await i18nInstance.getTranslators();
+    const translators = await i18nInstance.init();
     const onPress = jest.fn();
     const { getByTestId } = render(
       <ThemeProvider>
-        <TranslationProvider value={translators as TranslationContextValue}>
+        <TranslationProvider value={{ ...translators, userLanguage: 'en' }}>
           <ScrollToBottomButton onPress={onPress} showNotification={true} />
         </TranslationProvider>
       </ThemeProvider>,
@@ -70,7 +70,7 @@ describe('ScrollToBottomButton', () => {
   it('should display the unread count', async () => {
     const t = jest.fn((key: string, d?: unknown) => (typeof d === 'string' ? d : key));
     const i18nInstance = new Streami18n();
-    const translators = await i18nInstance.getTranslators();
+    const translators = await i18nInstance.init();
     // The button reads OUR user's count from the channel read store (see ScrollToBottomButton),
     // keyed by the chat client's userID. Provide a minimal fake client + channel read store
     // reporting 3 unread for that user. Hand-rolled to avoid a runtime `stream-chat` import (which
@@ -113,10 +113,10 @@ describe('ScrollToBottomButton', () => {
 
   it('should render the message notification and match snapshot', async () => {
     const i18nInstance = new Streami18n();
-    const translators = await i18nInstance.getTranslators();
+    const translators = await i18nInstance.init();
     const { toJSON } = render(
       <ThemeProvider>
-        <TranslationProvider value={translators as TranslationContextValue}>
+        <TranslationProvider value={{ ...translators, userLanguage: 'en' }}>
           <ScrollToBottomButton onPress={() => null} showNotification={true} />
         </TranslationProvider>
       </ThemeProvider>,
diff --git a/package/src/components/Notifications/notificationTranslations.ts b/package/src/components/Notifications/notificationTranslations.ts
index 0ab00ce3ef..d6eb272b27 100644
--- a/package/src/components/Notifications/notificationTranslations.ts
+++ b/package/src/components/Notifications/notificationTranslations.ts
@@ -1,9 +1,14 @@
-import type { Notification } from 'stream-chat';
+import { CORE_NOTIFICATION_TYPE } from 'stream-chat';
+import type { CoreNotificationType, Notification } from 'stream-chat';
 
-import { translateExternalString } from '../../i18n/externalStrings';
 import type { StreamTFunction } from '../../i18n/types';
 import { asDynamicKey } from '../../i18n/utils';
 
+type NotificationTranslator = (options: {
+  notification: Notification;
+  t: StreamTFunction;
+}) => string;
+
 const normalizeReason = (notification?: Notification) => {
   const reason = notification?.metadata?.reason;
   if (typeof reason !== 'string' || !reason.length) return undefined;
@@ -110,51 +115,79 @@ const translateCommandDisabled = ({
     );
   }
 
-  if (reason === 'quoted_message') {
+  // `stream-chat` emits `'replying'`. This branch read `'quoted_message'` and so never matched, which
+  // meant the reply case fell through and rendered core's untranslated English instead.
+  if (reason === 'replying') {
     return t(
       'notifications.commandUnavailable.whileReplying.error',
       'Command not available while replying',
     );
   }
 
-  return t(asDynamicKey(notification?.message || 'notifications.commandUnavailable.error'));
+  return t('notifications.commandUnavailable.error', 'Command not available');
 };
 
-const notificationTranslatorsByType: Record<
-  string,
-  (options: { notification: Notification; t: StreamTFunction }) => string
-> = {
-  'api:attachment:upload:failed': translateAttachmentUploadFailed,
-  'api:location:create:failed': ({ t }) =>
-    t('notifications.locationShareFailed.error', 'Failed to share location'),
-  'api:location:share:failed': ({ t }) =>
-    t('notifications.locationShareFailed.error', 'Failed to share location'),
-  'api:poll:create:failed': translatePollCreateFailed,
-  'api:poll:end:failed': translatePollEndFailed,
-  'api:poll:end:success': ({ t }) => t('notifications.pollEnded.text', 'Poll ended'),
-  'api:reply:search:failed': ({ t }) =>
-    t('notifications.threadNotFound.error', 'Thread has not been found'),
-  'browser:audio:playback:error': ({ notification, t }) =>
-    notification.message
-      ? translateExternalString(t, notification.message)
-      : t('notifications.recordingPlaybackFailed.error', 'Error reproducing the recording'),
-  'browser:location:get:failed': ({ t }) =>
-    t('notifications.locationRetrieveFailed.error', 'Failed to retrieve location'),
-  'channel:jumpToFirstUnread:failed': ({ t }) =>
-    t('channel.jumpToFirstUnreadFailed.error', 'Failed to jump to the first unread message'),
-  'validation:attachment:file:missing': ({ t }) =>
+/**
+ * A translator for every notification `stream-chat` itself emits.
+ *
+ * `Record<CoreNotificationType, …>` is the point: a new identifier in core fails to compile here until
+ * it is mapped, and an entry for one that no longer exists is rejected. Before core exported the union,
+ * this table and the React SDK's equivalent were hand-maintained copies of each other, and both had
+ * drifted — carrying entries nothing emits while missing identifiers that fell through to untranslated
+ * English.
+ *
+ * The key *names* stay this SDK's own. They have shipped, integrators' dictionaries are keyed on them,
+ * and `build-translations` reads the literal string at the call site — a key resolved from a map would
+ * be invisible to the generator and so would never reach the catalog.
+ */
+const coreNotificationTranslators: Record<CoreNotificationType, NotificationTranslator> = {
+  [CORE_NOTIFICATION_TYPE.attachmentFileMissing]: ({ t }) =>
     t('notifications.attachmentFileMissing.error', 'File is required for upload attachment'),
-  'validation:attachment:id:missing': ({ t }) =>
+  [CORE_NOTIFICATION_TYPE.attachmentIdMissing]: ({ t }) =>
     t('notifications.attachmentIdMissing.error', 'Local upload attachment missing local id'),
-  'validation:attachment:upload:blocked': translateAttachmentUploadBlocked,
-  'validation:attachment:upload:in-progress': ({ t }) =>
+  [CORE_NOTIFICATION_TYPE.attachmentUploadBlocked]: translateAttachmentUploadBlocked,
+  [CORE_NOTIFICATION_TYPE.attachmentUploadFailed]: translateAttachmentUploadFailed,
+  [CORE_NOTIFICATION_TYPE.attachmentUploadInProgress]: ({ t }) =>
     t('notifications.attachmentUploadInProgress.error', 'Wait until all attachments have uploaded'),
-  'validation:command:disabled': translateCommandDisabled,
-  'validation:poll:castVote:limit': ({ t }) =>
+  [CORE_NOTIFICATION_TYPE.commandDisabled]: translateCommandDisabled,
+  // The three below were unmapped, so they rendered untranslated English from `notification.message`.
+  [CORE_NOTIFICATION_TYPE.commandNotReady]: ({ t }) =>
+    t('notifications.commandNotReady.error', 'Command not ready to be sent'),
+  [CORE_NOTIFICATION_TYPE.locationCreateFailed]: ({ t }) =>
+    t('notifications.locationShareFailed.error', 'Failed to share location'),
+  [CORE_NOTIFICATION_TYPE.messageJumpFailed]: ({ t }) =>
+    t('notifications.messageJumpFailed.error', 'Failed to jump to the message'),
+  [CORE_NOTIFICATION_TYPE.messageJumpToLatestFailed]: ({ t }) =>
+    t('notifications.messageJumpToLatestFailed.error', 'Failed to jump to the latest message'),
+  [CORE_NOTIFICATION_TYPE.pollCastVoteLimit]: ({ t }) =>
     t(
       'notifications.voteLimitReached.error',
       'Reached the vote limit. Remove an existing vote first.',
     ),
+  [CORE_NOTIFICATION_TYPE.pollCreateFailed]: translatePollCreateFailed,
+};
+
+/**
+ * Translators for notifications this SDK emits itself, which core knows nothing about.
+ *
+ * Deliberately not exhaustiveness-checked — there is no union to check against — so keep it to
+ * identifiers that are actually emitted. `api:reply:search:failed`, `api:location:share:failed` and
+ * `browser:location:get:failed` were removed: all three were copied over from the React SDK and none is
+ * emitted here.
+ */
+const sdkNotificationTranslators: Record<string, NotificationTranslator> = {
+  'api:poll:end:failed': translatePollEndFailed,
+  'api:poll:end:success': ({ t }) => t('notifications.pollEnded.text', 'Poll ended'),
+  'browser:audio:playback:error': ({ notification, t }) =>
+    notification.message ||
+    t('notifications.recordingPlaybackFailed.error', 'Error reproducing the recording'),
+  'channel:jumpToFirstUnread:failed': ({ t }) =>
+    t('channel.jumpToFirstUnreadFailed.error', 'Failed to jump to the first unread message'),
+};
+
+const notificationTranslatorsByType: Record<string, NotificationTranslator> = {
+  ...coreNotificationTranslators,
+  ...sdkNotificationTranslators,
 };
 
 export const getNotificationDisplayMessage = ({
@@ -168,9 +201,9 @@ export const getNotificationDisplayMessage = ({
     ? notificationTranslatorsByType[notification.type]
     : undefined;
 
-  // `notification.message` can be English emitted by `stream-chat`; the map resolves the ones
-  // we recognise and passes anything else through unchanged.
-  return translator
-    ? translator({ notification, t })
-    : translateExternalString(t, notification.message);
+  // An unrecognized identifier renders `message` verbatim. It is untranslated English, but a newer
+  // core — or an integrator emitting its own identifier — must not produce an empty toast. This used
+  // to run the message through a table of English sentences, which is the mechanism core's `type`
+  // replaced: matching on prose went stale silently on every core upgrade.
+  return translator ? translator({ notification, t }) : notification.message;
 };
diff --git a/package/src/components/Poll/components/CreatePollOptions.tsx b/package/src/components/Poll/components/CreatePollOptions.tsx
index bd06f2ae3f..4d5df75abe 100644
--- a/package/src/components/Poll/components/CreatePollOptions.tsx
+++ b/package/src/components/Poll/components/CreatePollOptions.tsx
@@ -23,13 +23,13 @@ import Animated, {
   withSpring,
 } from 'react-native-reanimated';
 
-import { PollComposerOption, PollComposerState } from 'stream-chat';
+import { POLL_COMPOSER_VALIDATION_CODE, PollComposerOption, PollComposerState } from 'stream-chat';
+import type { PollComposerValidationCode, PollComposerValidationError } from 'stream-chat';
 
 import { useCreatePollContentContext, useTheme, useTranslationContext } from '../../../contexts';
 import { useComponentsContext } from '../../../contexts/componentsContext/ComponentsContext';
 import { useMessageComposer } from '../../../contexts/messageInputContext/hooks/useMessageComposer';
 import { useStateStore } from '../../../hooks/useStateStore';
-import { translateExternalString } from '../../../i18n/externalStrings';
 import { primitives } from '../../../theme';
 
 export type CurrentOptionPositionsCache = {
@@ -50,7 +50,7 @@ export type CreatePollOptionType = {
   optionsCount: number;
   currentOptionPositions: SharedValue<CurrentOptionPositionsCache>;
   draggedItemId: SharedValue<string | null>;
-  error?: string;
+  error?: PollComposerValidationError;
   handleChangeText: (newText: string, index: number) => void;
   handleBlur: () => void;
   index: number;
@@ -287,6 +287,23 @@ export const CreatePollOption = ({
   const { t } = useTranslationContext();
   const { icons } = useComponentsContext();
   const { createPollOptionGap = 8 } = useCreatePollContentContext();
+
+  // Keyed on `stream-chat`'s stable validation code. This used to match on the English sentence the
+  // composer returned, which meant a reworded message in a `stream-chat` patch silently stopped
+  // translating. `error.message` remains the fallback so an unrecognized code renders readable text.
+  const knownValidationErrors = useMemo<Partial<Record<PollComposerValidationCode, string>>>(
+    () => ({
+      [POLL_COMPOSER_VALIDATION_CODE.optionDuplicate]: t(
+        'poll.createPoll.options.duplicate.error',
+        'Option already exists',
+      ),
+      [POLL_COMPOSER_VALIDATION_CODE.optionEmpty]: t(
+        'poll.createPoll.options.empty.error',
+        'Option is empty',
+      ),
+    }),
+    [t],
+  );
   const normalizedCreatePollOptionGap =
     Number.isFinite(createPollOptionGap) && createPollOptionGap > 0 ? createPollOptionGap : 0;
   const initialTop =
@@ -533,7 +550,7 @@ export const CreatePollOption = ({
         >
           <icons.InfoTooltip height={20} width={20} fill={semantics.accentError} />
           <Text style={[styles.optionValidationError, optionStyle.validationErrorText]}>
-            {translateExternalString(t, error)}
+            {knownValidationErrors[error.code] ?? error.message}
           </Text>
         </View>
       ) : null}
diff --git a/package/src/components/Poll/components/PollAnswersList.tsx b/package/src/components/Poll/components/PollAnswersList.tsx
index d107503143..472afd3910 100644
--- a/package/src/components/Poll/components/PollAnswersList.tsx
+++ b/package/src/components/Poll/components/PollAnswersList.tsx
@@ -15,8 +15,8 @@ import {
   useTranslationContext,
 } from '../../../contexts';
 import { useComponentsContext } from '../../../contexts/componentsContext/ComponentsContext';
+import { getDateString } from '../../../i18n/utils';
 import { primitives } from '../../../theme';
-import { getDateString } from '../../../utils/i18n/getDateString';
 import { Button } from '../../ui';
 import { UserAvatar } from '../../ui/Avatar/UserAvatar';
 import { usePollAnswersPagination } from '../hooks/usePollAnswersPagination';
@@ -88,7 +88,7 @@ export const PollAnswerListItem = ({ answer }: { answer: PollVoteResponseData })
   const dateString = useMemo(
     () =>
       getDateString({
-        date: answer.updated_at,
+        messageCreatedAt: answer.updated_at,
         t,
         tDateTimeParser,
         timestampTranslationKey: 'timestamp.PollVote',
diff --git a/package/src/components/Poll/components/PollResults/PollVote.tsx b/package/src/components/Poll/components/PollResults/PollVote.tsx
index 96892dd22f..3241e5461c 100644
--- a/package/src/components/Poll/components/PollResults/PollVote.tsx
+++ b/package/src/components/Poll/components/PollResults/PollVote.tsx
@@ -5,8 +5,8 @@ import { StyleSheet, Text, View } from 'react-native';
 import { PollVoteResponseData as PollVoteClass, VotingVisibility } from 'stream-chat';
 
 import { useTheme, useTranslationContext } from '../../../../contexts';
+import { getDateString } from '../../../../i18n/utils';
 import { primitives } from '../../../../theme';
-import { getDateString } from '../../../../utils/i18n/getDateString';
 import { UserAvatar } from '../../../ui/Avatar/UserAvatar';
 
 import { usePollState } from '../../hooks/usePollState';
@@ -28,7 +28,7 @@ export const PollVote = ({ vote }: { vote: PollVoteClass }) => {
   const dateString = useMemo(
     () =>
       getDateString({
-        date: vote.created_at,
+        messageCreatedAt: vote.created_at,
         t,
         tDateTimeParser,
         timestampTranslationKey: 'timestamp.PollVote',
diff --git a/package/src/components/ThreadList/ThreadListItem.tsx b/package/src/components/ThreadList/ThreadListItem.tsx
index f3cde1ec18..97135486dd 100644
--- a/package/src/components/ThreadList/ThreadListItem.tsx
+++ b/package/src/components/ThreadList/ThreadListItem.tsx
@@ -18,8 +18,8 @@ import {
 } from '../../contexts/threadsContext/ThreadListItemContext';
 import { useThreadsContext } from '../../contexts/threadsContext/ThreadsContext';
 import { useStateStore } from '../../hooks';
+import { getDateString } from '../../i18n/utils';
 import { primitives } from '../../theme';
-import { getDateString } from '../../utils/i18n/getDateString';
 import { useChannelPreviewDisplayPresence } from '../ChannelPreview/hooks';
 import { useChannelPreviewDisplayName } from '../ChannelPreview/hooks/useChannelPreviewDisplayName';
 import { BadgeNotification, UserAvatarStack } from '../ui';
@@ -202,7 +202,7 @@ export const ThreadListItem = (props: ThreadListItemProps) => {
   const dateString = useMemo(
     () =>
       getDateString({
-        date: timestamp,
+        messageCreatedAt: timestamp,
         t,
         tDateTimeParser,
         timestampTranslationKey,
@@ -212,7 +212,7 @@ export const ThreadListItem = (props: ThreadListItemProps) => {
   const deletedAtDateString = useMemo(
     () =>
       getDateString({
-        date: deletedAt as Date | undefined,
+        messageCreatedAt: deletedAt as Date | undefined,
         t,
         tDateTimeParser,
         timestampTranslationKey,
@@ -224,8 +224,9 @@ export const ThreadListItem = (props: ThreadListItemProps) => {
     <ThreadListItemProvider
       value={{
         channel,
-        dateString,
-        deletedAtDateString,
+        // `getDateString` returns `null` for "nothing renderable"; the context takes `undefined`.
+        dateString: dateString ?? undefined,
+        deletedAtDateString: deletedAtDateString ?? undefined,
         draftMessage,
         lastReply,
         ownUnreadMessageCount,
diff --git a/package/src/contexts/translationContext/TranslationContext.tsx b/package/src/contexts/translationContext/TranslationContext.tsx
index 5cc0ea46f4..8e9badd783 100644
--- a/package/src/contexts/translationContext/TranslationContext.tsx
+++ b/package/src/contexts/translationContext/TranslationContext.tsx
@@ -1,10 +1,8 @@
 import React, { useContext } from 'react';
 
-import Dayjs from 'dayjs';
-
 import { TranslatorFunctions } from './types';
 
-import { defaultTranslatorFunction } from '../../utils/i18n/Streami18n';
+import { defaultDateTimeParser, defaultTranslatorFunction } from '../../i18n/utils';
 import { isTestEnvironment } from '../utils/isTestEnvironment';
 
 export const DEFAULT_USER_LANGUAGE = 'en';
@@ -24,7 +22,7 @@ export type TranslationContextValue = TranslatorFunctions & {
 
 const defaultTranslationContextValue: TranslationContextValue = {
   t: defaultTranslatorFunction,
-  tDateTimeParser: (input) => Dayjs(input),
+  tDateTimeParser: defaultDateTimeParser,
   userLanguage: DEFAULT_USER_LANGUAGE,
 };
 
diff --git a/package/src/contexts/translationContext/index.ts b/package/src/contexts/translationContext/index.ts
index b43b713be8..76632fad4d 100644
--- a/package/src/contexts/translationContext/index.ts
+++ b/package/src/contexts/translationContext/index.ts
@@ -1,3 +1,2 @@
 export * from './TranslationContext';
 export * from './types';
-export * from './isDayOrMoment';
diff --git a/package/src/contexts/translationContext/isDayOrMoment.ts b/package/src/contexts/translationContext/isDayOrMoment.ts
deleted file mode 100644
index 766943ef98..0000000000
--- a/package/src/contexts/translationContext/isDayOrMoment.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import Dayjs from 'dayjs';
-
-import type { Moment } from 'moment-timezone';
-
-import { TDateTimeParserOutput } from './types';
-
-export const isDayOrMoment = (output: TDateTimeParserOutput): output is Dayjs.Dayjs | Moment =>
-  (output as Dayjs.Dayjs | Moment).isSame != null;
diff --git a/package/src/contexts/translationContext/types.ts b/package/src/contexts/translationContext/types.ts
index 4b8695aba4..ffd6a00845 100644
--- a/package/src/contexts/translationContext/types.ts
+++ b/package/src/contexts/translationContext/types.ts
@@ -1,14 +1,18 @@
-import Dayjs from 'dayjs';
-
-import type { Moment } from 'moment-timezone';
-
 import type { StreamTFunction } from '../../i18n/types';
 
-export type TDateTimeParserInput = string | number | Date;
-
-export type TDateTimeParserOutput = string | number | Date | Dayjs.Dayjs | Moment;
-
-export type TDateTimeParser = (input?: TDateTimeParserInput) => TDateTimeParserOutput;
+/**
+ * The date/time parser types come from `stream-chat/i18n`, shared with the React SDK.
+ *
+ * They used to be declared here, and `TDateTimeParserOutput` referenced `Moment` from
+ * `moment-timezone` — a *devDependency*, so the type leaked into the published `.d.ts` and failed to
+ * resolve for any consumer who had not separately installed it. Core's structural `DateTimeLike`
+ * covers a Dayjs or a Moment without depending on either.
+ */
+export type {
+  TDateTimeParser,
+  TDateTimeParserInput,
+  TDateTimeParserOutput,
+} from 'stream-chat/i18n';
 
 export type TranslatorFunctions = {
   /**
@@ -20,5 +24,5 @@ export type TranslatorFunctions = {
    * global and would force an integrator's own unrelated `t()` calls to satisfy our key union.
    */
   t: StreamTFunction;
-  tDateTimeParser: TDateTimeParser;
+  tDateTimeParser: import('stream-chat/i18n').TDateTimeParser;
 };
diff --git a/package/src/hooks/__tests__/useStreami18n.test.ts b/package/src/hooks/__tests__/useStreami18n.test.ts
new file mode 100644
index 0000000000..c1359525e9
--- /dev/null
+++ b/package/src/hooks/__tests__/useStreami18n.test.ts
@@ -0,0 +1,88 @@
+import { renderHook, waitFor } from '@testing-library/react-native';
+
+import { Streami18n } from '../../utils/i18n/Streami18n';
+import { useStreami18n } from '../useStreami18n';
+
+/**
+ * The instance-recognition contract.
+ *
+ * `messageInput.sendMessage.accessibilityLabel` is a *bundled* key -- it lives in `runtimeDefaults`
+ * with no inline default at its call site -- so it is called with the key alone, and it resolving to
+ * German is proof the registered dictionary survived rather than being swapped for a fresh instance.
+ *
+ * `instanceof` is not usable here — this repo carries several physical `stream-chat` copies under
+ * `nmHoistingLimits: workspaces`, and an integrator's app can resolve another — so recognition goes
+ * through a `Symbol.for` brand. What matters is that the brand is compared for *identity*: testing it
+ * for truthiness would admit any class with a static named `brand`, which then reaches `init()` and
+ * throws at render rather than falling back with a warning.
+ */
+describe('useStreami18n', () => {
+  let warn: jest.SpyInstance;
+
+  beforeEach(() => {
+    warn = jest.spyOn(console, 'warn').mockImplementation(() => {});
+  });
+
+  afterEach(() => {
+    warn.mockRestore();
+  });
+
+  it('keeps the instance it was given', async () => {
+    const i18n = new Streami18n({ language: 'de', logger: () => {} });
+    i18n.registerTranslation('de', {
+      'messageInput.sendMessage.accessibilityLabel': 'Nachricht senden',
+    });
+    await i18n.init();
+
+    const { result } = renderHook(() => useStreami18n(i18n));
+
+    await waitFor(() => {
+      expect(result.current.t('messageInput.sendMessage.accessibilityLabel')).toBe(
+        'Nachricht senden',
+      );
+    });
+    expect(warn).not.toHaveBeenCalled();
+  });
+
+  it('accepts an instance from another copy of the package', async () => {
+    const i18n = new Streami18n({ language: 'de', logger: () => {} });
+    i18n.registerTranslation('de', {
+      'messageInput.sendMessage.accessibilityLabel': 'Nachricht senden',
+    });
+    await i18n.init();
+
+    // A distinct constructor carrying the same registered brand — what a second `stream-chat` copy
+    // produces. `instanceof` would reject this and silently discard every registered dictionary.
+    //
+    // Only `constructor` is swapped, not the prototype: the instance has to keep its real methods,
+    // which is exactly the situation across two copies.
+    class OtherCopyStreami18n {
+      static readonly brand = Symbol.for('stream-chat.Streami18n');
+    }
+    Object.defineProperty(i18n, 'constructor', { value: OtherCopyStreami18n });
+
+    const { result } = renderHook(() => useStreami18n(i18n));
+
+    await waitFor(() => {
+      expect(result.current.t('messageInput.sendMessage.accessibilityLabel')).toBe(
+        'Nachricht senden',
+      );
+    });
+    expect(warn).not.toHaveBeenCalled();
+  });
+
+  it('rejects an unrelated class that happens to have a `brand` static, and warns', () => {
+    class NotStreami18n {
+      static readonly brand = 'some-other-library';
+    }
+
+    const { result } = renderHook(() =>
+      useStreami18n(new NotStreami18n() as unknown as Streami18n),
+    );
+
+    expect(warn).toHaveBeenCalledWith(expect.stringContaining('is not a Streami18n'));
+    // Fell back to a usable default rather than throwing on `.init()` / `.state`. A prose key renders
+    // its inline copy through the pre-init default translator, so this holds without waiting on init.
+    expect(result.current.t('channel.archived.text', 'Channel archived')).toBe('Channel archived');
+  });
+});
diff --git a/package/src/hooks/useStreami18n.ts b/package/src/hooks/useStreami18n.ts
index efccc93b21..dccc33f524 100644
--- a/package/src/hooks/useStreami18n.ts
+++ b/package/src/hooks/useStreami18n.ts
@@ -1,54 +1,63 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useMemo } from 'react';
 
-import Dayjs from 'dayjs';
+import type { Streami18nState } from 'stream-chat/i18n';
 
-import { useIsMountedRef } from './useIsMountedRef';
+import { useStateStore } from './useStateStore';
 
 import type { TranslatorFunctions } from '../contexts/translationContext/types';
-import { defaultTranslatorFunction, Streami18n } from '../utils/i18n/Streami18n';
-
-export const useStreami18n = (i18nInstance?: Streami18n) => {
-  const [translators, setTranslators] = useState<TranslatorFunctions>({
-    t: defaultTranslatorFunction,
-    tDateTimeParser: (input?: string | number | Date) => Dayjs(input),
-  });
-  const isMounted = useIsMountedRef();
+import type { BundledTranslationKey } from '../i18n/keys';
+import type { TranslationCatalog } from '../i18n/types';
+import { Streami18n } from '../utils/i18n/Streami18n';
+
+/**
+ * This SDK's instantiation of core's state shape.
+ *
+ * Spelled out rather than left to `Streami18nState`'s defaults: those default the catalog to
+ * `AnyTranslationCatalog`, and `t` is contravariant in its options, so the concrete store is not
+ * assignable to the default-parameterized one.
+ */
+type SDKStreami18nState = Streami18nState<TranslationCatalog, BundledTranslationKey>;
+
+/**
+ * Whether a value is a `Streami18n` from any copy of the package.
+ *
+ * `instanceof` is deliberately avoided. Under `nmHoistingLimits: workspaces` this repo carries several
+ * physical `stream-chat` copies, and an integrator's app can easily resolve another — in which case an
+ * `instanceof` check fails and the instance they configured is *silently discarded* for a fresh English
+ * default. Every registered dictionary, formatter and language goes with it, with no error anywhere. A
+ * branded static survives across copies, because `Symbol.for` returns the same symbol in every one.
+ *
+ * Compared against `Streami18n.brand` rather than tested for truthiness: `brand` is a common static
+ * name, and accepting any truthy one would let an unrelated class through to `init()` and throw at
+ * render instead of taking the warn-and-fall-back path below.
+ */
+const isStreami18n = (value: unknown): value is Streami18n =>
+  typeof value === 'object' &&
+  value !== null &&
+  (value.constructor as typeof Streami18n | undefined)?.brand === Streami18n.brand;
+
+/** Module-scope so the subscription is not torn down and rebuilt on every render. */
+const selector = ({ t, tDateTimeParser }: SDKStreami18nState) => ({ t, tDateTimeParser });
+
+export const useStreami18n = (i18nInstance?: Streami18n): TranslatorFunctions => {
+  const streami18n = useMemo(() => {
+    if (!i18nInstance) return new Streami18n();
+    if (isStreami18n(i18nInstance)) return i18nInstance;
+    // Loud, because the alternative is rendering English and looking fine.
+    console.warn(
+      'stream-chat-react-native: the value passed as `i18nInstance` is not a Streami18n, so it was ' +
+        'ignored and a default English instance is being used. If you did construct one, check for a ' +
+        'duplicate `stream-chat` in node_modules.',
+    );
+    return new Streami18n();
+  }, [i18nInstance]);
 
   useEffect(() => {
-    let streami18n: Streami18n;
-
-    if (i18nInstance instanceof Streami18n) {
-      streami18n = i18nInstance;
-    } else {
-      streami18n = new Streami18n({ language: 'en' });
-    }
-
-    const updateTFunction = (t: TranslatorFunctions['t']) => {
-      setTranslators((prevTranslator) => ({ ...prevTranslator, t }));
-    };
-
-    const { unsubscribe: unsubscribeOnLanguageChangeListener } =
-      streami18n.addOnLanguageChangeListener((t) => {
-        updateTFunction(t);
-      });
-
-    const { unsubscribe: unsubscribeOnTFuncOverrideListener } =
-      streami18n.addOnTFunctionOverrideListener((t) => {
-        updateTFunction(t);
-      });
-
-    streami18n.getTranslators().then((translator) => {
-      if (translator && isMounted.current) {
-        setTranslators(translator);
-      }
-    });
-
-    return () => {
-      unsubscribeOnTFuncOverrideListener();
-      unsubscribeOnLanguageChangeListener();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [i18nInstance]);
+    streami18n.init();
+  }, [streami18n]);
 
-  return translators;
+  // One subscription replaces the two listener registrations this used to make. `subscribe` fires
+  // synchronously with the current value, so whether this runs before or after `init()` the live `t`
+  // arrives -- which is what the queued-override handling existed to work around.
+  return useStateStore(streami18n.state, selector) as TranslatorFunctions;
 };
diff --git a/package/src/i18n/__tests__/catalog.fixture.json b/package/src/i18n/__tests__/catalog.fixture.json
index 18e72ff8ba..eb5208398e 100644
--- a/package/src/i18n/__tests__/catalog.fixture.json
+++ b/package/src/i18n/__tests__/catalog.fixture.json
@@ -325,19 +325,20 @@
   "notifications.attachmentUploadFailed.error": "Error uploading attachment",
   "notifications.attachmentUploadFailed.withReason.error": "Attachment upload failed due to {{reason}}",
   "notifications.attachmentUploadInProgress.error": "Wait until all attachments have uploaded",
+  "notifications.commandNotReady.error": "Command not ready to be sent",
   "notifications.commandUnavailable.error": "Command not available",
   "notifications.commandUnavailable.whileEditing.error": "Command not available while editing",
   "notifications.commandUnavailable.whileReplying.error": "Command not available while replying",
   "notifications.dismiss.accessibilityLabel": "Dismiss notification",
   "notifications.list.accessibilityLabel": "Notifications",
-  "notifications.locationRetrieveFailed.error": "Failed to retrieve location",
   "notifications.locationShareFailed.error": "Failed to share location",
+  "notifications.messageJumpFailed.error": "Failed to jump to the message",
+  "notifications.messageJumpToLatestFailed.error": "Failed to jump to the latest message",
   "notifications.pollCreateFailed.error": "Failed to create the poll",
   "notifications.pollCreateFailed.withReason.error": "Failed to create the poll due to {{reason}}",
   "notifications.pollEndFailed.withReason.error": "Failed to end the poll due to {{reason}}",
   "notifications.pollEnded.text": "Poll ended",
   "notifications.recordingPlaybackFailed.error": "Error reproducing the recording",
-  "notifications.threadNotFound.error": "Thread has not been found",
   "notifications.voteLimitReached.error": "Reached the vote limit. Remove an existing vote first.",
   "poll.addComment.description": "Add a comment to the poll",
   "poll.addComment.label": "Add a comment",
@@ -351,10 +352,10 @@
   "poll.createPoll.maxVotes.description": "Choose between 2–10 options",
   "poll.createPoll.maxVotes.increase.accessibilityLabel": "Increase maximum votes",
   "poll.createPoll.maxVotes.label": "Limit votes per person",
-  "poll.createPoll.maxVotes.range.error": "Type a number from 2 to 10",
   "poll.createPoll.multipleVotes.description": "Select more than one option",
   "poll.createPoll.multipleVotes.label": "Multiple votes",
   "poll.createPoll.options.duplicate.error": "Option already exists",
+  "poll.createPoll.options.empty.error": "Option is empty",
   "poll.createPoll.options.label": "Options",
   "poll.createPoll.options.placeholder": "Add an option",
   "poll.createPoll.question.label": "Questions",
@@ -400,7 +401,7 @@
   "timestamp.InlineDateSeparator": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp.MessageSystem": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp.MessageTimestamp": "{{ timestamp | timestampFormatter(format: LT) }}",
-  "timestamp.PollVote": "{{ timestamp | relativeCompactDateFormatter }}",
+  "timestamp.PollVote": "{{ timestamp | timestampFormatter(relativeCompact: true) }}",
   "timestamp.StickyHeader": "{{ timestamp | timestampFormatter(calendar: true) }}",
   "timestamp.ThreadListItem": "{{ timestamp | timestampFormatter(calendar: true; calendarFormats: {\"lastDay\":\"[Yesterday]\", \"lastWeek\":\"dddd\", \"nextDay\":\"[Tomorrow]\", \"nextWeek\":\"dddd [at] LT\", \"sameDay\":\"LT\", \"sameElse\":\"L\"}) }}",
   "timestamp.UserActivityStatus": "Last seen {{ timestamp | fromNowFormatter }}",
diff --git a/package/src/i18n/__tests__/catalogRenders.test.ts b/package/src/i18n/__tests__/catalogRenders.test.ts
index e2ab69a643..ad874af826 100644
--- a/package/src/i18n/__tests__/catalogRenders.test.ts
+++ b/package/src/i18n/__tests__/catalogRenders.test.ts
@@ -36,7 +36,7 @@ describe('every catalog key renders copy, never its own key path', () => {
   beforeAll(async () => {
     // Deliberately bare: no language, no dictionary, no overrides.
     const i18n = new Streami18n({ logger: () => {} });
-    ({ t } = await i18n.getTranslators());
+    ({ t } = await i18n.init());
   });
 
   const bases = new Set<string>();
diff --git a/package/src/i18n/__tests__/externalStrings.test.ts b/package/src/i18n/__tests__/externalStrings.test.ts
deleted file mode 100644
index 8e6f913cd3..0000000000
--- a/package/src/i18n/__tests__/externalStrings.test.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import catalogJson from './catalog.fixture.json';
-
-import { Streami18n } from '../../utils/i18n/Streami18n';
-import { EXTERNAL_STRING_KEYS, translateExternalString } from '../externalStrings';
-import type { TranslationDictionary } from '../types';
-
-/**
- * The seam for English that `stream-chat` emits.
- *
- * These strings reach `t()` as runtime values, so the extractor never sees them and they cannot be
- * renamed from this repo. Recognised ones resolve through a stable key; anything else has to pass
- * through verbatim, because the alternative is a blank notification when the LLC adds a message.
- */
-
-const catalog = catalogJson as Record<string, string>;
-
-describe('translateExternalString', () => {
-  let t: Streami18n['t'];
-
-  beforeAll(async () => {
-    const i18n = new Streami18n({ logger: () => {} });
-    ({ t } = await i18n.getTranslators());
-  });
-
-  it('maps a recognised LLC string onto its key', () => {
-    expect(translateExternalString(t, 'Option already exists')).toBe('Option already exists');
-  });
-
-  it('renders the registered translation for a mapped string', async () => {
-    const i18n = new Streami18n({ language: 'de', logger: () => {} });
-    i18n.registerTranslation('de', {
-      'poll.createPoll.options.duplicate.error': 'Option existiert bereits',
-    } as TranslationDictionary);
-    const { t: tDe } = await i18n.getTranslators();
-
-    expect(translateExternalString(tDe, 'Option already exists')).toBe('Option existiert bereits');
-  });
-
-  it('passes an unrecognised string through verbatim', () => {
-    const unknown = 'Some brand new message the LLC started sending';
-    expect(translateExternalString(t, unknown)).toBe(unknown);
-  });
-
-  it('returns an empty string for missing input', () => {
-    expect(translateExternalString(t, undefined)).toBe('');
-    expect(translateExternalString(t, '')).toBe('');
-  });
-
-  it('maps only onto keys that exist, with matching copy', () => {
-    // The generator enforces this too; asserting it here makes the failure legible when the copy
-    // and the mapping drift apart.
-    for (const [external, key] of Object.entries(EXTERNAL_STRING_KEYS)) {
-      // Array form: `toHaveProperty('a.b.c')` would walk a nested path, and these keys are flat
-      // strings that merely contain dots — the same reason `keySeparator` is false.
-      expect(catalog).toHaveProperty([key]);
-      expect(catalog[key]).toBe(external);
-    }
-  });
-});
diff --git a/package/src/i18n/__tests__/languageCodes.test.ts b/package/src/i18n/__tests__/languageCodes.test.ts
deleted file mode 100644
index fdc12331e7..0000000000
--- a/package/src/i18n/__tests__/languageCodes.test.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-import { Streami18n } from '../../utils/i18n/Streami18n';
-import type { TranslationDictionary } from '../types';
-
-/**
- * Language-code handling.
- *
- * `keySeparator` and `nsSeparator` are both false and keys are flat dotted strings, so a
- * region-coded language (`pt-BR`) must not be mistaken for a namespace or a key path. This SDK
- * shipped a `pt-BR` locale until v10, so an integrator porting that dictionary forward is the most
- * likely first user of this path.
- */
-
-const silent = { logger: () => {} };
-
-describe('language codes', () => {
-  it.each(['pt-BR', 'zh-TW', 'fr-CA', 'es-MX'])(
-    'resolves a dictionary for %s',
-    async (language) => {
-      const i18n = new Streami18n({ ...silent, language });
-      i18n.registerTranslation(language, {
-        'common.cancel.label': `cancel-${language}`,
-      } as TranslationDictionary);
-      const { t } = await i18n.getTranslators();
-
-      expect(t('common.cancel.label', 'Cancel')).toBe(`cancel-${language}`);
-      // The hyphen must not have been read as a separator of any kind.
-      expect(i18n.currentLanguage).toBe(language);
-      expect(i18n.getAvailableLanguages()).toContain(language);
-    },
-  );
-
-  it('keeps a region-coded language distinct from its base language', async () => {
-    const i18n = new Streami18n({ ...silent, language: 'pt-BR' });
-    i18n.registerTranslation('pt', {
-      'common.cancel.label': 'Cancelar-pt',
-    } as TranslationDictionary);
-    i18n.registerTranslation('pt-BR', {
-      'common.cancel.label': 'Cancelar-ptBR',
-    } as TranslationDictionary);
-    const { t } = await i18n.getTranslators();
-
-    expect(t('common.cancel.label', 'Cancel')).toBe('Cancelar-ptBR');
-  });
-
-  it('still renders bundled formatter keys under a region-coded language', async () => {
-    const i18n = new Streami18n({ ...silent, language: 'pt-BR' });
-    const { t } = await i18n.getTranslators();
-
-    // Would be the raw key if runtimeDefaults had not been layered under `pt-BR`.
-    expect(t('timestamp.MessageTimestamp', { timestamp: new Date(0) })).not.toBe(
-      'timestamp.MessageTimestamp',
-    );
-  });
-});
-
-describe('setLanguage', () => {
-  it('swaps the active language on the same instance', async () => {
-    const i18n = new Streami18n({ ...silent, language: 'en' });
-    i18n.registerTranslation('de', { 'common.cancel.label': 'Abbrechen' } as TranslationDictionary);
-
-    const { t: before } = await i18n.getTranslators();
-    expect(before('common.cancel.label', 'Cancel')).toBe('Cancel');
-
-    await i18n.setLanguage('de');
-
-    // The instance identity is unchanged — the SDK swaps language in place rather than requiring a
-    // new `Streami18n` (which would mean remounting `<Chat>`).
-    const { t: after } = await i18n.getTranslators();
-    expect(i18n.currentLanguage).toBe('de');
-    expect(after('common.cancel.label', 'Cancel')).toBe('Abbrechen');
-  });
-
-  it('notifies language-change listeners with the new t', async () => {
-    const i18n = new Streami18n({ ...silent, language: 'en' });
-    i18n.registerTranslation('de', { 'common.cancel.label': 'Abbrechen' } as TranslationDictionary);
-    await i18n.getTranslators();
-
-    const seen: string[] = [];
-    i18n.addOnLanguageChangeListener((t) => seen.push(t('common.cancel.label', 'Cancel')));
-
-    await i18n.setLanguage('de');
-
-    // This is what re-renders the tree: the context's `t` is replaced, not the provider.
-    expect(seen).toEqual(['Abbrechen']);
-  });
-
-  it('warns but keeps the language when it has no dictionary', async () => {
-    const logger = jest.fn();
-    const i18n = new Streami18n({ language: 'en', logger });
-    await i18n.getTranslators();
-
-    await i18n.setLanguage('ja');
-
-    expect(i18n.currentLanguage).toBe('ja');
-    expect(logger).toHaveBeenCalledWith(
-      expect.stringMatching(/no translation dictionary is registered/i),
-    );
-  });
-});
diff --git a/package/src/i18n/__tests__/pluralCategories.test.ts b/package/src/i18n/__tests__/pluralCategories.test.ts
index edd5d3ce6b..5ca3bf5586 100644
--- a/package/src/i18n/__tests__/pluralCategories.test.ts
+++ b/package/src/i18n/__tests__/pluralCategories.test.ts
@@ -77,7 +77,7 @@ describe('plural categories beyond one/other', () => {
   it('selects Arabic zero / one / two / few / many / other', async () => {
     const i18n = new Streami18n({ language: 'ar', logger: () => {} });
     i18n.registerTranslation('ar', dictionaries.ar.dictionary as TranslationDictionary);
-    const { t } = await i18n.getTranslators();
+    const { t } = await i18n.init();
 
     expect(t(asDynamicKey(KEY), { count: 0 })).toBe('zero');
     expect(t(asDynamicKey(KEY), { count: 1 })).toBe('one');
@@ -90,7 +90,7 @@ describe('plural categories beyond one/other', () => {
   it('selects Russian one / few / many', async () => {
     const i18n = new Streami18n({ language: 'ru', logger: () => {} });
     i18n.registerTranslation('ru', dictionaries.ru.dictionary as TranslationDictionary);
-    const { t } = await i18n.getTranslators();
+    const { t } = await i18n.init();
 
     expect(t(asDynamicKey(KEY), { count: 1 })).toBe('1 one');
     expect(t(asDynamicKey(KEY), { count: 3 })).toBe('3 few');
@@ -101,7 +101,7 @@ describe('plural categories beyond one/other', () => {
     const i18n = new Streami18n({ language: 'ar', logger: () => {} });
     // Only `_other` supplied — every other category has to render the inline English default.
     i18n.registerTranslation('ar', { [`${KEY}_other`]: '{{count}} صوت' } as TranslationDictionary);
-    const { t } = await i18n.getTranslators();
+    const { t } = await i18n.init();
 
     expect(
       t(asDynamicKey(KEY), {
diff --git a/package/src/i18n/__tests__/publicExports.test.ts b/package/src/i18n/__tests__/publicExports.test.ts
new file mode 100644
index 0000000000..6bf701a991
--- /dev/null
+++ b/package/src/i18n/__tests__/publicExports.test.ts
@@ -0,0 +1,79 @@
+import * as sdk from '../../index';
+
+import type {
+  CalendarFormats,
+  CustomFormatters,
+  DayjsLocaleConfig,
+  DurationFormatterOptions,
+  DynamicTranslationKey,
+  LooseTranslationDictionary,
+  PredefinedFormatters,
+  Streami18nOptions,
+  StreamTFunction,
+  TDateTimeParser,
+  TDateTimeParserInput,
+  TDateTimeParserOutput,
+  TimestampFormatterOptions,
+  TranslationCatalog,
+  TranslationDictionary,
+  TranslationKey,
+} from '../../index';
+
+/**
+ * The i18n public surface, pinned.
+ *
+ * Moving the runtime into `stream-chat/i18n` silently dropped `CalendarFormats` and `DayjsLocaleConfig`
+ * from this package's exports: they had been re-exported from the deleted `utils/i18n/types.ts`, and
+ * nothing here imports them, so neither the build nor the type gate noticed. Both are documented in
+ * `ai-docs/i18n-v10-migration.md`'s type table, so an integrator would have hit it first.
+ *
+ * The type-only half is the important half — a missing type is invisible to a runtime check. It is an
+ * assertion by construction: the imports above fail to compile if any of them stops being exported.
+ */
+describe('i18n public exports', () => {
+  it('exports the runtime values the migration guide documents', () => {
+    const expected = [
+      'asDynamicKey',
+      'defaultDateTimeParser',
+      'defaultTranslatorFunction',
+      'getCalendarDateStringForA11y',
+      'getDateString',
+      'getDateStringForA11y',
+      'isDate',
+      'isDayOrMoment',
+      'isNumberOrString',
+      'predefinedFormatters',
+      'runtimeDefaults',
+      'Streami18n',
+    ];
+
+    expect(expected.filter((name) => !(name in sdk))).toEqual([]);
+    // The check is only worth having if it can fail.
+    expect(['nothingExportsThis'].filter((name) => !(name in sdk))).toEqual(['nothingExportsThis']);
+  });
+
+  it('exports the types the migration guide documents', () => {
+    // Consumed only to keep the type-only imports live under `noUnusedLocals`; the compile is the test.
+    type Pinned = [
+      CalendarFormats,
+      CustomFormatters,
+      DayjsLocaleConfig,
+      DurationFormatterOptions,
+      DynamicTranslationKey,
+      LooseTranslationDictionary,
+      PredefinedFormatters,
+      Streami18nOptions,
+      StreamTFunction,
+      TDateTimeParser,
+      TDateTimeParserInput,
+      TDateTimeParserOutput,
+      TimestampFormatterOptions,
+      TranslationCatalog,
+      TranslationDictionary,
+      TranslationKey,
+    ];
+
+    const pinned: Pinned | undefined = undefined;
+    expect(pinned).toBeUndefined();
+  });
+});
diff --git a/package/src/i18n/externalStrings.ts b/package/src/i18n/externalStrings.ts
deleted file mode 100644
index d145d190ec..0000000000
--- a/package/src/i18n/externalStrings.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-import type { StreamTFunction, TranslationKey } from './types';
-import { asDynamicKey } from './utils';
-
-/**
- * English strings emitted by `stream-chat` (the LLC) reach `t()` as runtime values, so the
- * extractor never sees them and they cannot be renamed from this repo. This table maps the ones we
- * recognise onto the SDK's own keys.
- *
- * Anything not listed falls through unchanged — the same behaviour as before this map existed: the
- * raw English string is displayed. That matters more here than it does on web, because
- * `components/Notifications/notificationTranslations.ts` calls `t(notification.message)` with
- * free-form text that can originate anywhere in the LLC. This class can therefore grow silently on
- * an LLC upgrade, and the passthrough is what keeps that from rendering a blank.
- *
- * Server-supplied strings keyed by a stable identifier rather than by their English text are
- * deliberately *not* here: their components declare those keys in local lookup tables, which keeps
- * them visible to the extractor. Renaming these at the source needs a `stream-chat` change; until
- * then this table is the seam.
- *
- * The string on the left is what renders in English, so `yarn build-translations` requires it to
- * match the key's catalog copy; deliberate rephrasings are allowlisted as
- * `REPHRASED_EXTERNAL_STRINGS` in `scripts/generate-i18n-keys.mts`.
- */
-export const EXTERNAL_STRING_KEYS: Record<string, TranslationKey> = {
-  'Option already exists': 'poll.createPoll.options.duplicate.error',
-  'Type a number from 2 to 10': 'poll.createPoll.maxVotes.range.error',
-};
-
-/**
- * Translate a string that originated outside the SDK. Known strings resolve through their stable
- * key; unknown ones are returned as-is.
- */
-export const translateExternalString = (
-  t: StreamTFunction,
-  raw: string | undefined,
-  options?: Record<string, unknown>,
-): string => {
-  if (!raw) return '';
-  const key = EXTERNAL_STRING_KEYS[raw];
-  // `raw` doubles as the default so a mapped-but-untranslated key still renders English.
-  return key ? t(asDynamicKey(key), raw, options) : t(asDynamicKey(raw), raw, options);
-};
diff --git a/package/src/i18n/keys.ts b/package/src/i18n/keys.ts
index e80ff03225..ac2dfc13a8 100644
--- a/package/src/i18n/keys.ts
+++ b/package/src/i18n/keys.ts
@@ -1,4 +1,4 @@
-// AUTO-GENERATED by scripts/generate-i18n-keys.mts — do not edit by hand.
+// AUTO-GENERATED — do not edit by hand.
 // Regenerate with `yarn build-translations`. CI fails if this file is out of sync.
 //
 // Type-only: no runtime value is emitted, so this adds nothing to the bundle.
@@ -7,7 +7,7 @@
  * Every translation entry shipped with the SDK, mapped to its English copy.
  *
  * Plural entries appear as `<key>_one` / `<key>_other`; call sites use the bare `<key>` and
- * pass `count`. See {@link TranslationKey}.
+ * pass `count`.
  */
 export type TranslationCatalog = {
   'a11y.connection.connected.accessibilityLabel': 'Connected';
@@ -336,19 +336,20 @@ export type TranslationCatalog = {
   'notifications.attachmentUploadFailed.error': 'Error uploading attachment';
   'notifications.attachmentUploadFailed.withReason.error': 'Attachment upload failed due to {{reason}}';
   'notifications.attachmentUploadInProgress.error': 'Wait until all attachments have uploaded';
+  'notifications.commandNotReady.error': 'Command not ready to be sent';
   'notifications.commandUnavailable.error': 'Command not available';
   'notifications.commandUnavailable.whileEditing.error': 'Command not available while editing';
   'notifications.commandUnavailable.whileReplying.error': 'Command not available while replying';
   'notifications.dismiss.accessibilityLabel': 'Dismiss notification';
   'notifications.list.accessibilityLabel': 'Notifications';
-  'notifications.locationRetrieveFailed.error': 'Failed to retrieve location';
   'notifications.locationShareFailed.error': 'Failed to share location';
+  'notifications.messageJumpFailed.error': 'Failed to jump to the message';
+  'notifications.messageJumpToLatestFailed.error': 'Failed to jump to the latest message';
   'notifications.pollCreateFailed.error': 'Failed to create the poll';
   'notifications.pollCreateFailed.withReason.error': 'Failed to create the poll due to {{reason}}';
   'notifications.pollEndFailed.withReason.error': 'Failed to end the poll due to {{reason}}';
   'notifications.pollEnded.text': 'Poll ended';
   'notifications.recordingPlaybackFailed.error': 'Error reproducing the recording';
-  'notifications.threadNotFound.error': 'Thread has not been found';
   'notifications.voteLimitReached.error': 'Reached the vote limit. Remove an existing vote first.';
   'poll.addComment.description': 'Add a comment to the poll';
   'poll.addComment.label': 'Add a comment';
@@ -362,10 +363,10 @@ export type TranslationCatalog = {
   'poll.createPoll.maxVotes.description': 'Choose between 2–10 options';
   'poll.createPoll.maxVotes.increase.accessibilityLabel': 'Increase maximum votes';
   'poll.createPoll.maxVotes.label': 'Limit votes per person';
-  'poll.createPoll.maxVotes.range.error': 'Type a number from 2 to 10';
   'poll.createPoll.multipleVotes.description': 'Select more than one option';
   'poll.createPoll.multipleVotes.label': 'Multiple votes';
   'poll.createPoll.options.duplicate.error': 'Option already exists';
+  'poll.createPoll.options.empty.error': 'Option is empty';
   'poll.createPoll.options.label': 'Options';
   'poll.createPoll.options.placeholder': 'Add an option';
   'poll.createPoll.question.label': 'Questions';
@@ -411,7 +412,7 @@ export type TranslationCatalog = {
   'timestamp.InlineDateSeparator': '{{ timestamp | timestampFormatter(calendar: true) }}';
   'timestamp.MessageSystem': '{{ timestamp | timestampFormatter(calendar: true) }}';
   'timestamp.MessageTimestamp': '{{ timestamp | timestampFormatter(format: LT) }}';
-  'timestamp.PollVote': '{{ timestamp | relativeCompactDateFormatter }}';
+  'timestamp.PollVote': '{{ timestamp | timestampFormatter(relativeCompact: true) }}';
   'timestamp.StickyHeader': '{{ timestamp | timestampFormatter(calendar: true) }}';
   'timestamp.ThreadListItem': '{{ timestamp | timestampFormatter(calendar: true; calendarFormats: {"lastDay":"[Yesterday]", "lastWeek":"dddd", "nextDay":"[Tomorrow]", "nextWeek":"dddd [at] LT", "sameDay":"LT", "sameElse":"L"}) }}';
   'timestamp.UserActivityStatus': 'Last seen {{ timestamp | fromNowFormatter }}';
@@ -421,7 +422,7 @@ export type TranslationCatalog = {
 };
 
 /**
- * Keys whose copy is bundled in `runtimeDefaults` rather than passed inline at the call site.
+ * Keys whose copy is bundled rather than passed inline at the call site.
  *
  * They reach `t()` as runtime values — a JSX prop, a ternary branch, a lookup table — so there
  * is nowhere to write a `defaultValue`. Call sites pass the key alone.
@@ -499,15 +500,12 @@ export type BundledTranslationKey =
   | 'messageMenu.reactionPicker.moreReactions.accessibilityLabel'
   | 'notifications.attachmentUploadFailed.error'
   | 'notifications.attachmentUploadFailed.withReason.error'
-  | 'notifications.commandUnavailable.error'
   | 'notifications.pollCreateFailed.error'
   | 'notifications.pollCreateFailed.withReason.error'
   | 'notifications.pollEndFailed.withReason.error'
   | 'poll.createPoll.close.accessibilityLabel'
   | 'poll.createPoll.maxVotes.decrease.accessibilityLabel'
   | 'poll.createPoll.maxVotes.increase.accessibilityLabel'
-  | 'poll.createPoll.maxVotes.range.error'
-  | 'poll.createPoll.options.duplicate.error'
   | 'poll.createPoll.submit.accessibilityLabel'
   | 'poll.endVote.error'
   | 'poll.modalHeader.close.accessibilityLabel'
diff --git a/package/src/i18n/runtimeDefaults.ts b/package/src/i18n/runtimeDefaults.ts
index 7edb597009..c0b033ba9f 100644
--- a/package/src/i18n/runtimeDefaults.ts
+++ b/package/src/i18n/runtimeDefaults.ts
@@ -10,9 +10,14 @@
  * and the `timestamp/<Component>` values these keys replace. Every other namespace is lower
  * camelCase.
  *
- * Unlike the web SDK this catalog has no `language.*` namespace (React Native never rendered ISO
- * language names) and no `translationBuilderTopic.*` — there is no i18next postProcessor here; the
- * formatter registry in `utils/i18n/predefinedFormatters.ts` is the whole extension surface.
+ * Two namespaces are typed into the catalog but supplied by `stream-chat/i18n` rather than declared
+ * here. `language.*` (ISO language names, generated from core's `TranslationLanguage` union) is
+ * merged in by the `Streami18n` subclass in `utils/i18n/Streami18n.ts`, underneath this file, so an
+ * individual name stays overridable. `relativeTime.*` needs no data at all: core's
+ * `timestampFormatter(relativeCompact: true)` passes its English inline the same way a call site
+ * does. There is
+ * no `translationBuilderTopic.*` — this SDK registers no i18next postProcessor; the formatter
+ * registry in `stream-chat/i18n` is the whole extension surface.
  *
  * `yarn build-translations` joins this file with the inline defaults to generate
  * `src/i18n/keys.ts`; `yarn i18n:export` writes the joined catalog as JSON.
@@ -26,7 +31,7 @@
  *   `timestampFormatter` then parses the calendar config out of the translation value itself.
  * - `timestamp.UserActivityStatus` puts prose (`Last seen`) beside the interpolation.
  *
- * Adding a fourth fails a guard in `__tests__/Streami18n.test.ts` that keeps
+ * Adding a fourth fails a guard in `src/utils/__tests__/Streami18n.test.ts` that keeps
  * `ai-docs/i18n-v10-migration.md` in sync.
  */
 export const runtimeDefaults = {
@@ -38,7 +43,7 @@ export const runtimeDefaults = {
   'timestamp.InlineDateSeparator': '{{ timestamp | timestampFormatter(calendar: true) }}',
   'timestamp.MessageSystem': '{{ timestamp | timestampFormatter(calendar: true) }}',
   'timestamp.MessageTimestamp': '{{ timestamp | timestampFormatter(format: LT) }}',
-  'timestamp.PollVote': '{{ timestamp | relativeCompactDateFormatter }}',
+  'timestamp.PollVote': '{{ timestamp | timestampFormatter(relativeCompact: true) }}',
   'timestamp.StickyHeader': '{{ timestamp | timestampFormatter(calendar: true) }}',
   'timestamp.ThreadListItem':
     '{{ timestamp | timestampFormatter(calendar: true; calendarFormats: {"lastDay":"[Yesterday]", "lastWeek":"dddd", "nextDay":"[Tomorrow]", "nextWeek":"dddd [at] LT", "sameDay":"LT", "sameElse":"L"}) }}',
@@ -121,17 +126,12 @@ export const runtimeDefaults = {
     'Scroll to bottom, {{count}} new messages',
   'messageMenu.actionList.accessibilityLabel': 'Message actions',
   'messageMenu.reactionPicker.moreReactions.accessibilityLabel': 'Open more reactions',
-  'notifications.commandUnavailable.error': 'Command not available',
   'notifications.attachmentUploadFailed.error': 'Error uploading attachment',
   'notifications.attachmentUploadFailed.withReason.error':
     'Attachment upload failed due to {{reason}}',
   'notifications.pollCreateFailed.error': 'Failed to create the poll',
   'notifications.pollCreateFailed.withReason.error': 'Failed to create the poll due to {{reason}}',
   'notifications.pollEndFailed.withReason.error': 'Failed to end the poll due to {{reason}}',
-  // Emitted by `stream-chat`'s poll composer and mapped in `externalStrings.ts`. They arrive as
-  // English at runtime, so there is no call site to carry the copy.
-  'poll.createPoll.maxVotes.range.error': 'Type a number from 2 to 10',
-  'poll.createPoll.options.duplicate.error': 'Option already exists',
   'poll.createPoll.close.accessibilityLabel': 'Close poll creation',
   'poll.createPoll.maxVotes.decrease.accessibilityLabel': 'Decrease maximum votes',
   'poll.createPoll.maxVotes.increase.accessibilityLabel': 'Increase maximum votes',
diff --git a/package/src/i18n/types.ts b/package/src/i18n/types.ts
index ce440ad69b..a3ca2c83be 100644
--- a/package/src/i18n/types.ts
+++ b/package/src/i18n/types.ts
@@ -1,183 +1,57 @@
-import type { TOptions } from 'i18next';
+import type {
+  LanguageNameCatalog,
+  LooseTranslationDictionaryOf,
+  PluralTranslationKeyOf,
+  RelativeTimeCatalog,
+  StreamTFunctionFor,
+  TranslationDictionaryOf,
+  TranslationKeyOf,
+} from 'stream-chat/i18n';
 
-import type { BundledTranslationKey, TranslationCatalog } from './keys';
-
-type Whitespace = ' ' | '\n' | '\t';
-type Trim<S extends string> = S extends `${Whitespace}${infer R}`
-  ? Trim<R>
-  : S extends `${infer R}${Whitespace}`
-    ? Trim<R>
-    : S;
-
-/** `{{ value, formatter }}` and `{{ value | formatter(...) }}` — the name is the leading part. */
-type VarName<S extends string> = Trim<
-  S extends `${infer Name},${string}` ? Name : S extends `${infer Name}|${string}` ? Name : S
->;
-
-/**
- * The interpolation variables a copy string requires.
- *
- * i18next ships `InterpolationMap`, but it does not trim the placeholder, so `{{ setting }}`
- * yields a property literally named `" setting "`. The SDK's copy uses spaced placeholders
- * throughout, so we parse them ourselves.
- */
-type InterpolationVars<S extends string> = S extends `${string}{{${infer V}}}${infer Rest}`
-  ? (VarName<V> extends '' ? never : VarName<V>) | InterpolationVars<Rest>
-  : never;
-
-type InterpolationArgs<S extends string> = [InterpolationVars<S>] extends [never]
-  ? Record<never, never>
-  : { [K in InterpolationVars<S>]: number | string };
-
-type PluralSuffix = 'zero' | 'one' | 'two' | 'few' | 'many' | 'other';
-type CatalogKey = keyof TranslationCatalog & string;
-
-/**
- * Keys whose catalog entries are plural forms (`<key>_one` / `<key>_other`). Call sites use the
- * bare key and pass `count`; the suffixed forms are never referenced directly.
- */
-export type PluralTranslationKey = CatalogKey extends infer K
-  ? K extends `${infer Base}_other`
-    ? Base
-    : never
-  : never;
-
-/**
- * Every key the SDK's `t` accepts: the singular entries plus the bare handle for each plural.
- *
- * This is the *call-site* key set — use it to type a `t` parameter. It is deliberately **not** the
- * right type for a dictionary: a plural lives in the catalog as `<key>_one` / `<key>_other` while
- * `t()` takes the bare `<key>`, so keying a dictionary on this rejects the very entries a
- * translator has to supply. Use {@link TranslationDictionary} for that.
- */
-export type TranslationKey =
-  | Exclude<CatalogKey, `${string}_${PluralSuffix}`>
-  | PluralTranslationKey;
-
-/**
- * A translation dictionary for `Streami18n.registerTranslation()` / `translationsForLanguage`.
- *
- * Restricted to the SDK's own keys, so a typo or a leftover v9 key is a compile error rather than
- * an override that silently never applies. Keyed on the catalog rather than on
- * {@link TranslationKey}, so the `_one` / `_other` plural entries are accepted.
- *
- * The SDK's own copy only needs `_one` / `_other`, but a plural key accepts every category
- * `Intl.PluralRules` can select, so Arabic, Hebrew or Russian can supply `_few`, `_many` and
- * `_zero` and still have its keys checked. A plural suffix on a key that is not plural is
- * rejected.
- *
- * Widen to {@link LooseTranslationDictionary} only when you need keys the SDK does not define.
- *
- * @example
- * const de: TranslationDictionary = {
- *   'common.cancel.label': 'Abbrechen',
- *   'channelDetail.members.title_one': '{{ count }} Mitglied',
- *   'channelDetail.members.title_other': '{{ count }} Mitglieder',
- * };
- *
- * @example
- * const ar: TranslationDictionary = {
- *   'channelDetail.members.title_zero': 'لا أعضاء',
- *   'channelDetail.members.title_one': 'عضو واحد',
- *   'channelDetail.members.title_few': '{{ count }} أعضاء',
- *   'channelDetail.members.title_many': '{{ count }} عضوًا',
- * };
- */
-export type TranslationDictionary = Partial<Record<CatalogKey, string>> &
-  Partial<Record<`${PluralTranslationKey}_${PluralSuffix}`, string>>;
+import type { BundledTranslationKey, TranslationCatalog as GeneratedCatalog } from './keys';
 
 /**
- * A translation dictionary that also admits keys the SDK does not define, so one `Streami18n`
- * instance can carry an application's own copy alongside the SDK's.
+ * The SDK's i18n types, instantiated from the generic helpers in `stream-chat/i18n`.
  *
- * `registerTranslation()` and `translationsForLanguage` take the strict
- * {@link TranslationDictionary}; annotate the variable you pass with this type to widen. Nothing
- * catches a mistyped or stale SDK key here — it compiles, and then never matches at runtime. Note
- * that {@link TranslationDictionary} already covers the extra plural categories, so a language
- * needing `_few` / `_many` / `_zero` does not have to give up key checking.
- */
-export type LooseTranslationDictionary = Partial<Record<CatalogKey, string>> &
-  Record<string, string>;
-
-/** The English copy for a key, used to infer that key's interpolation variables. */
-type CopyFor<K extends string> = K extends CatalogKey
-  ? TranslationCatalog[K]
-  : `${K}_other` extends CatalogKey
-    ? TranslationCatalog[`${K}_other` & CatalogKey]
-    : string;
-
-/**
- * Keys resolved from the bundled `runtimeDefaults`, so call sites pass no inline default.
+ * The derivations live in core so both UI SDKs share one implementation; the *catalog* stays here,
+ * because it is generated from this SDK's own `t()` call sites. That split is why core's helpers are
+ * generic over the catalog rather than driven by module augmentation — two catalogs have to be able to
+ * coexist in one TypeScript program.
  *
- * Two kinds live here: formatter expressions (`timestamp.*`, `duration.*`), matched by prefix so
- * overload resolution stays cheap; and the generated {@link BundledTranslationKey} union — screen
- * reader labels and lookup-table entries that are ordinary prose but reach `t()` as runtime
- * values, leaving nowhere to write a default.
+ * Two slices come from core, because core owns the code that renders them: `language.*` (derived from
+ * the same `TranslationLanguage` union the API uses) and `relativeTime.*` (used by
+ * `timestampFormatter(relativeCompact: true)`). Intersecting them in keeps both compile-checked and
+ * overridable.
  */
-type FormatterKey = `timestamp.${string}` | `duration.${string}` | BundledTranslationKey;
-
-/** Keys whose value is English copy, passed inline as the `defaultValue`. */
-type ProseKey = Exclude<TranslationKey, FormatterKey | PluralTranslationKey>;
+export type TranslationCatalog = GeneratedCatalog & LanguageNameCatalog & RelativeTimeCatalog;
 
-/**
- * A translation key resolved from a runtime value rather than written literally.
- *
- * The brand is *required*, so a plain `string` is not assignable and the escape hatch has to be
- * taken deliberately via `asDynamicKey()` — which also makes every such site greppable.
- *
- * @example t(asDynamicKey(command.description))
- */
-export type DynamicTranslationKey = string & {
-  readonly __dynamicTranslationKey: true;
-};
+export type PluralTranslationKey = PluralTranslationKeyOf<TranslationCatalog>;
+export type TranslationKey = TranslationKeyOf<TranslationCatalog>;
+export type TranslationDictionary = TranslationDictionaryOf<TranslationCatalog>;
+export type LooseTranslationDictionary = LooseTranslationDictionaryOf<TranslationCatalog>;
 
 /**
  * The SDK's translation function.
  *
- * Every call site passes its English copy inline as i18next's `defaultValue`, so the key stays
- * stable across copy edits and a key missing from a custom dictionary still renders English.
- * Interpolation variables are inferred from that copy, and plural keys require `count`.
- *
- * Deliberately *not* installed via i18next's `CustomTypeOptions`: that augmentation is global and
- * would force an integrator's own unrelated `t()` calls to satisfy the SDK's key union.
- */
-export type StreamTFunction = {
-  /** Plural key: `count` selects between the `_one` / `_other` copy. */
-  <K extends PluralTranslationKey>(
-    key: K,
-    options: TOptions & { count: number } & InterpolationArgs<CopyFor<K>>,
-  ): string;
-  /**
-   * Formatter key: resolves from the bundled `runtimeDefaults`, so no inline default. Options stay
-   * loose — the value is a formatter expression, so inferring its variables is neither useful nor
-   * cheap (`CopyFor` over a template-literal key pattern blows the union size limit).
-   */
-  (key: FormatterKey, options?: TOptions & Record<string, unknown>): string;
-  /**
-   * Prose key with its English copy inline.
-   *
-   * Neither `defaultValue` nor `options` is tied to the key's exact copy. Doing so means
-   * materialising `CopyFor<ProseKey>` — the union of every copy string in the catalog — which
-   * exceeds TypeScript's union size limit (TS2590). The two checks that would buy are covered
-   * elsewhere: the default matching the generated catalog is enforced by the drift gate, and
-   * missing interpolation variables surface as a literal `{{ placeholder }}` in the rendered
-   * output, which the test suite asserts on.
-   *
-   * Plural keys keep precise typing (see the first overload) because that union is small.
-   */
-  <K extends ProseKey>(
-    key: K,
-    defaultValue: string,
-    options?: TOptions & Record<string, unknown>,
-  ): string;
-  /**
-   * Escape hatch for keys only known at runtime — a `notification.message` from `stream-chat`,
-   * slash-command metadata from the API, or an integrator-supplied prop. The raw string doubles
-   * as the default so it still renders verbatim when no translation exists.
-   */
-  (
-    key: DynamicTranslationKey,
-    defaultValueOrOptions?: string | (TOptions & Record<string, unknown>),
-    options?: TOptions & Record<string, unknown>,
-  ): string;
-};
+ * `BundledTranslationKey` is generated: the screen-reader labels and lookup-table entries that reach
+ * `t()` as runtime values, so there is nowhere to write an inline default. They are callable without one.
+ */
+export type StreamTFunction = StreamTFunctionFor<TranslationCatalog, BundledTranslationKey>;
+
+export type {
+  // Both are documented in `ai-docs/i18n-v10-migration.md`'s type table and were exported before the
+  // runtime moved; re-exporting them here keeps the public surface unchanged.
+  CalendarFormats,
+  CustomFormatters,
+  DayjsLocaleConfig,
+  DurationFormatterOptions,
+  DynamicTranslationKey,
+  FormatterFactory,
+  LanguageNameCatalog,
+  PredefinedFormatters,
+  RelativeTimeCatalog,
+  TDateTimeParser,
+  TDateTimeParserInput,
+  TDateTimeParserOutput,
+  TimestampFormatterOptions,
+} from 'stream-chat/i18n';
diff --git a/package/src/i18n/utils.ts b/package/src/i18n/utils.ts
index 77cc01a732..a0ae3537bf 100644
--- a/package/src/i18n/utils.ts
+++ b/package/src/i18n/utils.ts
@@ -1,12 +1,34 @@
-import type { DynamicTranslationKey } from './types';
+import { createDefaultTranslatorFunction } from 'stream-chat/i18n';
+
+import type { StreamTFunction } from './types';
 
 /**
- * Brand a runtime-resolved string as a translation key.
+ * The `t` in force before i18next has initialized, and the default value of the translation context.
  *
- * {@link DynamicTranslationKey} is deliberately branded, so a plain `string` is not assignable to
- * the dynamic overload of `StreamTFunction`. Taking the escape hatch therefore has to be
- * explicit — and every site that does is greppable by this function's name.
+ * Core's factory, instantiated against this SDK's catalog so it is typed the same as the real `t`. It
+ * honours the inline `defaultValue` at each call site, which is what stops raw dotted keys flashing on
+ * the first frame — or rendering permanently for a component used outside `<OverlayProvider>`.
+ */
+export const defaultTranslatorFunction: StreamTFunction =
+  createDefaultTranslatorFunction() as StreamTFunction;
+
+/**
+ * The date/time and key helpers now live in `stream-chat/i18n`, shared with the React SDK.
  *
- * @example t(asDynamicKey(command.description))
+ * Re-exported from here rather than rewritten at ~15 call sites, so the internal module path stays
+ * stable. `getDateString` and the type guards behave identically; `predefinedFormatters` gains
+ * `fromNowFormatter` and loses `relativeCompactDateFormatter` — that behaviour is
+ * `timestampFormatter` with `relativeCompact: true`, whose wording goes through `t()` rather than being
+ * hardcoded English as it was here.
  */
-export const asDynamicKey = (key: string) => key as DynamicTranslationKey;
+export {
+  asDynamicKey,
+  defaultDateTimeParser,
+  getCalendarDateStringForA11y,
+  getDateString,
+  getDateStringForA11y,
+  isDate,
+  isDayOrMoment,
+  isNumberOrString,
+  predefinedFormatters,
+} from 'stream-chat/i18n';
diff --git a/package/src/utils/__tests__/Streami18n.test.ts b/package/src/utils/__tests__/Streami18n.test.ts
index f5ece7d430..9d26b50124 100644
--- a/package/src/utils/__tests__/Streami18n.test.ts
+++ b/package/src/utils/__tests__/Streami18n.test.ts
@@ -1,61 +1,4 @@
-import { default as Dayjs } from 'dayjs';
-import 'dayjs/locale/nl';
-import localeData from 'dayjs/plugin/localeData';
-import moment, { type Moment } from 'moment-timezone';
-
 import { runtimeDefaults } from '../../i18n/runtimeDefaults';
-import type { StreamTFunction, TranslationDictionary } from '../../i18n/types';
-import { asDynamicKey } from '../../i18n/utils';
-import { Streami18n } from '../i18n/Streami18n';
-
-Dayjs.extend(localeData);
-
-const silent = { logger: () => {} };
-
-const customDayjsLocaleConfig = {
-  months:
-    'januar_februar_mars_apríl_mai_juni_juli_august_september_oktober_november_desember'.split('_'),
-  monthsShort: 'jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des'.split('_'),
-  ordinal: '%d.',
-  weekdays: 'sunnudagur_mánadagur_týsdagur_mikudagur_hósdagur_fríggjadagur_leygardagur'.split('_'),
-  weekdaysMin: 'su_má_tý_mi_hó_fr_le'.split('_'),
-  weekdaysShort: 'sun_mán_týs_mik_hós_frí_ley'.split('_'),
-};
-
-/**
- * No locale but English ships any more, so proving that "a language resolves" means registering a
- * dictionary — exactly what an integrator does. Deliberately partial: the keys left out are what
- * prove the inline-English fallback, and the plural pair is what proves `count` still selects
- * against the registered language's own `Intl.PluralRules` categories rather than English's.
- */
-const nlDictionary: TranslationDictionary = {
-  'attachment.unsupported.title': 'Niet-ondersteunde bijlage',
-  'autoCompleteInput.placeholder': 'Stuur een bericht',
-  'channelDetails.memberSection.title_one': '{{count}} lid',
-  'channelDetails.memberSection.title_other': '{{count}} leden',
-  'common.cancel.label': 'Annuleren',
-};
-
-/** The plural call site's arguments, copied from `ChannelDetailsMemberSection`. */
-const memberSectionPluralOptions = (count: number) => ({
-  count,
-  defaultValue_one: '{{count}} member',
-  defaultValue_other: '{{count}} members',
-});
-
-const expectDutchDictionaryResolves = (t: StreamTFunction) => {
-  expect(t('common.cancel.label', 'Cancel')).toBe('Annuleren');
-  expect(t('autoCompleteInput.placeholder', 'Send a message')).toBe('Stuur een bericht');
-  expect(t('attachment.unsupported.title', 'Unsupported Attachment')).toBe(
-    'Niet-ondersteunde bijlage',
-  );
-
-  expect(t('channelDetails.memberSection.title', memberSectionPluralOptions(1))).toBe('1 lid');
-  expect(t('channelDetails.memberSection.title', memberSectionPluralOptions(4))).toBe('4 leden');
-
-  // Not supplied by the dictionary: renders the inline English default, never a dotted path.
-  expect(t('common.loading.text', 'Loading...')).toBe('Loading...');
-};
 
 describe('Jest Timezone', () => {
   it('global config should set the timezone to UTC', () => {
@@ -63,244 +6,6 @@ describe('Jest Timezone', () => {
   });
 });
 
-describe('Streami18n instance - default', () => {
-  const streami18n = new Streami18n(silent);
-
-  it('should render english copy from the inline defaults', async () => {
-    const { t: _t } = await streami18n.getTranslators();
-
-    expect(_t('common.cancel.label', 'Cancel')).toBe('Cancel');
-    expect(_t('channelDetails.memberSection.title', memberSectionPluralOptions(2))).toBe(
-      '2 members',
-    );
-  });
-
-  it('should echo back a key it has no translation for', async () => {
-    const { t: _t } = await streami18n.getTranslators();
-    // A key only known at runtime, with no bundled value and no inline default — the one case where
-    // rendering the key itself is the correct outcome.
-    const text = Date.now().toString();
-
-    expect(_t(asDynamicKey(text))).toBe(text);
-  });
-
-  it('should provide dayjs with default en locale', async () => {
-    const { tDateTimeParser } = await streami18n.getTranslators();
-    expect(tDateTimeParser() instanceof Dayjs).toBe(true);
-    expect((tDateTimeParser() as Dayjs.Dayjs).locale()).toBe('en');
-  });
-});
-
-describe('Streami18n instance - with a registered language', () => {
-  describe('datetime translations enabled', () => {
-    const streami18n = new Streami18n({
-      ...silent,
-      language: 'nl',
-      translationsForLanguage: nlDictionary,
-    });
-
-    it('should provide dutch translator', async () => {
-      const { t: _t } = await streami18n.getTranslators();
-      expectDutchDictionaryResolves(_t);
-    });
-
-    it('should provide dayjs with `nl` locale', async () => {
-      const { tDateTimeParser } = await streami18n.getTranslators();
-      expect(tDateTimeParser() instanceof Dayjs).toBe(true);
-      expect((tDateTimeParser() as Dayjs.Dayjs).locale()).toBe('nl');
-    });
-  });
-
-  describe('datetime translations disabled', () => {
-    const streami18n = new Streami18n({
-      ...silent,
-      disableDateTimeTranslations: true,
-      language: 'nl',
-      translationsForLanguage: nlDictionary,
-    });
-
-    it('should provide dutch translator', async () => {
-      const { t: _t } = await streami18n.getTranslators();
-      expectDutchDictionaryResolves(_t);
-    });
-
-    it('should provide dayjs with default `en` locale', async () => {
-      const { tDateTimeParser } = await streami18n.getTranslators();
-      expect(tDateTimeParser() instanceof Dayjs).toBe(true);
-      expect((tDateTimeParser() as Dayjs.Dayjs).locale()).toBe('en');
-    });
-  });
-
-  describe('custom dayjs locale config', () => {
-    const streami18nOptions = {
-      dayjsLocaleConfigForLanguage: customDayjsLocaleConfig,
-      language: 'nl',
-      translationsForLanguage: nlDictionary,
-    };
-    const streami18n = new Streami18n(
-      streami18nOptions as unknown as ConstructorParameters<typeof Streami18n>[0],
-    );
-
-    it('should provide dayjs with given custom locale config', async () => {
-      const { tDateTimeParser } = await streami18n.getTranslators();
-      expect(tDateTimeParser() instanceof Dayjs).toBe(true);
-      const localeConfig = (tDateTimeParser() as Dayjs.Dayjs).localeData() as unknown as Record<
-        string,
-        unknown
-      >;
-      for (const key in streami18nOptions.dayjsLocaleConfigForLanguage) {
-        if (typeof localeConfig[key] === 'function') {
-          expect((localeConfig[key] as () => unknown)()).toStrictEqual(
-            customDayjsLocaleConfig[key as keyof typeof customDayjsLocaleConfig],
-          );
-        } else {
-          expect(localeConfig[key]).toStrictEqual(
-            customDayjsLocaleConfig[key as keyof typeof customDayjsLocaleConfig],
-          );
-        }
-      }
-    });
-  });
-});
-
-describe('Streami18n instance - with custom translations', () => {
-  describe('datetime translations enabled', () => {
-    const translations: TranslationDictionary = {
-      'attachment.unsupported.title': '不支持的附件',
-      'common.cancel.label': '取消',
-    };
-    const streami18n = new Streami18n({
-      ...silent,
-      language: 'zh',
-      translationsForLanguage: translations,
-    });
-
-    it('should provide given (chinese in this case) translator', async () => {
-      const { t: _t } = await streami18n.getTranslators();
-
-      expect(_t('common.cancel.label', 'Cancel')).toBe('取消');
-      expect(_t('attachment.unsupported.title', 'Unsupported Attachment')).toBe('不支持的附件');
-      expect(_t('common.loading.text', 'Loading...')).toBe('Loading...');
-    });
-
-    it('should provide dayjs with default `en` locale', async () => {
-      const { tDateTimeParser } = await streami18n.getTranslators();
-      expect(tDateTimeParser() instanceof Dayjs).toBe(true);
-      expect((tDateTimeParser() as Dayjs.Dayjs).locale()).toBe('en');
-    });
-  });
-});
-
-describe('registerTranslation - register new language `mr` (Marathi)', () => {
-  const streami18nOptions = {
-    ...silent,
-    disableDateTimeTranslations: false,
-    language: 'en',
-  };
-  const streami18n = new Streami18n(streami18nOptions);
-  const languageCode = 'mr';
-  const translations: TranslationDictionary = {
-    'common.cancel.label': 'रद्द करा',
-    'common.loading.text': 'लोड करत आहे...',
-  };
-  streami18n.registerTranslation(
-    languageCode,
-    translations,
-    customDayjsLocaleConfig as unknown as Parameters<typeof streami18n.registerTranslation>[2],
-  );
-
-  streami18n.setLanguage('mr');
-
-  it('should add Marathi translations object to list of translations', () => {
-    expect(streami18n.getTranslations()).toHaveProperty(languageCode, {
-      // `runtimeDefaults` is layered under every language and `registerTranslation` merges over
-      // it, so the registered dictionary is a subset of the resulting bundle rather than all of it.
-      // The layering itself is covered by `Streami18nGuarantees.test.ts`.
-      translation: expect.objectContaining(translations),
-    });
-  });
-
-  it('should list Marathi as an available language', () => {
-    expect(streami18n.getAvailableLanguages()).toContain(languageCode);
-  });
-
-  it('should resolve the registered Marathi dictionary once initialized', async () => {
-    // `registerTranslation` + `setLanguage` both ran before `init()`, so this also covers the
-    // pre-initialization path into i18next's resource store.
-    const { t: _t } = await streami18n.getTranslators();
-
-    expect(_t('common.cancel.label', 'Cancel')).toBe('रद्द करा');
-    expect(_t('common.loading.text', 'Loading...')).toBe('लोड करत आहे...');
-    expect(_t('autoCompleteInput.placeholder', 'Send a message')).toBe('Send a message');
-  });
-
-  it('should register dayjs locale config for Marathi translations', async () => {
-    const { tDateTimeParser } = await streami18n.getTranslators();
-    expect(tDateTimeParser() instanceof Dayjs).toBe(true);
-
-    const localeConfig = (tDateTimeParser() as Dayjs.Dayjs).localeData() as unknown as Record<
-      string,
-      unknown
-    >;
-    for (const key in customDayjsLocaleConfig) {
-      if (typeof localeConfig[key] === 'function') {
-        expect((localeConfig[key] as () => unknown)()).toStrictEqual(
-          customDayjsLocaleConfig[key as keyof typeof customDayjsLocaleConfig],
-        );
-      } else {
-        expect(localeConfig[key]).toStrictEqual(
-          customDayjsLocaleConfig[key as keyof typeof customDayjsLocaleConfig],
-        );
-      }
-    }
-  });
-});
-
-describe('setLanguage - switch to french', () => {
-  const frDictionary: TranslationDictionary = {
-    'channelDetails.memberSection.title_one': '{{count}} membre',
-    'channelDetails.memberSection.title_other': '{{count}} membres',
-    'common.cancel.label': 'Annuler',
-  };
-
-  const initializedInstance = async () => {
-    const streami18n = new Streami18n(silent);
-    streami18n.registerTranslation('fr', frDictionary);
-    // Initialize on `en` first, so the switch goes through `i18nInstance.changeLanguage`.
-    await streami18n.getTranslators();
-    return streami18n;
-  };
-
-  it('should provide french translator', async () => {
-    const streami18n = await initializedInstance();
-    await streami18n.setLanguage('fr');
-
-    const { t: _t } = await streami18n.getTranslators();
-
-    expect(streami18n.currentLanguage).toBe('fr');
-    expect(_t('common.cancel.label', 'Cancel')).toBe('Annuler');
-    expect(_t('channelDetails.memberSection.title', memberSectionPluralOptions(1))).toBe(
-      '1 membre',
-    );
-    expect(_t('channelDetails.memberSection.title', memberSectionPluralOptions(3))).toBe(
-      '3 membres',
-    );
-    // Not supplied by the french dictionary: the inline English default, not a dotted path.
-    expect(_t('common.loading.text', 'Loading...')).toBe('Loading...');
-  });
-
-  it('should return to english copy when switching back', async () => {
-    const streami18n = await initializedInstance();
-    await streami18n.setLanguage('fr');
-    await streami18n.setLanguage('en');
-
-    const { t: _t } = await streami18n.getTranslators();
-
-    expect(streami18n.currentLanguage).toBe('en');
-    expect(_t('common.cancel.label', 'Cancel')).toBe('Cancel');
-  });
-});
-
 describe('runtimeDefaults', () => {
   it('carries per-key calendarFormats for exactly the two documented keys', () => {
     // A per-key `calendarFormats` replaces the dayjs locale's calendar wholesale, so
@@ -347,71 +52,3 @@ describe('runtimeDefaults', () => {
     ]);
   });
 });
-
-describe('Streami18n timezone', () => {
-  describe.each([['moment', moment]])('%s', (moduleName, module) => {
-    it('is by default the local timezone', () => {
-      const streamI18n = new Streami18n({ DateTimeParser: module });
-      const date = new Date();
-      expect((streamI18n.tDateTimeParser(date) as Moment).format('H')).toBe(
-        date.getHours().toString(),
-      );
-    });
-
-    it('can be set to different timezone on init', () => {
-      const streamI18n = new Streami18n({ DateTimeParser: module, timezone: 'Europe/Prague' });
-      const date = new Date();
-      expect((streamI18n.tDateTimeParser(date) as Moment).format('H')).not.toBe(
-        date.getHours().toString(),
-      );
-      expect((streamI18n.tDateTimeParser(date) as Moment).format('H')).not.toBe(
-        (date.getUTCHours() - 2).toString(),
-      );
-    });
-
-    it('is ignored if datetime parser does not support timezones', () => {
-      const mutableModule = module as unknown as { tz: unknown };
-      const tz = mutableModule.tz;
-      delete (mutableModule as { tz?: unknown }).tz;
-
-      const streamI18n = new Streami18n({ DateTimeParser: module, timezone: 'Europe/Prague' });
-      const date = new Date();
-      expect((streamI18n.tDateTimeParser(date) as Moment).format('H')).toBe(
-        date.getHours().toString(),
-      );
-
-      mutableModule.tz = tz;
-    });
-    describe('formatters property', () => {
-      it('contains the default timestampFormatter', () => {
-        expect(new Streami18n().formatters.timestampFormatter).toBeDefined();
-      });
-      it('allows to override the default timestampFormatter', async () => {
-        const i18n = new Streami18n({
-          ...silent,
-          formatters: { timestampFormatter: () => () => 'custom' },
-          translationsForLanguage: {
-            'timestamp.MessageTimestamp': '{{ value | timestampFormatter }}',
-          },
-        });
-        await i18n.getTranslators();
-        // `value` has to be supplied: since i18next 26 an interpolation whose value is missing or
-        // `undefined` short-circuits before the formatter runs. Every SDK call site passes one
-        // (`timestamp` for timestampFormatter, `milliseconds` for durationFormatter), so this
-        // matches the real path — previously the assertion passed only by accident.
-        expect(i18n.t('timestamp.MessageTimestamp', { value: new Date() })).toBe('custom');
-      });
-      it('allows to add new custom formatter', async () => {
-        const i18n = new Streami18n({
-          ...silent,
-          formatters: { customFormatter: () => () => 'custom' },
-          translationsForLanguage: {
-            'timestamp.MessageTimestamp': '{{ value | customFormatter }}',
-          },
-        });
-        await i18n.getTranslators();
-        expect(i18n.t('timestamp.MessageTimestamp', { value: new Date() })).toBe('custom');
-      });
-    });
-  });
-});
diff --git a/package/src/utils/__tests__/Streami18nGuarantees.test.ts b/package/src/utils/__tests__/Streami18nGuarantees.test.ts
deleted file mode 100644
index 464362cf8b..0000000000
--- a/package/src/utils/__tests__/Streami18nGuarantees.test.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import { runtimeDefaults } from '../../i18n/runtimeDefaults';
-import type { TranslationDictionary } from '../../i18n/types';
-import { Streami18n } from '../i18n/Streami18n';
-
-/**
- * The three behavioural guarantees the v15 i18n architecture has to hold. Each one was a real bug
- * found in review of the web implementation, and each one reproduces against this SDK's
- * pre-port `Streami18n`.
- *
- * G1 — every language is layered over `runtimeDefaults`, however it was selected.
- * G2 — a partial dictionary is safe: unsupplied keys render English, never a raw dotted path.
- * G3 — selecting an unregistered language warns and continues; it must not silently reset to `en`.
- */
-
-const silent = { logger: () => {} };
-
-// A formatter key: bundled data, no inline default anywhere. If runtimeDefaults is not layered in,
-// this renders as the literal key.
-const FORMATTER_KEY = 'timestamp.MessageTimestamp';
-
-describe('G1 — runtimeDefaults are layered under every language', () => {
-  it('applies to a language selected via the `language` option', async () => {
-    const i18n = new Streami18n({ ...silent, language: 'de' });
-    const { t } = await i18n.getTranslators();
-
-    expect(t(FORMATTER_KEY)).not.toBe(FORMATTER_KEY);
-  });
-
-  it('applies to a language added with registerTranslation', async () => {
-    const i18n = new Streami18n(silent);
-    i18n.registerTranslation('de', {
-      'common.cancel.label': 'Abbrechen',
-    } satisfies TranslationDictionary);
-    await i18n.setLanguage('de');
-    const { t } = await i18n.getTranslators();
-
-    expect(t(FORMATTER_KEY)).not.toBe(FORMATTER_KEY);
-  });
-
-  it('applies to `en` when no dictionary is supplied at all', async () => {
-    const i18n = new Streami18n(silent);
-    const { t } = await i18n.getTranslators();
-
-    expect(t(FORMATTER_KEY)).not.toBe(FORMATTER_KEY);
-  });
-
-  it('survives registerTranslation for a language that already had one', async () => {
-    const i18n = new Streami18n({ ...silent, language: 'de' });
-    i18n.registerTranslation('de', {
-      'common.cancel.label': 'Abbrechen',
-    } satisfies TranslationDictionary);
-    i18n.registerTranslation('de', { 'common.draft.label': 'Entwurf' });
-    const { t } = await i18n.getTranslators();
-
-    // Registering twice must accumulate, and must not knock out the bundled formatter keys.
-    expect(t(FORMATTER_KEY)).not.toBe(FORMATTER_KEY);
-  });
-
-  it('never lets an integrator dictionary shadow a bundled key by omission', async () => {
-    const i18n = new Streami18n({
-      ...silent,
-      language: 'de',
-      translationsForLanguage: { 'common.cancel.label': 'Abbrechen' },
-    });
-    const { t } = await i18n.getTranslators();
-
-    expect(t(FORMATTER_KEY)).toBe(runtimeDefaults[FORMATTER_KEY]);
-  });
-});
-
-describe('G2 — a partial dictionary renders English, not a dotted path', () => {
-  it('renders the inline default for a key the dictionary does not supply', async () => {
-    const i18n = new Streami18n({ ...silent, language: 'de' });
-    i18n.registerTranslation('de', {
-      'common.cancel.label': 'Abbrechen',
-    } satisfies TranslationDictionary);
-    const { t } = await i18n.getTranslators();
-
-    expect(t('common.loading.text', 'Loading...')).toBe('Loading...');
-  });
-
-  it('renders the supplied translation when the dictionary does supply it', async () => {
-    const i18n = new Streami18n({ ...silent, language: 'de' });
-    i18n.registerTranslation('de', {
-      'common.cancel.label': 'Abbrechen',
-    } satisfies TranslationDictionary);
-    const { t } = await i18n.getTranslators();
-
-    expect(t('common.cancel.label', 'Cancel')).toBe('Abbrechen');
-  });
-
-  it('never renders a raw dotted key for a prose key', async () => {
-    const i18n = new Streami18n({ ...silent, language: 'de' });
-    const { t } = await i18n.getTranslators();
-
-    const rendered = t('common.loading.text', 'Loading...');
-    expect(rendered).not.toMatch(/^[a-z][a-zA-Z]*(\.[a-zA-Z]+)+$/);
-  });
-
-  it('does not let an integrator parseMissingKeyHandler blank out prose keys', async () => {
-    const i18n = new Streami18n(silent, { parseMissingKeyHandler: () => '' } as never);
-    const { t } = await i18n.getTranslators();
-
-    // Every prose key looks "missing" to i18next — it resolves from the inline default, not from
-    // the resource bundle. An unguarded handler therefore blanks out most of the UI.
-    expect(t('common.loading.text', 'Loading...')).toBe('Loading...');
-  });
-});
-
-describe('G3 — an unregistered language warns and continues', () => {
-  it('does not silently reset the language to en', async () => {
-    const logger = jest.fn();
-    const i18n = new Streami18n({ language: 'de', logger });
-    await i18n.getTranslators();
-
-    expect(i18n.currentLanguage).toBe('de');
-  });
-
-  it('warns that the language has no dictionary', async () => {
-    const logger = jest.fn();
-    const i18n = new Streami18n({ language: 'de', logger });
-    await i18n.getTranslators();
-
-    // Specifically the *translation* warning — not the unrelated dayjs "locale config for de does
-    // not exist" message, which the pre-port code already emits and which would let this pass for
-    // the wrong reason.
-    expect(logger).toHaveBeenCalledWith(expect.stringContaining('registerTranslation'));
-    expect(logger).toHaveBeenCalledWith(
-      expect.stringMatching(/no translation dictionary is registered/i),
-    );
-  });
-
-  it('keeps the language after setLanguage to an unregistered one', async () => {
-    const logger = jest.fn();
-    const i18n = new Streami18n({ logger });
-    await i18n.getTranslators();
-    await i18n.setLanguage('de');
-
-    expect(i18n.currentLanguage).toBe('de');
-  });
-
-  it('still renders English copy in the unregistered language', async () => {
-    const i18n = new Streami18n({ ...silent, language: 'de' });
-    const { t } = await i18n.getTranslators();
-
-    expect(t('common.loading.text', 'Loading...')).toBe('Loading...');
-  });
-});
diff --git a/package/src/utils/i18n/Streami18n.ts b/package/src/utils/i18n/Streami18n.ts
index 18f8be0f1f..6a1c24e259 100644
--- a/package/src/utils/i18n/Streami18n.ts
+++ b/package/src/utils/i18n/Streami18n.ts
@@ -1,693 +1,64 @@
-import Dayjs from 'dayjs';
-import calendar from 'dayjs/plugin/calendar';
-import duration from 'dayjs/plugin/duration';
-import localeData from 'dayjs/plugin/localeData';
-import LocalizedFormat from 'dayjs/plugin/localizedFormat';
-import relativeTime from 'dayjs/plugin/relativeTime';
-import updateLocale from 'dayjs/plugin/updateLocale';
-import utc from 'dayjs/plugin/utc';
-import i18n, { type i18n as I18nInstance, FallbackLng } from 'i18next';
+import { languageNameDefaults, Streami18n as CoreStreami18n } from 'stream-chat/i18n';
+import type { Streami18nOptions as CoreStreami18nOptions } from 'stream-chat/i18n';
 
-import type momentTimezone from 'moment-timezone';
-
-import { calendarFormats } from './calendarFormats';
-import { predefinedFormatters } from './predefinedFormatters';
-import { CustomFormatters, PredefinedFormatters } from './types';
-
-import type { TDateTimeParser } from '../../contexts/translationContext/types';
+import type { BundledTranslationKey } from '../../i18n/keys';
 import { runtimeDefaults } from '../../i18n/runtimeDefaults';
-import type {
-  LooseTranslationDictionary,
-  StreamTFunction,
-  TranslationDictionary,
-} from '../../i18n/types';
-
-// Only the English locale ships. Integrators registering another language import their own
-// `dayjs/locale/xx` and pass `dayjsLocaleConfigForLanguage` (or `registerTranslation`'s third
-// argument).
-import 'dayjs/locale/en';
-
-const defaultNS = 'translation';
-const defaultLng = 'en';
-
-Dayjs.extend(updateLocale);
-Dayjs.extend(utc);
-
-Dayjs.updateLocale('en', {
-  calendar: calendarFormats.en,
-  format: {
-    L: 'DD/MM/YYYY',
-    LL: 'D MMMM YYYY',
-    LLL: 'D MMMM YYYY HH:mm',
-    LLLL: 'dddd, D MMMM YYYY HH:mm',
-    LT: 'hh:mmA',
-    LTS: 'HH:mm:ss',
-  },
-});
+import type { TranslationCatalog } from '../../i18n/types';
 
 /**
- * A dayjs locale config, as accepted by `dayjsLocaleConfigForLanguage` and by
- * `registerTranslation`'s third argument.
+ * Options for {@link Streami18n}.
  *
- * `calendar` is not part of dayjs's own `ILocale` — it comes from the calendar plugin — so it has
- * to be added here. Typing this as a bare `Partial<ILocale>` makes passing a calendar config a
- * TS2345 "no properties in common" error, which is exactly the wording an integrator hits first.
- * Supplying `calendar` is how relative wording ("heute um", "ieri alle") gets localized.
+ * `runtimeDefaults` is accepted and *merged* over the SDK's own, so supplying it adds to rather than
+ * replaces what the SDK ships.
  */
-export type DayjsLocaleConfig = Partial<ILocale> & { calendar?: CalendarFormats };
-
-export type CalendarFormats = {
-  lastDay: string;
-  lastWeek: string;
-  nextDay: string;
-  nextWeek: string;
-  sameDay: string;
-  sameElse: string;
-};
-
-const en_locale = {
-  formats: {},
-  months: [
-    'January',
-    'February',
-    'March',
-    'April',
-    'May',
-    'June',
-    'July',
-    'August',
-    'September',
-    'October',
-    'November',
-    'December',
-  ],
-  relativeTime: {},
-  weekdays: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-};
-
-type DateTimeParserModule = typeof Dayjs | typeof momentTimezone;
-
-// Type guards to check DayJs
-const isDayJs = (dateTimeParser: DateTimeParserModule): dateTimeParser is typeof Dayjs =>
-  (dateTimeParser as typeof Dayjs).extend !== undefined;
-
-type TimezoneParser = {
-  tz: momentTimezone.MomentTimezone | Dayjs.Dayjs;
-};
-
-const supportsTz = (dateTimeParser: unknown): dateTimeParser is TimezoneParser =>
-  (dateTimeParser as TimezoneParser).tz !== undefined;
-
-type Streami18nOptions = {
-  DateTimeParser?: DateTimeParserModule;
-  dayjsLocaleConfigForLanguage?: DayjsLocaleConfig;
-  debug?: boolean;
-  disableDateTimeTranslations?: boolean;
-  formatters?: Partial<PredefinedFormatters> & CustomFormatters;
-  language?: string;
-  logger?: (msg?: string) => void;
-  timezone?: string;
-  translationsForLanguage?: TranslationDictionary;
-};
-
-type I18NextConfig = {
-  debug: boolean;
-  fallbackLng: false | FallbackLng;
-  interpolation: { escapeValue: boolean; formatSeparator: string };
-  keySeparator: false | string;
-  lng: string;
-  nsSeparator: false | string;
-  parseMissingKeyHandler: (key: string, defaultValue?: string) => string;
-};
+export type Streami18nOptions = CoreStreami18nOptions<TranslationCatalog>;
 
 /**
- * Wrapper around [i18next](https://www.i18next.com/) for Stream's translations. Pass an instance to
- * `<Chat>` to control language and copy.
+ * Wrapper around [i18next](https://www.i18next.com/) for this SDK's translations. Pass an instance to
+ * `<Chat i18nInstance={…}>` to control language and copy.
  *
- * Only English ships with the SDK, and only as much of it as has to: prose renders from the inline
- * `defaultValue` at each call site, so the bundled data is just the formatter expressions and the
- * handful of keys resolved by name at runtime. Every other language comes from the integrator.
+ * The implementation lives in `stream-chat/i18n`, shared with the React SDK, so both behave identically
+ * and a fix reaches both at once. What is added here is this SDK's own bundled translation data — core
+ * cannot import it, because the key catalog is generated from *this* package's `t()` call sites.
  *
  * ## Overriding some of the English copy
  *
- * Anything not mentioned is untouched.
- *
  * ```ts
- * import { Streami18n, type TranslationDictionary } from 'stream-chat-react-native';
- *
  * const i18n = new Streami18n({
- *   translationsForLanguage: {
- *     'autoCompleteInput.placeholder': 'Write something…',
- *   } satisfies TranslationDictionary,
+ *   translationsForLanguage: { 'autoCompleteInput.placeholder': 'Write something…' },
  * });
- *
- * <Chat client={client} i18nInstance={i18n}>…</Chat>
  * ```
  *
- * Keys are checked against the generated catalog, so a typo or a leftover v9 key is a compile
- * error rather than an override that silently never applies. Run `yarn i18n:export` to dump every
- * key with its English copy.
- *
- * ## Registering a new language
+ * ## Registering a language
  *
  * ```ts
- * import { Streami18n, type TranslationDictionary } from 'stream-chat-react-native';
  * import 'dayjs/locale/de';
  *
- * const de: TranslationDictionary = {
- *   'common.cancel.label': 'Abbrechen',
- *   'channelDetails.memberSection.title_one': '{{count}} Mitglied',
- *   'channelDetails.memberSection.title_other': '{{count}} Mitglieder',
- * };
- *
  * const i18n = new Streami18n({ language: 'de' });
  * i18n.registerTranslation('de', de, {
- *   calendar: { sameDay: '[heute um] LT', lastDay: '[gestern um] LT' /* … *\/ },
+ *   calendar: { sameDay: '[heute um] LT', lastDay: '[gestern um] LT' },
  * });
  * ```
  *
- * A partial dictionary is safe: keys you do not supply render their English copy, never a raw
- * dotted path. Every language is layered over the bundled defaults — however it was selected, and
- * even with no dictionary at all — so overriding one string cannot knock out timestamps.
+ * A partial dictionary is safe: keys you do not supply render their English copy, never a raw dotted
+ * path. Note no dayjs locale file defines `calendar` — that field belongs to the calendar plugin — so a
+ * new language needs both the locale import and a `calendar` config, or relative dates render English
+ * scaffolding around translated day names.
  *
- * Plurals are stored as `<key>_one` / `<key>_other`; supply whichever categories your language
- * needs and `Intl.PluralRules` selects between them, so Arabic, Hebrew and Russian can add
- * `_zero` / `_few` / `_many` and stay type-checked.
- *
- * ## Dates and times
- *
- * Only the `en` dayjs locale is bundled. Import your own locale and pass
- * `dayjsLocaleConfigForLanguage` (or `registerTranslation`'s third argument), or supply a
- * preconfigured `DateTimeParser`:
- *
- * ```ts
- * import Dayjs from 'dayjs';
- * import 'dayjs/locale/nl';
- *
- * const i18n = new Streami18n({ language: 'nl', DateTimeParser: Dayjs });
- * ```
- *
- * Two `timestamp.*` keys carry their own `calendarFormats` with English day words baked in —
- * `timestamp.ChannelPreviewStatus` and `timestamp.ThreadListItem`. A per-key `calendarFormats`
- * replaces the locale's calendar wholesale, so `dayjsLocaleConfigForLanguage` never reaches them;
- * override the two keys directly. See `ai-docs/i18n-v10-migration.md`.
- *
- * Set `disableDateTimeTranslations` to keep dates in English regardless of language.
- */
-/**
- * Wraps an integrator's `parseMissingKeyHandler` so it only sees genuinely missing translations.
- *
- * i18next counts every prose key as missing — they render from the inline `defaultValue`, not from
- * a resource bundle — and lets the handler's return value replace the rendered string. An
- * unguarded handler therefore blanks out most of the UI. A resolved default arrives as the second
- * argument, which is how the two cases are told apart.
- */
-const guardMissingKeyHandler =
-  (handler: (key: string, defaultValue?: string) => string) =>
-  (key: string, defaultValue?: string) => {
-    if (typeof defaultValue === 'string') return defaultValue;
-    return handler(key, defaultValue);
-  };
-
-const defaultStreami18nOptions = {
-  DateTimeParser: Dayjs,
-  dayjsLocaleConfigForLanguage: null,
-  debug: false,
-  disableDateTimeTranslations: false,
-  language: 'en',
-  logger: (msg?: string) => console.warn(msg),
-};
-
-/**
- * The `t` used before `Streami18n` has finished initializing, and the default value of the
- * translation context.
- *
- * It has to honour the inline `defaultValue`: every prose call site now passes its English copy as
- * the second argument, so echoing the key back would flash raw dotted paths on the first frame and
- * would render them permanently anywhere the context default is in play.
+ * Reactivity goes through `i18n.state`, a `StateStore`. `setLanguage()` returns nothing — the new `t` is
+ * published to that store, which `<Chat>` subscribes to.
  */
-export const defaultTranslatorFunction = ((
-  key: string,
-  defaultValueOrOptions?: string | Record<string, unknown>,
-  maybeOptions?: Record<string, unknown>,
-) => {
-  if (typeof defaultValueOrOptions === 'string') return defaultValueOrOptions;
-
-  // Plural call sites pass their copy as `defaultValue_one` / `defaultValue_other` inside the
-  // options object, so a bare `defaultValue` check would still leak the raw key for them. English
-  // only distinguishes one vs. other; a registered language's own categories are irrelevant here,
-  // since this function is only ever in play before i18next has initialized.
-  const options = (
-    typeof defaultValueOrOptions === 'object' ? defaultValueOrOptions : maybeOptions
-  ) as Record<string, unknown> | undefined;
-  if (options) {
-    const count = options.count;
-    const form = count === 1 ? options.defaultValue_one : options.defaultValue_other;
-    const resolved = form ?? options.defaultValue;
-    if (typeof resolved === 'string') {
-      // Interpolate the placeholders the copy declares, so `{{count}} members` does not render
-      // with a literal `{{count}}`.
-      return resolved.replace(/\{\{\s*(\w+)\s*\}\}/g, (whole, name) =>
-        options[name] === undefined ? whole : String(options[name]),
-      );
-    }
-  }
-
-  return key;
-}) as unknown as StreamTFunction;
-
-export class Streami18n {
-  i18nInstance: I18nInstance = i18n.createInstance();
-  Dayjs = null;
-  initialized = false;
-  /* this promise is used to prevent simultaneous calls to init (happens in Overlay and Chat) */
-  private waitForInitializing: Promise<void> | undefined;
-  /* This is the callback to be fired when the language is changed */
-  private onLanguageChangeListeners: ((t: StreamTFunction) => void)[] = [];
-  /* This is the callback to be fired when the tFunc is overridden
-   * This is useful when a different i18n library needs to be used
-   * The SDK uses this in useStreami18n hook to set the tFunc in the context
-   */
-  private onTFunctionOverrideListeners: ((t: StreamTFunction) => void)[] = [];
-  /* We need to queue the overridden tFunction
-   * if the tFunction is overridden before the SDK has initialized the translations
-   */
-  private queuedTFunctionOverride: StreamTFunction | undefined;
-
-  t: StreamTFunction = defaultTranslatorFunction;
-  tDateTimeParser: TDateTimeParser;
-
-  /**
-   * The resource dictionaries handed to i18next, keyed by language.
-   *
-   * Not the full English catalog: prose keys are never bundled — they render from the inline
-   * `defaultValue` at their call site — so `en` holds `runtimeDefaults` plus whatever has been
-   * registered. To enumerate every key with its copy use {@link TranslationCatalog} or
-   * `yarn i18n:export`.
-   */
-  translations: {
-    [key: string]: {
-      [key: string]: LooseTranslationDictionary;
-    };
-  } = {};
-
-  /**
-   * Languages an integrator actually supplied a dictionary for.
-   *
-   * Deliberately narrower than `Object.keys(this.translations)`, which also contains every language
-   * `ensureLanguage` created to carry `runtimeDefaults`. Without the distinction the
-   * unregistered-language warning could never fire.
-   */
-  registeredLanguages = new Set<string>([defaultLng]);
-
-  /**
-   * A dictionary layered over `runtimeDefaults`. Every write into `this.translations` goes through
-   * here: those keys have no inline `defaultValue` at their call site and `fallbackLng` is false,
-   * so a language missing them renders raw dotted keys and unformatted ISO timestamps.
-   */
-  private mergeWithRuntimeDefaults = (
-    language: string,
-    translation?: LooseTranslationDictionary,
-  ): LooseTranslationDictionary => ({
-    ...runtimeDefaults,
-    ...this.translations[language]?.[defaultNS],
-    ...translation,
-  });
-
-  /**
-   * Guarantees `language` has a dictionary, so a language nobody registered still formats dates and
-   * renders the SDK's copy in English. Writes into i18next's store too when already initialized —
-   * the only route for a language added after `init()`.
-   */
-  private ensureLanguage = (language: string) => {
-    const translation = this.mergeWithRuntimeDefaults(language);
-    this.translations[language] = { [defaultNS]: translation };
-
-    if (this.initialized) {
-      this.i18nInstance.addResources(language, defaultNS, translation);
-    }
-  };
-
-  /**
-   * dayjs.defineLanguage('nl') also changes the global locale. We don't want to do that
-   * when a user calls the registerTranslation() function. So instead we will store the
-   * locale configs given to the registerTranslation() function in `dayjsLocales` object,
-   * and register the required locale with moment when setLanguage is called.
-   */
-  dayjsLocales: { [key: string]: DayjsLocaleConfig } = {};
-
-  /**
-   * Initialize properties used in constructor
-   */
-  logger: (msg?: string) => void;
-  currentLanguage: string;
-  DateTimeParser: DateTimeParserModule;
-  formatters: PredefinedFormatters & CustomFormatters = predefinedFormatters;
-  isCustomDateTimeParser: boolean;
-  i18nextConfig: I18NextConfig;
-  /**
-   * A valid TZ identifier string (https://en.wikipedia.org/wiki/List_of_tz_database_time_zones)
-   */
-  timezone?: string;
-
-  /**
-   * Constructor accepts following options:
-   *  - language (String) default: 'en'
-   *    Language code e.g., en, tr
-   *
-   *  - translationsForLanguage (object)
-   *    Translations object. Please check src/i18n/en.json for example.
-   *
-   *  - disableDateTimeTranslations (boolean) default: false
-   *    Disable translations for date-times
-   *
-   *  - debug (boolean) default: false
-   *    Enable debug mode in internal i18n class
-   *
-   *  - logger (function) default: () => {}
-   *    Logger function to log warnings/errors from this class
-   *
-   *  - dayjsLocaleConfigForLanguage (object) default: 'enConfig'
-   *    [Config object](https://momentjs.com/docs/#/i18n/changing-locale/) for internal moment object,
-   *    corresponding to language (param)
-   *
-   *  - DateTimeParser (function) Moment or Dayjs instance/function.
-   *    Make sure to load all the required locales in this Moment or Dayjs instance that you will be provide to Streami18n
-   *
-   * @param {*} options
-   */
-  constructor(options: Streami18nOptions = {}, i18nextConfig: Partial<I18NextConfig> = {}) {
-    const finalOptions = {
-      ...defaultStreami18nOptions,
+export class Streami18n extends CoreStreami18n<TranslationCatalog, BundledTranslationKey> {
+  constructor(options: Streami18nOptions = {}) {
+    super({
       ...options,
-    };
-
-    // Prepare the i18next configuration.
-    this.logger = finalOptions.logger;
-
-    this.currentLanguage = finalOptions.language;
-    this.DateTimeParser = finalOptions.DateTimeParser;
-    this.timezone = finalOptions.timezone;
-    this.formatters = { ...predefinedFormatters, ...options?.formatters };
-
-    try {
-      /**
-       * This is a shallow check to see if the given parser is an instance of Dayjs.
-       * For some reason Dayjs.isDayjs(this.DateTimeParser()) doesn't work.
-       */
-      if (this.DateTimeParser && isDayJs(this.DateTimeParser)) {
-        this.DateTimeParser.extend(duration);
-        this.DateTimeParser.extend(LocalizedFormat);
-        this.DateTimeParser.extend(calendar);
-        this.DateTimeParser.extend(localeData);
-        this.DateTimeParser.extend(relativeTime);
-      }
-    } catch (error) {
-      throw new Error(
-        `Streami18n: Looks like you wanted to provide a Dayjs instance but something went wrong while adding plugins ${JSON.stringify(
-          error,
-        )}`,
-      );
-    }
-
-    this.isCustomDateTimeParser = !!options.DateTimeParser;
-    const translationsForLanguage = finalOptions.translationsForLanguage;
-
-    // `en` always exists so the bundled formatter keys resolve, and so does the active language —
-    // including one nobody registered, which then renders the SDK's English copy from the inline
-    // defaults rather than dotted key paths.
-    this.ensureLanguage(defaultLng);
-    this.ensureLanguage(this.currentLanguage);
-
-    if (translationsForLanguage) {
-      this.translations[this.currentLanguage] = {
-        [defaultNS]: this.mergeWithRuntimeDefaults(this.currentLanguage, translationsForLanguage),
-      };
-      this.registeredLanguages.add(this.currentLanguage);
-    }
-
-    this.i18nextConfig = {
-      debug: finalOptions.debug,
-      fallbackLng: false,
-      interpolation: { escapeValue: false, formatSeparator: '|' },
-      keySeparator: false,
-      lng: this.currentLanguage,
-      nsSeparator: false,
-
-      parseMissingKeyHandler: (key: string, defaultValue?: string) => {
-        // i18next counts every prose key as "missing" — they render from the inline `defaultValue`
-        // at the call site, not from a resource bundle — and lets this handler's return value
-        // replace the rendered string. Returning the key unconditionally would therefore render a
-        // raw dotted path for most of the UI. A resolved default arrives as the second argument,
-        // which is how a genuinely missing key is told apart from one that simply is not bundled.
-        if (typeof defaultValue === 'string') return defaultValue;
-
-        this.logger(`Streami18n: Missing translation for key: ${key}`);
-
-        return key;
+      // Core owns the `language.*` names, since it owns the `TranslationLanguage` union they describe.
+      // Merged under this SDK's data, and the caller's over both, so an individual name stays overridable.
+      runtimeDefaults: {
+        ...languageNameDefaults,
+        ...runtimeDefaults,
+        ...options.runtimeDefaults,
       },
-      ...i18nextConfig,
-    };
-
-    // An integrator handler replaces ours wholesale, so it has to be guarded too — otherwise
-    // supplying one silently blanks every prose key.
-    if (i18nextConfig.parseMissingKeyHandler) {
-      this.i18nextConfig.parseMissingKeyHandler = guardMissingKeyHandler(
-        i18nextConfig.parseMissingKeyHandler,
-      );
-    }
-
-    this.validateCurrentLanguage();
-
-    const dayjsLocaleConfigForLanguage = finalOptions.dayjsLocaleConfigForLanguage;
-
-    if (dayjsLocaleConfigForLanguage) {
-      this.addOrUpdateLocale(this.currentLanguage, {
-        ...dayjsLocaleConfigForLanguage,
-      });
-    } else if (!this.localeExists(this.currentLanguage)) {
-      this.logger(
-        `Streami18n: Streami18n(...) - Locale config for ${this.currentLanguage} does not exist in momentjs.` +
-          `Please import the locale file using "import 'moment/locale/${this.currentLanguage}';" in your app or ` +
-          'register the locale config with Streami18n using registerTranslation(language, translation, customDayjsLocale)',
-      );
-    }
-
-    this.tDateTimeParser = (timestamp) => {
-      const language =
-        finalOptions.disableDateTimeTranslations || !this.localeExists(this.currentLanguage)
-          ? defaultLng
-          : this.currentLanguage;
-
-      // If the DateTimeParser is not a Dayjs instance, we assume it is a Moment instance.
-      if (!isDayJs(this.DateTimeParser)) {
-        return supportsTz(this.DateTimeParser) && this.timezone
-          ? this.DateTimeParser(timestamp).tz(this.timezone).locale(language)
-          : this.DateTimeParser(timestamp).locale(language);
-      }
-
-      return this.DateTimeParser(timestamp).locale(language);
-    };
-  }
-
-  /**
-   * Initializes the i18next instance with configuration (which enables natural language as default keys)
-   */
-  private async init() {
-    this.validateCurrentLanguage();
-
-    try {
-      // i18next hands back its own `TFunction`; the SDK's narrower signature is what call
-      // sites are checked against, so the cast happens once, here.
-      this.t = (await this.i18nInstance.init({
-        ...this.i18nextConfig,
-        lng: this.currentLanguage,
-        resources: this.translations,
-      })) as unknown as StreamTFunction;
-      if (this.queuedTFunctionOverride) {
-        // special case where we have a override for tFunc before initialization
-        this.t = this.queuedTFunctionOverride;
-        this.queuedTFunctionOverride = undefined;
-        this.onTFunctionOverrideListeners.forEach((listener) => listener(this.t));
-      }
-      this.initialized = true;
-      if (this.formatters) {
-        Object.entries(this.formatters).forEach(([name, formatterFactory]) => {
-          if (!formatterFactory) {
-            return;
-          }
-          this.i18nInstance.services.formatter?.add(name, formatterFactory(this));
-        });
-      }
-    } catch (error) {
-      this.logger(`Something went wrong with init: ${JSON.stringify(error)}`);
-    }
-    this.waitForInitializing = undefined;
-  }
-
-  localeExists = (language: string) => {
-    if (this.isCustomDateTimeParser) {
-      return true;
-    }
-
-    return Object.keys(Dayjs.Ls).indexOf(language) > -1;
-  };
-
-  /**
-   * Warns when the active language has no registered dictionary.
-   *
-   * Not an error, and not a reason to fall back to `en`: the language renders the SDK's English
-   * copy from the inline defaults while keeping its own date formats. Silently resetting the
-   * language instead — as this used to — discarded the integrator's choice and made the cause very
-   * hard to see.
-   */
-  validateCurrentLanguage = () => {
-    if (this.registeredLanguages.has(this.currentLanguage)) return;
-
-    this.logger(
-      `Streami18n: no translation dictionary is registered for '${this.currentLanguage}', so the ` +
-        `SDK's copy renders in English. Call ` +
-        `streami18n.registerTranslation('${this.currentLanguage}', {...}) to translate it. ` +
-        `Registered: ${[...this.registeredLanguages].join(', ')}`,
-    );
-  };
-
-  /** Returns an instance of i18next used within this class instance */
-  geti18Instance = (): I18nInstance => this.i18nInstance;
-
-  /** Returns list of available languages. */
-  getAvailableLanguages = () => Object.keys(this.translations);
-
-  /** Returns all the translation dictionary for all inbuilt-languages */
-  getTranslations = () => this.translations;
-
-  /**
-   * Returns current version translator function.
-   */
-  async getTranslators() {
-    if (!this.initialized) {
-      if (this.waitForInitializing) {
-        await this.waitForInitializing;
-      } else {
-        if (this.dayjsLocales[this.currentLanguage]) {
-          this.addOrUpdateLocale(this.currentLanguage, this.dayjsLocales[this.currentLanguage]);
-        }
-        const initPromise = this.init();
-        this.waitForInitializing = initPromise;
-        await initPromise;
-      }
-    }
-    return {
-      t: this.t,
-      tDateTimeParser: this.tDateTimeParser,
-    };
-  }
-
-  /**
-   * Register translation
-   */
-  registerTranslation(
-    language: string,
-    translation: TranslationDictionary,
-    customDayjsLocale?: DayjsLocaleConfig,
-  ) {
-    if (!translation) {
-      this.logger(
-        'Streami18n: registerTranslation(language, translation, customDayjsLocale) called without translation',
-      );
-      return;
-    }
-
-    // Merged, not replaced, so repeated calls for one language accumulate and the bundled
-    // formatter keys survive a partial dictionary.
-    const merged = this.mergeWithRuntimeDefaults(language, translation);
-    this.translations[language] = { [defaultNS]: merged };
-    this.registeredLanguages.add(language);
-
-    if (customDayjsLocale) {
-      this.dayjsLocales[language] = { ...customDayjsLocale };
-    } else if (!this.localeExists(language)) {
-      this.logger(
-        'Streami18n: registerTranslation(language, translation, customDayjsLocale) - ' +
-          `Locale config for ${language} does not exist in Dayjs.` +
-          `Please import the locale file using "import 'dayjs/locale/${language}';" in your app or ` +
-          'register the locale config with Streami18n using registerTranslation(language, translation, customDayjsLocale)',
-      );
-    }
-
-    if (this.initialized) {
-      // `merged`, not `translation`: for a language registered after init this is the only write
-      // into i18next's store, so passing the partial would leave `runtimeDefaults` absent there.
-      this.i18nInstance.addResources(language, defaultNS, merged);
-    }
-  }
-
-  addOrUpdateLocale(key: string, config: DayjsLocaleConfig) {
-    if (this.localeExists(key)) {
-      Dayjs.updateLocale(key, { ...config });
-    } else {
-      // Merging the custom locale config with en config, so missing keys can default to english.
-      Dayjs.locale({ name: key, ...en_locale, ...config }, undefined, true);
-    }
-  }
-
-  /**
-   * Changes the language.
-   * Note: if you are using overrideTFunction, you will need to call the override again after changing the language.
-   */
-  async setLanguage(language: string) {
-    this.currentLanguage = language;
-    this.ensureLanguage(language);
-
-    if (!this.initialized) {
-      return;
-    }
-
-    this.validateCurrentLanguage();
-
-    try {
-      const t = (await this.i18nInstance.changeLanguage(language)) as unknown as StreamTFunction;
-      if (this.dayjsLocales[language]) {
-        this.addOrUpdateLocale(this.currentLanguage, this.dayjsLocales[this.currentLanguage]);
-      }
-      this.t = t;
-      this.onLanguageChangeListeners.forEach((listener) => listener(t));
-
-      return t;
-    } catch (error) {
-      this.logger(`Failed to set language: ${JSON.stringify(error)}`);
-      return this.t;
-    }
-  }
-
-  addOnLanguageChangeListener(callback: (t: StreamTFunction) => void) {
-    this.onLanguageChangeListeners.push(callback);
-    return {
-      unsubscribe: () => {
-        this.onLanguageChangeListeners = this.onLanguageChangeListeners.filter(
-          (listener) => listener !== callback,
-        );
-      },
-    };
-  }
-
-  addOnTFunctionOverrideListener(callback: (t: StreamTFunction) => void) {
-    this.onTFunctionOverrideListeners.push(callback);
-    return {
-      unsubscribe: () => {
-        this.onTFunctionOverrideListeners = this.onTFunctionOverrideListeners.filter(
-          (listener) => listener !== callback,
-        );
-      },
-    };
-  }
-
-  overrideTFunction(tFunction: StreamTFunction) {
-    if (!this.initialized) {
-      this.queuedTFunctionOverride = tFunction;
-    } else {
-      this.t = tFunction;
-      this.onTFunctionOverrideListeners.forEach((listener) => listener(tFunction));
-    }
+    });
   }
 }
diff --git a/package/src/utils/i18n/calendarFormats.ts b/package/src/utils/i18n/calendarFormats.ts
deleted file mode 100644
index c00f3b88b9..0000000000
--- a/package/src/utils/i18n/calendarFormats.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { CalendarFormats } from './Streami18n';
-
-/**
- * Calendar wording for the bundled locale.
- *
- * Only English ships. A language registered by an integrator supplies its own wording through
- * `dayjsLocaleConfigForLanguage` (or `registerTranslation`'s third argument) — the per-locale
- * blocks that used to live here were useless on their own once the matching `dayjs/locale/xx`
- * stopped being bundled with them.
- */
-export const calendarFormats: Record<string, CalendarFormats> = {
-  en: {
-    lastDay: '[Yesterday]',
-    lastWeek: 'dddd',
-    nextDay: '[Tomorrow]',
-    nextWeek: 'dddd [at] LT',
-    sameDay: '[Today]',
-    sameElse: 'L',
-  },
-};
diff --git a/package/src/utils/i18n/getDateString.ts b/package/src/utils/i18n/getDateString.ts
deleted file mode 100644
index 3acd3a53b4..0000000000
--- a/package/src/utils/i18n/getDateString.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import { calendarFormats } from './calendarFormats';
-import { TimestampFormatterOptions } from './types';
-
-import { TranslatorFunctions } from '../../contexts/translationContext';
-import { isDayOrMoment } from '../../contexts/translationContext/isDayOrMoment';
-import { asDynamicKey } from '../../i18n/utils';
-
-type DateFormatterOptions = TimestampFormatterOptions &
-  Partial<TranslatorFunctions> & {
-    /**
-     * The timestamp to be formatted.
-     */
-    date?: string | Date;
-    /*
-     * Lookup key in the language corresponding translations sheet to perform date formatting
-     */
-    timestampTranslationKey?: string;
-  };
-
-export const noParsingFunctionWarning =
-  'MessageTimestamp was called but there is no datetime parsing function available';
-
-/**
- * Utility function to format the date string.
- */
-export function getDateString({
-  calendar,
-  calendarFormats,
-  date,
-  format,
-  t,
-  tDateTimeParser,
-  timestampTranslationKey,
-}: DateFormatterOptions): string | number | undefined {
-  if (!date || (typeof date === 'string' && !Date.parse(date))) {
-    return;
-  }
-
-  if (!tDateTimeParser) {
-    console.log(noParsingFunctionWarning);
-    return;
-  }
-
-  if (t && timestampTranslationKey) {
-    const options: TimestampFormatterOptions = {};
-    if (typeof calendar !== 'undefined' && calendar !== null) {
-      options.calendar = calendar;
-    }
-    if (typeof calendarFormats !== 'undefined' && calendarFormats !== null) {
-      options.calendarFormats = calendarFormats;
-    }
-    if (typeof format !== 'undefined' && format !== null) {
-      options.format = format;
-    }
-    // The key arrives as a prop value, so it is only known at runtime.
-    const translatedTimestamp = t(asDynamicKey(timestampTranslationKey), {
-      ...options,
-      timestamp: new Date(date),
-    });
-    const translationKeyFound = timestampTranslationKey !== translatedTimestamp;
-    if (translationKeyFound) {
-      return translatedTimestamp;
-    }
-  }
-
-  const parsedTime = tDateTimeParser(date);
-
-  if (isDayOrMoment(parsedTime)) {
-    /**
-     * parsedTime.calendar is guaranteed on the type but is only
-     * available when a user calls dayjs.extend(calendar)
-     */
-    return calendar && parsedTime.calendar
-      ? parsedTime.calendar(undefined, calendarFormats)
-      : parsedTime.format(format);
-  }
-
-  return new Date(date).toDateString();
-}
-
-type DateStringForA11yOptions = {
-  /**
-   * Optional calendar-format overrides applied on top of the locale defaults
-   * and the SDK's `sameElse: 'LL'` substitution. Use this when the visible
-   * date format diverges from the locale defaults (e.g. ChannelPreviewStatus
-   * uses `sameDay: 'LT'` to show the time instead of "Today").
-   */
-  calendarFormatOverrides?: Partial<{
-    lastDay: string;
-    lastWeek: string;
-    nextDay: string;
-    nextWeek: string;
-    sameDay: string;
-    sameElse: string;
-  }>;
-  date?: string | Date;
-  tDateTimeParser?: TranslatorFunctions['tDateTimeParser'];
-  /**
-   * The UI language, used to pick calendar wording. Plain `string`: this indexes
-   * `calendarFormats`, which an integrator extends for whatever language they registered — it is
-   * not `stream-chat`'s auto-translation union.
-   */
-  userLanguage?: string;
-};
-
-/**
- * Produce a TTS-friendly calendar string. iOS VoiceOver reads numeric dates
- * like "04/08/2026" character-by-character; substituting `LL` ("April 8, 2026")
- * for the calendar `sameElse` slot fixes that. The relative slots
- * (sameDay/lastDay/nextDay/lastWeek/nextWeek) are preserved from the locale,
- * so "Today"/"Yesterday"/weekday names still come through.
- */
-export const getDateStringForA11y = ({
-  calendarFormatOverrides,
-  date,
-  tDateTimeParser,
-  userLanguage,
-}: DateStringForA11yOptions): string | undefined => {
-  if (!date || (typeof date === 'string' && !Date.parse(date))) {
-    return undefined;
-  }
-  if (!tDateTimeParser) {
-    return undefined;
-  }
-
-  const parsedTime = tDateTimeParser(date);
-  if (!isDayOrMoment(parsedTime) || !parsedTime.calendar) {
-    return undefined;
-  }
-
-  const localeFormats = (userLanguage && calendarFormats[userLanguage]) || calendarFormats.en;
-
-  return parsedTime.calendar(undefined, {
-    ...localeFormats,
-    sameElse: 'LL',
-    ...calendarFormatOverrides,
-  });
-};
diff --git a/package/src/utils/i18n/predefinedFormatters.ts b/package/src/utils/i18n/predefinedFormatters.ts
deleted file mode 100644
index cfdfa8989e..0000000000
--- a/package/src/utils/i18n/predefinedFormatters.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-import { isDayjs } from 'dayjs';
-
-import type { Duration as DayjsDuration } from 'dayjs/plugin/duration';
-
-import { getDateString } from './getDateString';
-import { DurationFormatterOptions, PredefinedFormatters, TimestampFormatterOptions } from './types';
-
-import { isDayOrMoment } from '../../contexts/translationContext/isDayOrMoment';
-
-export const predefinedFormatters: PredefinedFormatters = {
-  durationFormatter:
-    (streamI18n) =>
-    (value, _, { format, withSuffix }: DurationFormatterOptions) => {
-      if (format && isDayjs(streamI18n.DateTimeParser)) {
-        return (streamI18n.DateTimeParser.duration(value) as DayjsDuration).format(format);
-      }
-      return streamI18n.DateTimeParser.duration(value).humanize(!!withSuffix);
-    },
-  timestampFormatter:
-    (streamI18n) =>
-    (
-      value,
-      _,
-      {
-        calendarFormats,
-        ...options
-      }: Pick<TimestampFormatterOptions, 'calendar' | 'format'> & {
-        calendarFormats?: Record<string, string> | string;
-      },
-    ) => {
-      let parsedCalendarFormats;
-      try {
-        if (!options.calendar) {
-          parsedCalendarFormats = {};
-        } else if (typeof calendarFormats === 'string') {
-          parsedCalendarFormats = JSON.parse(calendarFormats);
-        } else if (typeof calendarFormats === 'object') {
-          parsedCalendarFormats = calendarFormats;
-        }
-      } catch (e) {
-        console.error('[TIMESTAMP FORMATTER]', e);
-      }
-
-      const result = getDateString({
-        ...options,
-        calendarFormats: parsedCalendarFormats,
-        date: value,
-        tDateTimeParser: streamI18n.tDateTimeParser,
-      });
-      if (!result || typeof result === 'number') {
-        return JSON.stringify(value);
-      }
-      return result;
-    },
-  fromNowFormatter:
-    (streamI18n) =>
-    (value, _, { withSuffix }: { withSuffix?: boolean } = {}) => {
-      const parsedTime = streamI18n.tDateTimeParser(value);
-      if (!isDayOrMoment(parsedTime) || typeof parsedTime.fromNow !== 'function') {
-        return JSON.stringify(value);
-      }
-      // fromNow(withoutSuffix); default to including the "ago" suffix
-      return parsedTime.fromNow(withSuffix === false);
-    },
-  relativeCompactDateFormatter: (streamI18n) => (value) => {
-    if (value === undefined || value === null) {
-      return JSON.stringify(value);
-    }
-    const parsedTime = streamI18n.tDateTimeParser(value);
-    const parsedNow = streamI18n.tDateTimeParser();
-
-    if (!isDayOrMoment(parsedTime) || !isDayOrMoment(parsedNow)) {
-      return JSON.stringify(value);
-    }
-
-    const oneDayInMs = 24 * 60 * 60 * 1000;
-    const startOfNowDayMs = parsedNow.startOf('day').valueOf();
-    const startOfTimeDayMs = parsedTime.startOf('day').valueOf();
-    const daysAgo = Math.floor((startOfNowDayMs - startOfTimeDayMs) / oneDayInMs);
-
-    if (daysAgo <= 0) {
-      return 'Today';
-    }
-    if (daysAgo === 1) {
-      return 'Yesterday';
-    }
-    if (daysAgo <= 6) {
-      return `${daysAgo}d ago`;
-    }
-
-    const weeksAgo = Math.floor(daysAgo / 7);
-    if (weeksAgo <= 3) {
-      return `${weeksAgo}w ago`;
-    }
-
-    return parsedTime.format('DD/MM/YY');
-  },
-};
diff --git a/package/src/utils/i18n/types.ts b/package/src/utils/i18n/types.ts
deleted file mode 100644
index ca271dc0a6..0000000000
--- a/package/src/utils/i18n/types.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { Streami18n } from './Streami18n';
-
-export type FormatterFactory<V> = (
-  streamI18n: Streami18n,
-) => (value: V, lng: string | undefined, options: Record<string, unknown>) => string;
-
-// Here is any used, because we do not want to enforce any specific rules and
-// want to leave the type declaration to the integrator
-/* eslint-disable-next-line  @typescript-eslint/no-explicit-any */
-export type CustomFormatters = Record<string, FormatterFactory<any>>;
-
-/**
- * import dayjs from 'dayjs';
- * import duration from 'dayjs/plugin/duration';
- *
- * dayjs.extend(duration);
- *
- * // Basic formatting
- * dayjs.duration(1000).format('HH:mm:ss'); // "00:00:01"
- * dayjs.duration(3661000).format('HH:mm:ss'); // "01:01:01"
- *
- * // Different format tokens
- * dayjs.duration(3661000).format('D[d] H[h] m[m] s[s]'); // "0d 1h 1m 1s"
- * dayjs.duration(3661000).format('D [days] H [hours] m [minutes] s [seconds]'); // "0 days 1 hours 1 minutes 1 seconds"
- *
- * // Zero padding
- * dayjs.duration(1000).format('HH:mm:ss'); // "00:00:01"
- * dayjs.duration(1000).format('H:m:s'); // "0:0:1"
- *
- * // Different units
- * dayjs.duration(3661000).format('D'); // "0"
- * dayjs.duration(3661000).format('H'); // "1"
- * dayjs.duration(3661000).format('m'); // "1"
- * dayjs.duration(3661000).format('s'); // "1"
- *
- * // Complex examples
- * dayjs.duration(3661000).format('DD:HH:mm:ss'); // "00:01:01:01"
- * dayjs.duration(3661000).format('D [days] HH:mm:ss'); // "0 days 01:01:01"
- * dayjs.duration(3661000).format('H[h] m[m] s[s]'); // "1h 1m 1s"
- *
- * // Negative durations
- * dayjs.duration(-3661000).format('HH:mm:ss'); // "-01:01:01"
- *
- * // Long durations
- * dayjs.duration(86400000).format('D [days]'); // "1 days"
- * dayjs.duration(2592000000).format('M [months]'); // "30 months"
- *
- *
- * Format tokens:
- * D - days
- * H - hours
- * m - minutes
- * s - seconds
- * S - milliseconds
- * M - months
- * Y - years
- * You can also use:
- * HH, mm, ss for zero-padded numbers
- * [text] for literal text
- */
-export type DurationFormatterOptions = {
-  format?: string;
-  withSuffix?: boolean;
-};
-
-export type TimestampFormatterOptions = {
-  /* If true, call the `Day.js` calendar function to get the date string to display (e.g. "Yesterday at 3:58 PM"). */
-  calendar?: boolean | null;
-  /* Object specifying date display formats for dates formatted with calendar extension. Active only if calendar prop enabled. */
-  calendarFormats?: Record<string, string>;
-  /* Overrides the default timestamp format if calendar is disabled. */
-  format?: string;
-  /* If true, the formatter will return a humanized string with suffix (e.g. "in 5 minutes" or "5 minutes ago"). */
-  withSuffix?: boolean;
-};
-
-export type PredefinedFormatters = {
-  durationFormatter: FormatterFactory<string>;
-  fromNowFormatter: FormatterFactory<string | Date>;
-  relativeCompactDateFormatter: FormatterFactory<string | Date>;
-  timestampFormatter: FormatterFactory<string | Date>;
-};