@oxyhq/services 19.2.0 → 20.0.0

package/lib/typescript/module/ui/screens/fileManagement/hooks/useFileUploadState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFileUploadState.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/screens/fileManagement/hooks/useFileUploadState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,EAAE,aAAa,EAAE,MAAM,iDAA8C,CAAC;AAE7E,OAAO,EACH,KAAK,iBAAiB,EAQzB,MAAM,cAAW,CAAC;AAEnB,8EAA8E;AAC9E,MAAM,WAAW,wBAAwB;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IACrD,iBAAiB,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACrD,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACvC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAClE,SAAS,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACtF,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAC;CACtE;AAED,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAClC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,mBAAmB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,sKAchC,wBAAwB,KAAG,wBA4a7B,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"useFileUploadState.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/screens/fileManagement/hooks/useFileUploadState.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,OAAO,KAAK,EAAoB,YAAY,EAAE,MAAM,aAAa,CAAC;AAElE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iDAA8C,CAAC;AAElF,OAAO,EACH,KAAK,iBAAiB,EAQzB,MAAM,cAAW,CAAC;AAEnB,8EAA8E;AAC9E,MAAM,WAAW,wBAAwB;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IACrD,iBAAiB,EAAE,SAAS,GAAG,QAAQ,GAAG,UAAU,CAAC;IACrD,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,OAAO,GAAG,MAAM,GAAG,MAAM,CAAC;IACvC,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,YAAY,KAAK,IAAI,CAAC;IACxC,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;IACrB,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,cAAc,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAClE,SAAS,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IACtF,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,KAAK,MAAM,CAAC;CACtE;AAED,mDAAmD;AACnD,MAAM,WAAW,wBAAwB;IACrC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,YAAY,EAAE,iBAAiB,EAAE,CAAC;IAClC,iBAAiB,EAAE,OAAO,CAAC;IAC3B,gBAAgB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACtC,mBAAmB,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IACzC,kBAAkB,EAAE,MAAM,IAAI,CAAC;IAC/B,iBAAiB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9C;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,sKAchC,wBAAwB,KAAG,wBA4a7B,CAAC;AAEF,eAAe,kBAAkB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxyhq/services",
-  "version": "19.2.0",
+  "version": "20.0.0",
   "description": "OxyHQ Expo/React Native SDK — UI components, screens, and native features",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -126,24 +126,16 @@
     }
   },
   "dependencies": {
-    "@oxyhq/contracts": "0.13.2",
+    "@oxyhq/contracts": "0.14.0",
+    "@oxyhq/core": "^10.0.0",
     "color": "^4.2.3"
   },
   "devDependencies": {
-    "@oxyhq/core": "9.2.4",
-    "nativewind": "5.0.0-preview.3",
-    "react-native-css": "^3.0.0",
-    "@react-native-async-storage/async-storage": "^2.0.0",
-    "@types/react": "*",
-    "copyfiles": "^2.4.1",
-    "react-native-keyboard-controller": "1.21.13",
-    "react-native-qrcode-svg": "^6.3.0",
-    "socket.io-client": "^4.8.1",
-    "typescript": "^5.9.2",
-    "zustand": "^5.0.14",
     "@biomejs/biome": "^1.9.4",
     "@commitlint/cli": "^17.6.5",
     "@commitlint/config-conventional": "^17.6.5",
+    "@oxyhq/core": "10.0.0",
+    "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^11.4.1",
     "@react-native/babel-preset": "^0.86.0",
     "@release-it/conventional-changelog": "^10.0.2",
@@ -155,6 +147,8 @@
     "@types/color": "^4.2.1",
     "@types/jest": "^29.5.14",
     "@types/node": "^20.19.9",
+    "@types/react": "*",
+    "copyfiles": "^2.4.1",
     "expo-file-system": "~57.0.0",
     "expo-font": "~57.0.0",
     "expo-haptics": "~57.0.0",
@@ -163,18 +157,25 @@
     "husky": "^4.3.8",
     "jest": "~29.7.0",
     "lint-staged": "^15.2.4",
+    "nativewind": "5.0.0-preview.3",
     "react-native-builder-bob": "^0.43.0",
+    "react-native-css": "^3.0.0",
     "react-native-gesture-handler": "~2.32.0",
+    "react-native-keyboard-controller": "1.21.13",
+    "react-native-qrcode-svg": "^6.3.0",
     "react-native-reanimated": "4.5.0",
     "react-native-safe-area-context": "~5.8.0",
     "react-native-svg": "15.15.5",
     "release-it": "^19.0.6",
-    "ts-jest": "^29.4.0"
+    "socket.io-client": "^4.8.1",
+    "ts-jest": "^29.4.0",
+    "typescript": "^5.9.2",
+    "zustand": "^5.0.14"
   },
   "peerDependencies": {
     "@expo/vector-icons": "^15.0.3",
     "@oxyhq/bloom": ">=0.16.0",
-    "@oxyhq/core": "^9.2.3",
+    "@oxyhq/core": "^10.0.0",
     "@react-native-async-storage/async-storage": "^2.0.0",
     "@react-native-community/netinfo": "^11.4.1",
     "@tanstack/query-async-storage-persister": "^5.101",
@@ -192,6 +193,7 @@
     "expo-image": ">=2.0.0",
     "expo-image-manipulator": ">=56.0.0",
     "expo-linear-gradient": ">=56.0.0",
+    "nativewind": ">=5.0.0",
     "react": ">=18.0.0",
     "react-native": ">=0.85.0",
     "react-native-gesture-handler": "~2.32.0",
@@ -201,8 +203,7 @@
     "react-native-safe-area-context": "~5.8.0",
     "react-native-svg": ">=15.15.0",
     "socket.io-client": "^4.8.0",
-    "zustand": "^5.0.0",
-    "nativewind": ">=5.0.0"
+    "zustand": "^5.0.0"
   },
   "peerDependenciesMeta": {
     "nativewind": {

package/src/ui/components/FollowButton.tsx

@@ -1,8 +1,9 @@
-import React, { useEffect, useCallback, useMemo, useState, memo } from 'react';
-import {
-  type ViewStyle,
-  type TextStyle,
-  type StyleProp,
+import type React from 'react';
+import { useEffect, useCallback, useMemo, useState, memo } from 'react';
+import type {
+  ViewStyle,
+  TextStyle,
+  StyleProp,
 } from 'react-native';
 import { useOxy } from '../context/OxyContext';
 import { toast } from '@oxyhq/bloom';

package/src/ui/components/OxyPayButton.tsx

@@ -1,5 +1,5 @@
 import type React from 'react';
-import { type ViewStyle, type TextStyle, type StyleProp } from 'react-native';
+import type { ViewStyle, TextStyle, StyleProp } from 'react-native';
 import { useTheme } from '@oxyhq/bloom/theme';
 import { Button } from '@oxyhq/bloom/button';
 import type { PaymentItem, PaymentGatewayResult } from '../screens/PaymentGatewayScreen';

package/src/ui/components/SettingsIcon.tsx

@@ -1,4 +1,5 @@
-import React, { memo } from 'react';
+import type React from 'react';
+import { memo } from 'react';
 import { View, StyleSheet } from 'react-native';
 import { MaterialCommunityIcons } from '@expo/vector-icons';
 import { darkenColor } from '../utils/colorUtils';

package/src/ui/components/logo/LogoIcon.tsx

@@ -1,4 +1,5 @@
-import React, { type ReactElement } from 'react';
+import type React from 'react';
+import type { ReactElement } from 'react';
 import Svg, { ClipPath, Defs, G, Path } from 'react-native-svg';
 import type { ViewStyle } from 'react-native';
 import { useTheme } from '@oxyhq/bloom/theme';

package/src/ui/components/logo/LogoText.tsx

@@ -1,4 +1,5 @@
-import React, { type ReactElement } from 'react';
+import type React from 'react';
+import type { ReactElement } from 'react';
 import Svg, { G, Path } from 'react-native-svg';
 import type { ViewStyle } from 'react-native';
 import { useTheme } from '@oxyhq/bloom/theme';

package/src/ui/context/OxyContext.tsx

@@ -56,11 +56,11 @@ import {
   activeUserOf,
   accountIdsOf,
 } from '../session';
-import {
-  type OxyContextState,
-  type PasswordSignInResult,
-  type OxyContextProviderProps,
-  type CommitInput,
+import type {
+  OxyContextState,
+  PasswordSignInResult,
+  OxyContextProviderProps,
+  CommitInput,
 } from './oxyContextTypes';
 import { DEFAULT_SESSION_VALIDITY_MS, loadUseFollowHook } from './oxyContextHelpers';
 import { commitDeviceSetAndResolve } from './commitSessionFlow';
@@ -210,14 +210,15 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
 
   const {
     currentLanguage,
+    languages: currentLanguages,
     metadata: currentLanguageMetadata,
     languageName: currentLanguageName,
     nativeLanguageName: currentNativeLanguageName,
     setLanguage,
-    applyLanguagePreference,
   } = useLanguageManagement({
     storage,
     languageKey: storageKeys.language,
+    user,
     onError,
     logger,
   });
@@ -238,7 +239,6 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     storageKeyPrefix,
     loginSuccess,
     logoutStore,
-    applyLanguagePreference,
     onAuthStateChange,
     onError,
     setAuthError: (message) => setAuthState({ error: message }),
@@ -376,7 +376,6 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
     switchSession,
     sessionClient,
     syncFromClient,
-    applyLanguagePreference,
     onAuthStateChange,
     onError,
     loginSuccess,
@@ -873,6 +872,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
       isStorageReady: storage !== null,
       error,
       currentLanguage,
+      currentLanguages,
       currentLanguageMetadata,
       currentLanguageName,
       currentNativeLanguageName,
@@ -924,6 +924,7 @@ export const OxyProvider: React.FC<OxyContextProviderProps> = ({
       storage,
       error,
       currentLanguage,
+      currentLanguages,
       currentLanguageMetadata,
       currentLanguageName,
       currentNativeLanguageName,
@@ -992,10 +993,11 @@ const LOADING_STATE: OxyContextState = {
   isAuthResolved: false,
   isStorageReady: false,
   error: null,
-  currentLanguage: 'en',
+  currentLanguage: 'en-US',
+  currentLanguages: [],
   currentLanguageMetadata: null,
-  currentLanguageName: 'English',
-  currentNativeLanguageName: 'English',
+  currentLanguageName: 'English (United States)',
+  currentNativeLanguageName: 'English (United States)',
   hasIdentity: () => Promise.resolve(false),
   getPublicKey: () => Promise.resolve(null),
   signIn: () => rejectMissingProvider<User>(),

package/src/ui/context/hooks/useAuthOperations.ts

@@ -36,7 +36,6 @@ export interface UseAuthOperationsOptions {
   sessionClient: SessionClient;
   /** Reprojects `sessionClient.getState()` onto sessions/activeSessionId/user (Task 1's callback). Awaited after a partial `signOut` so the exposed state reflects the server truth before the call resolves. */
   syncFromClient: () => Promise<void>;
-  applyLanguagePreference: (user: User) => Promise<void>;
   onAuthStateChange?: (user: User | null) => void;
   onError?: (error: ApiError) => void;
   loginSuccess: (user: User) => void;
@@ -91,7 +90,6 @@ export const useAuthOperations = ({
   switchSession,
   sessionClient,
   syncFromClient,
-  applyLanguagePreference,
   onAuthStateChange,
   onError,
   loginSuccess,
@@ -219,14 +217,12 @@ export const useAuthOperations = ({
       await saveActiveSessionId(sessionResponse.sessionId);
       updateSessions(allDeviceSessions, { merge: true });
 
-      await applyLanguagePreference(fullUser);
       loginSuccess(fullUser);
       onAuthStateChange?.(fullUser);
-      
+
       return fullUser;
     },
     [
-      applyLanguagePreference,
       logger,
       loginSuccess,
       onAuthStateChange,

package/src/ui/context/oxyContextTypes.ts

@@ -28,7 +28,10 @@ export interface OxyContextState {
   isAuthResolved: boolean;
   isStorageReady: boolean;
   error: string | null;
+  /** Active UI locale (`language-REGION`): the account's primary locale when signed in, else the guest/device locale. */
   currentLanguage: string;
+  /** Ordered account locales (primary first) when signed in, or the single guest override when signed out. */
+  currentLanguages: string[];
   currentLanguageMetadata: ReturnType<typeof useLanguageManagement>['metadata'];
   currentLanguageName: string;
   currentNativeLanguageName: string;

package/src/ui/hooks/useFollow.ts

@@ -2,7 +2,7 @@ import { useCallback, useMemo } from 'react';
 import { useQuery } from '@tanstack/react-query';
 import { useFollowStore } from '../stores/followStore';
 import { useOxy } from '../context/OxyContext';
-import { type OxyServices, type BulkFollowResult, type BulkUnfollowResult } from '@oxyhq/core';
+import type { OxyServices, BulkFollowResult, BulkUnfollowResult } from '@oxyhq/core';
 import { useShallow } from 'zustand/react/shallow';
 import { queryKeys } from './queries/queryKeys';
 

package/src/ui/hooks/useLanguageManagement.ts

@@ -1,11 +1,15 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import type { ApiError, User } from '@oxyhq/core';
+import type { ApiError, User, SupportedLanguage } from '@oxyhq/core';
 import {
+  FALLBACK_LOCALE,
+  SUPPORTED_LANGUAGES,
+  getBaseLanguage,
   getLanguageMetadata,
   getLanguageName,
   getNativeLanguageName,
-  normalizeLanguageCode,
-  type LanguageMetadata,
+  getPrimaryLanguage,
+  getUserLanguages,
+  normalizeLocale,
 } from '@oxyhq/core';
 import type { StorageInterface } from '../utils/storageHelpers';
 import { extractErrorMessage } from '../utils/errorHandlers';
@@ -13,34 +17,143 @@ import { extractErrorMessage } from '../utils/errorHandlers';
 export interface UseLanguageManagementOptions {
   storage: StorageInterface | null;
   languageKey: string;
+  /**
+   * The active account, when signed in. When present, the account's primary
+   * locale (`languages[0]`) is authoritative for the app's UI locale; when
+   * `null` the device locale (or a locally-chosen guest override) is used.
+   */
+  user: User | null;
   onError?: (error: ApiError) => void;
   logger?: (message: string, error?: unknown) => void;
 }
 
 export interface UseLanguageManagementResult {
+  /**
+   * The active UI locale (a canonical `language-REGION` tag). Derived, never
+   * stored: the account's primary locale when signed in, otherwise the
+   * locally-chosen guest override, otherwise the device locale.
+   */
   currentLanguage: string;
-  metadata: LanguageMetadata | null;
+  /**
+   * The ordered account locales (primary first) when signed in, or the single
+   * guest override when signed out. Empty only before the guest override loads
+   * and no device locale resolves.
+   */
+  languages: string[];
+  metadata: SupportedLanguage | null;
   languageName: string;
   nativeLanguageName: string;
-  setLanguage: (languageId: string) => Promise<void>;
-  applyLanguagePreference: (user: User | null) => Promise<void>;
+  /**
+   * Persist a single locally-owned locale (guest / device override) and mark it
+   * primary. For signed-in accounts, locale changes are written to the account
+   * (`updateProfile({ languages })`) instead — the derived `currentLanguage`
+   * then follows the refreshed `user`.
+   */
+  setLanguage: (locale: string) => Promise<void>;
   hydrateLanguage: () => Promise<void>;
 }
 
-const DEFAULT_LANGUAGE = 'en-US';
+/**
+ * Append `locale` to an ordered locale list if not already present. Canonical
+ * order is preserved; the new locale lands last (non-primary).
+ */
+export function addLocale(languages: readonly string[], locale: string): string[] {
+  const canonical = normalizeLocale(locale);
+  if (!canonical) return [...languages];
+  if (languages.includes(canonical)) return [...languages];
+  return [...languages, canonical];
+}
+
+/**
+ * Remove `locale` from an ordered locale list. The list's new first element
+ * becomes the primary locale.
+ */
+export function removeLocale(languages: readonly string[], locale: string): string[] {
+  const canonical = normalizeLocale(locale);
+  if (!canonical) return [...languages];
+  return languages.filter((entry) => entry !== canonical);
+}
+
+/**
+ * Move `locale` to the front of an ordered locale list, making it primary.
+ * Adds it if it was not already present.
+ */
+export function setPrimaryLocale(languages: readonly string[], locale: string): string[] {
+  const canonical = normalizeLocale(locale);
+  if (!canonical) return [...languages];
+  return [canonical, ...languages.filter((entry) => entry !== canonical)];
+}
+
+/**
+ * Resolve the device/browser locale, mapped to a supported catalog locale.
+ *
+ * Reads the platform's ordered locale preferences (`navigator.languages` /
+ * `navigator.language` on web, `Intl.DateTimeFormat().resolvedOptions().locale`
+ * on Hermes) and returns the first that resolves to a supported locale —
+ * either exactly or by base-language match (`fr-BE` → `fr-FR`). Falls back to
+ * {@link FALLBACK_LOCALE} when nothing resolves. Pure and side-effect free.
+ */
+function resolveDeviceLocale(): string {
+  const candidates: string[] = [];
+
+  if (typeof navigator !== 'undefined') {
+    const nav = navigator as Navigator & { languages?: readonly string[] };
+    if (Array.isArray(nav.languages)) {
+      candidates.push(...nav.languages);
+    }
+    if (typeof nav.language === 'string') {
+      candidates.push(nav.language);
+    }
+  }
+
+  try {
+    const intlLocale = Intl.DateTimeFormat().resolvedOptions().locale;
+    if (intlLocale) {
+      candidates.push(intlLocale);
+    }
+  } catch {
+    // Intl is unavailable or incomplete on this runtime — fall through to the
+    // navigator-provided candidates (or the fallback locale below).
+  }
+
+  for (const candidate of candidates) {
+    const exact = normalizeLocale(candidate);
+    if (exact) return exact;
+    const base = getBaseLanguage(candidate);
+    const byBase = SUPPORTED_LANGUAGES.find((entry) => entry.language === base);
+    if (byBase) return byBase.code;
+  }
+
+  return FALLBACK_LOCALE;
+}
 
 /**
- * Manage UI language state, persistence, and metadata derivation.
+ * Resolve and manage the app's active UI locale.
+ *
+ * The active locale is DERIVED, not stored:
+ *  - Signed in  → the account's primary locale (`getPrimaryLanguage(user)`),
+ *    falling back to {@link FALLBACK_LOCALE}. This is what makes every Oxy app
+ *    follow the account's language automatically.
+ *  - Signed out → a locally-chosen guest override if one exists, otherwise the
+ *    device locale.
  *
- * @param options - Configuration for storage access and error reporting
+ * The only external system this hook synchronizes with is local storage (the
+ * guest override), which is loaded once on mount.
  */
 export const useLanguageManagement = ({
   storage,
   languageKey,
+  user,
   onError,
   logger,
 }: UseLanguageManagementOptions): UseLanguageManagementResult => {
-  const [currentLanguage, setCurrentLanguage] = useState<string>(DEFAULT_LANGUAGE);
+  // The device locale is fixed for the lifetime of the runtime.
+  const deviceLanguage = useMemo(resolveDeviceLocale, []);
+
+  // The locally-owned guest override (a single locale). `null` until loaded
+  // from storage or explicitly set; the derived locale falls back to the device
+  // locale while it is `null`.
+  const [guestLanguage, setGuestLanguage] = useState<string | null>(null);
 
   const loadLanguageFromStorage = useCallback(async (): Promise<void> => {
     if (!storage) {
@@ -49,9 +162,9 @@ export const useLanguageManagement = ({
 
     try {
       const savedLanguageRaw = await storage.getItem(languageKey);
-      const normalized = normalizeLanguageCode(savedLanguageRaw) || savedLanguageRaw;
+      const normalized = savedLanguageRaw ? normalizeLocale(savedLanguageRaw) : undefined;
       if (normalized) {
-        setCurrentLanguage(normalized);
+        setGuestLanguage(normalized);
       }
     } catch (error) {
       const message = extractErrorMessage(error, 'Failed to load language preference');
@@ -77,16 +190,19 @@ export const useLanguageManagement = ({
   }, [loadLanguageFromStorage, logger]);
 
   const setLanguage = useCallback(
-    async (languageId: string): Promise<void> => {
+    async (locale: string): Promise<void> => {
       if (!storage) {
         throw new Error('Storage not initialized');
       }
 
-      const normalized = normalizeLanguageCode(languageId) || languageId;
+      const normalized = normalizeLocale(locale);
+      if (!normalized) {
+        throw new Error(`Unsupported locale: ${locale}`);
+      }
 
       try {
         await storage.setItem(languageKey, normalized);
-        setCurrentLanguage(normalized);
+        setGuestLanguage(normalized);
       } catch (error) {
         const message = extractErrorMessage(error, 'Failed to save language preference');
         onError?.({
@@ -105,31 +221,19 @@ export const useLanguageManagement = ({
     [languageKey, logger, onError, storage],
   );
 
-  const applyLanguagePreference = useCallback(
-    async (user: User | null): Promise<void> => {
-      if (!storage || !user) {
-        return;
-      }
-
-      const userLanguage = (user as Record<string, unknown>)?.language as string | undefined;
-      if (!userLanguage) {
-        return;
-      }
+  const languages = useMemo<string[]>(() => {
+    if (user) {
+      return getUserLanguages(user);
+    }
+    return guestLanguage ? [guestLanguage] : [];
+  }, [user, guestLanguage]);
 
-      try {
-        const normalized = normalizeLanguageCode(userLanguage) || userLanguage;
-        await storage.setItem(languageKey, normalized);
-        setCurrentLanguage(normalized);
-      } catch (error) {
-        if (logger) {
-          logger('Failed to apply server language preference', error);
-        } else if (__DEV__) {
-          console.warn('Failed to apply server language preference', error);
-        }
-      }
-    },
-    [languageKey, logger, storage],
-  );
+  const currentLanguage = useMemo<string>(() => {
+    if (user) {
+      return getPrimaryLanguage(user) ?? FALLBACK_LOCALE;
+    }
+    return guestLanguage ?? deviceLanguage;
+  }, [user, guestLanguage, deviceLanguage]);
 
   const metadata = useMemo(() => getLanguageMetadata(currentLanguage), [currentLanguage]);
   const languageName = useMemo(() => getLanguageName(currentLanguage), [currentLanguage]);
@@ -140,13 +244,11 @@ export const useLanguageManagement = ({
 
   return {
     currentLanguage,
+    languages,
     metadata,
     languageName,
     nativeLanguageName,
     setLanguage,
-    applyLanguagePreference,
     hydrateLanguage: loadLanguageFromStorage,
   };
 };
-
-

package/src/ui/hooks/useSessionManagement.ts

@@ -17,7 +17,6 @@ export interface UseSessionManagementOptions {
   storageKeyPrefix?: string;
   loginSuccess: (user: User) => void;
   logoutStore: () => void;
-  applyLanguagePreference: (user: User) => Promise<void>;
   onAuthStateChange?: (user: User | null) => void;
   onError?: (error: ApiError) => void;
   setAuthError?: (message: string | null) => void;
@@ -54,7 +53,6 @@ export const useSessionManagement = ({
   storageKeyPrefix,
   loginSuccess,
   logoutStore,
-  applyLanguagePreference,
   onAuthStateChange,
   onError,
   setAuthError,
@@ -207,10 +205,9 @@ export const useSessionManagement = ({
       setActiveSessionId(sessionId);
       loginSuccess(user);
       await saveActiveSessionId(sessionId);
-      await applyLanguagePreference(user);
       onAuthStateChange?.(user);
     },
-    [applyLanguagePreference, loginSuccess, onAuthStateChange, saveActiveSessionId, setTokenReady],
+    [loginSuccess, onAuthStateChange, saveActiveSessionId, setTokenReady],
   );
 
   const removalTimerIdsRef = useRef<Set<ReturnType<typeof setTimeout>>>(new Set());

package/src/ui/screens/FeedbackScreen.tsx

@@ -12,7 +12,7 @@ import type { BaseScreenProps } from '../types/navigation';
 import { normalizeTheme } from '@oxyhq/core';
 import { packageInfo } from '@oxyhq/core';
 import { useTheme } from '@oxyhq/bloom/theme';
-import { Ionicons, MaterialCommunityIcons } from '@expo/vector-icons';
+import { Ionicons, type MaterialCommunityIcons } from '@expo/vector-icons';
 import { toast } from '@oxyhq/bloom';
 import { H2, Text } from '@oxyhq/bloom/typography';
 import { Button } from '@oxyhq/bloom/button';