@oxyhq/services 19.2.0 → 20.0.0

package/lib/commonjs/ui/hooks/useLanguageManagement.js

@@ -3,33 +3,119 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.addLocale = addLocale;
+exports.removeLocale = removeLocale;
+exports.setPrimaryLocale = setPrimaryLocale;
 exports.useLanguageManagement = void 0;
 var _react = require("react");
 var _core = require("@oxyhq/core");
 var _errorHandlers = require("../utils/errorHandlers.js");
-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).
+ */
+function addLocale(languages, locale) {
+  const canonical = (0, _core.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.
+ */
+function removeLocale(languages, locale) {
+  const canonical = (0, _core.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.
+ */
+function setPrimaryLocale(languages, locale) {
+  const canonical = (0, _core.normalizeLocale)(locale);
+  if (!canonical) return [...languages];
+  return [canonical, ...languages.filter(entry => entry !== canonical)];
+}
 
 /**
- * Manage UI language state, persistence, and metadata derivation.
+ * Resolve the device/browser locale, mapped to a supported catalog locale.
  *
- * @param options - Configuration for storage access and error reporting
+ * 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() {
+  const candidates = [];
+  if (typeof navigator !== 'undefined') {
+    const nav = navigator;
+    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 = (0, _core.normalizeLocale)(candidate);
+    if (exact) return exact;
+    const base = (0, _core.getBaseLanguage)(candidate);
+    const byBase = _core.SUPPORTED_LANGUAGES.find(entry => entry.language === base);
+    if (byBase) return byBase.code;
+  }
+  return _core.FALLBACK_LOCALE;
+}
+
+/**
+ * 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.
+ *
+ * The only external system this hook synchronizes with is local storage (the
+ * guest override), which is loaded once on mount.
  */
 const useLanguageManagement = ({
   storage,
   languageKey,
+  user,
   onError,
   logger
 }) => {
-  const [currentLanguage, setCurrentLanguage] = (0, _react.useState)(DEFAULT_LANGUAGE);
+  // The device locale is fixed for the lifetime of the runtime.
+  const deviceLanguage = (0, _react.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] = (0, _react.useState)(null);
   const loadLanguageFromStorage = (0, _react.useCallback)(async () => {
     if (!storage) {
       return;
     }
     try {
       const savedLanguageRaw = await storage.getItem(languageKey);
-      const normalized = (0, _core.normalizeLanguageCode)(savedLanguageRaw) || savedLanguageRaw;
+      const normalized = savedLanguageRaw ? (0, _core.normalizeLocale)(savedLanguageRaw) : undefined;
       if (normalized) {
-        setCurrentLanguage(normalized);
+        setGuestLanguage(normalized);
       }
     } catch (error) {
       const message = (0, _errorHandlers.extractErrorMessage)(error, 'Failed to load language preference');
@@ -52,14 +138,17 @@ const useLanguageManagement = ({
       }
     });
   }, [loadLanguageFromStorage, logger]);
-  const setLanguage = (0, _react.useCallback)(async languageId => {
+  const setLanguage = (0, _react.useCallback)(async locale => {
     if (!storage) {
       throw new Error('Storage not initialized');
     }
-    const normalized = (0, _core.normalizeLanguageCode)(languageId) || languageId;
+    const normalized = (0, _core.normalizeLocale)(locale);
+    if (!normalized) {
+      throw new Error(`Unsupported locale: ${locale}`);
+    }
     try {
       await storage.setItem(languageKey, normalized);
-      setCurrentLanguage(normalized);
+      setGuestLanguage(normalized);
     } catch (error) {
       const message = (0, _errorHandlers.extractErrorMessage)(error, 'Failed to save language preference');
       onError?.({
@@ -75,36 +164,28 @@ const useLanguageManagement = ({
       throw error instanceof Error ? error : new Error(message);
     }
   }, [languageKey, logger, onError, storage]);
-  const applyLanguagePreference = (0, _react.useCallback)(async user => {
-    if (!storage || !user) {
-      return;
-    }
-    const userLanguage = user?.language;
-    if (!userLanguage) {
-      return;
+  const languages = (0, _react.useMemo)(() => {
+    if (user) {
+      return (0, _core.getUserLanguages)(user);
     }
-    try {
-      const normalized = (0, _core.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);
-      }
+    return guestLanguage ? [guestLanguage] : [];
+  }, [user, guestLanguage]);
+  const currentLanguage = (0, _react.useMemo)(() => {
+    if (user) {
+      return (0, _core.getPrimaryLanguage)(user) ?? _core.FALLBACK_LOCALE;
     }
-  }, [languageKey, logger, storage]);
+    return guestLanguage ?? deviceLanguage;
+  }, [user, guestLanguage, deviceLanguage]);
   const metadata = (0, _react.useMemo)(() => (0, _core.getLanguageMetadata)(currentLanguage), [currentLanguage]);
   const languageName = (0, _react.useMemo)(() => (0, _core.getLanguageName)(currentLanguage), [currentLanguage]);
   const nativeLanguageName = (0, _react.useMemo)(() => (0, _core.getNativeLanguageName)(currentLanguage), [currentLanguage]);
   return {
     currentLanguage,
+    languages,
     metadata,
     languageName,
     nativeLanguageName,
     setLanguage,
-    applyLanguagePreference,
     hydrateLanguage: loadLanguageFromStorage
   };
 };

package/lib/commonjs/ui/hooks/useLanguageManagement.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_core","_errorHandlers","DEFAULT_LANGUAGE","useLanguageManagement","storage","languageKey","onError","logger","currentLanguage","setCurrentLanguage","useState","loadLanguageFromStorage","useCallback","savedLanguageRaw","getItem","normalized","normalizeLanguageCode","error","message","extractErrorMessage","code","status","__DEV__","console","warn","useEffect","catch","setLanguage","languageId","Error","setItem","applyLanguagePreference","user","userLanguage","language","metadata","useMemo","getLanguageMetadata","languageName","getLanguageName","nativeLanguageName","getNativeLanguageName","hydrateLanguage","exports"],"sourceRoot":"../../../../src","sources":["ui/hooks/useLanguageManagement.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_core","_errorHandlers","addLocale","languages","locale","canonical","normalizeLocale","includes","removeLocale","filter","entry","setPrimaryLocale","resolveDeviceLocale","candidates","navigator","nav","Array","isArray","push","language","intlLocale","Intl","DateTimeFormat","resolvedOptions","candidate","exact","base","getBaseLanguage","byBase","SUPPORTED_LANGUAGES","find","code","FALLBACK_LOCALE","useLanguageManagement","storage","languageKey","user","onError","logger","deviceLanguage","useMemo","guestLanguage","setGuestLanguage","useState","loadLanguageFromStorage","useCallback","savedLanguageRaw","getItem","normalized","undefined","error","message","extractErrorMessage","status","__DEV__","console","warn","useEffect","catch","setLanguage","Error","setItem","getUserLanguages","currentLanguage","getPrimaryLanguage","metadata","getLanguageMetadata","languageName","getLanguageName","nativeLanguageName","getNativeLanguageName","hydrateLanguage","exports"],"sourceRoot":"../../../../src","sources":["ui/hooks/useLanguageManagement.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/hooks/useSessionManagement.js

@@ -26,7 +26,6 @@ const useSessionManagement = ({
   storageKeyPrefix,
   loginSuccess,
   logoutStore,
-  applyLanguagePreference,
   onAuthStateChange,
   onError,
   setAuthError,
@@ -152,9 +151,8 @@ 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 = (0, _react.useRef)(new Set());
   const trackRemovedSession = (0, _react.useCallback)(sessionId => {
     removedSessionsRef.current.add(sessionId);

package/lib/commonjs/ui/hooks/useSessionManagement.js.map

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_core","_sessionHelpers","_storageHelpers","_errorHandlers","_queryClient","_isWebBrowser","_crossOriginRestore","DEFAULT_SAVE_ERROR_MESSAGE","CLEAR_STORAGE_ERROR","useSessionManagement","oxyServices","storage","storageKeyPrefix","loginSuccess","logoutStore","applyLanguagePreference","onAuthStateChange","onError","setAuthError","logger","setTokenReady","queryClient","sessions","setSessions","useState","activeSessionId","setActiveSessionId","sessionsRef","useRef","current","activeSessionIdRef","refreshInFlightRef","removedSessionsRef","Set","lastRefreshRef","storageKeys","useMemo","getStorageKeys","saveSessionIds","useCallback","sessionIds","uniqueIds","Array","from","setItem","JSON","stringify","error","isDev","console","warn","updateSessions","incoming","options","prevSessions","processed","merge","mergeSessions","normalizeAndSortSessions","map","session","sessionId","preserveSessionIds","sessionsArraysEqual","saveActiveSessionId","handleAuthError","defaultMessage","code","removeActiveSessionId","removeItem","clearSessionStorage","clearSessionState","clearTokens","clear","clearQueryCache","clearCrossOriginRestoreGuards","activateSession","user","removalTimerIdsRef","trackRemovedSession","add","timerId","setTimeout","delete","useEffect","forEach","clearTimeout","switchSession","isWebBrowser","getAccessToken","Error","validation","validateSession","useHeaderValidation","valid","deviceSessions","fetchSessionsWithFallback","fallbackUserId","id","invalidSession","isInvalidSessionError","filter","refreshSessions","activeUserId","now","Date","refreshPromise","isRefreshInFlight","Boolean","exports"],"sourceRoot":"../../../../src","sources":["ui/hooks/useSessionManagement.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_core","_sessionHelpers","_storageHelpers","_errorHandlers","_queryClient","_isWebBrowser","_crossOriginRestore","DEFAULT_SAVE_ERROR_MESSAGE","CLEAR_STORAGE_ERROR","useSessionManagement","oxyServices","storage","storageKeyPrefix","loginSuccess","logoutStore","onAuthStateChange","onError","setAuthError","logger","setTokenReady","queryClient","sessions","setSessions","useState","activeSessionId","setActiveSessionId","sessionsRef","useRef","current","activeSessionIdRef","refreshInFlightRef","removedSessionsRef","Set","lastRefreshRef","storageKeys","useMemo","getStorageKeys","saveSessionIds","useCallback","sessionIds","uniqueIds","Array","from","setItem","JSON","stringify","error","isDev","console","warn","updateSessions","incoming","options","prevSessions","processed","merge","mergeSessions","normalizeAndSortSessions","map","session","sessionId","preserveSessionIds","sessionsArraysEqual","saveActiveSessionId","handleAuthError","defaultMessage","code","removeActiveSessionId","removeItem","clearSessionStorage","clearSessionState","clearTokens","clear","clearQueryCache","clearCrossOriginRestoreGuards","activateSession","user","removalTimerIdsRef","trackRemovedSession","add","timerId","setTimeout","delete","useEffect","forEach","clearTimeout","switchSession","isWebBrowser","getAccessToken","Error","validation","validateSession","useHeaderValidation","valid","deviceSessions","fetchSessionsWithFallback","fallbackUserId","id","invalidSession","isInvalidSessionError","filter","refreshSessions","activeUserId","now","Date","refreshPromise","isRefreshInFlight","Boolean","exports"],"sourceRoot":"../../../../src","sources":["ui/hooks/useSessionManagement.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/screens/LanguageSelectorScreen.js

@@ -7,112 +7,139 @@ exports.default = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _reactNative = require("react-native");
 var _theme = require("@oxyhq/bloom/theme");
-var _core = require("@oxyhq/core");
 var _vectorIcons = require("@expo/vector-icons");
 var _bloom = require("@oxyhq/bloom");
 var _typography = require("@oxyhq/bloom/typography");
 var _searchInput = require("@oxyhq/bloom/search-input");
 var _settingsList = require("@oxyhq/bloom/settings-list");
+var _core = require("@oxyhq/core");
 var _Header = _interopRequireDefault(require("../components/Header.js"));
 var _useI18n = require("../hooks/useI18n.js");
 var _OxyContext = require("../context/OxyContext.js");
+var _useLanguageManagement = require("../hooks/useLanguageManagement.js");
+var _useAccountMutations = require("../hooks/mutations/useAccountMutations.js");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
-// Size (in dp) of the circular flag chip rendered as each row's leading icon.
-const FLAG_CHIP_SIZE = 40;
-// Selected-row check indicator size (dp).
-const CHECK_ICON_SIZE = 24;
+// Size (in dp) of the circular chip rendered as each row's leading icon.
+const CHIP_SIZE = 40;
+// Trailing remove-affordance icon size (dp).
+const REMOVE_ICON_SIZE = 24;
+
+/** O(1) catalog lookup by canonical locale code. */
+const CATALOG_BY_CODE = new Map(_core.SUPPORTED_LANGUAGES.map(entry => [entry.code, entry]));
 
 /**
- * LanguageSelectorScreen - Optimized for performance
+ * LanguageSelectorScreen — multi-select over the supported BCP-47 locales.
  *
- * Performance optimizations:
- * - useMemo for the filtered language list to prevent recreation on every render
- * - useCallback for handlers to prevent unnecessary re-renders
- * - Memoized component to prevent unnecessary re-renders
+ * The user picks one or more locales; the FIRST (primary) drives the app's UI
+ * language. When signed in the ordered selection is persisted to the account
+ * (`updateProfile({ languages })`, primary first) and every Oxy app follows it;
+ * when signed out a single local override is stored on-device.
  */
 const LanguageSelectorScreen = ({
   goBack,
-  onClose,
-  theme
+  onClose
 }) => {
-  // Use useOxy() hook for OxyContext values. The language preference persists
-  // on the ACTIVE account's profile — the active session IS that account — so
-  // gate the server sync on the active account.
   const {
     user,
+    isAuthenticated,
     currentLanguage,
-    setLanguage,
-    oxyServices,
-    isAuthenticated
+    currentLanguages,
+    setLanguage
   } = (0, _OxyContext.useOxy)();
   const {
     t
   } = (0, _useI18n.useI18n)();
   const bloomTheme = (0, _theme.useTheme)();
-  const normalizedTheme = (0, _core.normalizeTheme)(theme);
-  const [isLoading, setIsLoading] = (0, _react.useState)(false);
+  const updateProfile = (0, _useAccountMutations.useUpdateProfile)();
   const [query, setQuery] = (0, _react.useState)('');
+  const [isSubmitting, setIsSubmitting] = (0, _react.useState)(false);
 
-  // Memoize the language select handler to prevent recreation on every render
-  const handleLanguageSelect = (0, _react.useCallback)(async languageId => {
-    if (languageId === currentLanguage || isLoading) {
-      return; // Already selected or loading
+  // The current ordered selection: the account locales when signed in, else
+  // the single guest/device locale. Always non-empty (`currentLanguage`
+  // resolves to the device or fallback locale).
+  const selected = (0, _react.useMemo)(() => currentLanguages.length > 0 ? currentLanguages : [currentLanguage], [currentLanguages, currentLanguage]);
+  const selectedSet = (0, _react.useMemo)(() => new Set(selected), [selected]);
+  const selectedEntries = (0, _react.useMemo)(() => selected.map(code => CATALOG_BY_CODE.get(code)).filter(entry => entry !== undefined), [selected]);
+
+  // Available = supported locales not already selected, filtered by the query
+  // (matches English name + native name).
+  const availableEntries = (0, _react.useMemo)(() => {
+    const normalizedQuery = query.trim().toLowerCase();
+    return _core.SUPPORTED_LANGUAGES.filter(entry => {
+      if (selectedSet.has(entry.code)) {
+        return false;
+      }
+      if (!normalizedQuery) {
+        return true;
+      }
+      return entry.name.toLowerCase().includes(normalizedQuery) || entry.nativeName.toLowerCase().includes(normalizedQuery);
+    });
+  }, [query, selectedSet]);
+  const isBusy = isSubmitting || updateProfile.isPending;
+
+  // Persist the next ordered selection. Signed-in accounts write the full
+  // ordered array; guests store only the primary locally.
+  const commitSelection = (0, _react.useCallback)(async (next, announceCode) => {
+    if (isBusy || next.length === 0) {
+      return;
     }
-    setIsLoading(true);
+    setIsSubmitting(true);
     try {
-      let serverSyncFailed = false;
-
-      // If signed in, persist preference to backend user settings
       if (isAuthenticated && user?.id) {
-        try {
-          await oxyServices.updateProfile({
-            language: languageId
-          });
-        } catch (e) {
-          // Server sync failed, but we'll save locally anyway
-          serverSyncFailed = true;
-          if (__DEV__) {
-            console.warn('Failed to sync language to server (will save locally only):', e instanceof Error ? e.message : e);
-          }
-        }
+        await updateProfile.mutateAsync({
+          languages: next
+        });
+      } else {
+        await setLanguage(next[0]);
       }
-
-      // Always persist locally for immediate UX and for guests
-      await setLanguage(languageId);
-      const selectedLang = _core.SUPPORTED_LANGUAGES.find(lang => lang.id === languageId);
-
-      // Show success message (language is saved locally regardless of server sync)
       _bloom.toast.success(t('language.changed', {
-        lang: selectedLang?.name || languageId
+        lang: (0, _core.getNativeLanguageName)(announceCode)
       }));
-
-      // Log server sync failure only in dev mode (user experience is still good - saved locally)
-      if (serverSyncFailed && __DEV__) {
-        console.warn('Language saved locally but server sync failed');
-      }
-      setIsLoading(false);
-      // Close the bottom sheet if possible; otherwise, go back
-      if (onClose) onClose();else goBack?.();
     } catch (error) {
-      // Only show error if local storage also failed
+      // `useUpdateProfile` already surfaces a toast on failure; only the
+      // local (guest) path needs its own error toast.
+      if (!(isAuthenticated && user?.id)) {
+        _bloom.toast.error(t('language.saveFailed'));
+      }
       if (__DEV__) {
         console.error('Error saving language preference:', error);
       }
-      _bloom.toast.error(t('language.saveFailed'));
-      setIsLoading(false);
+    } finally {
+      setIsSubmitting(false);
     }
-  }, [currentLanguage, isLoading, isAuthenticated, user?.id, oxyServices, setLanguage, t, onClose, goBack]);
+  }, [isAuthenticated, user?.id, updateProfile, setLanguage, t, isBusy]);
 
-  // Filter the supported languages by the search query (name + native name).
-  const filteredLanguages = (0, _react.useMemo)(() => {
-    const normalized = query.trim().toLowerCase();
-    if (!normalized) {
-      return _core.SUPPORTED_LANGUAGES;
+  // Adding a locale: signed-in appends (non-primary); a guest can only hold a
+  // single locale, so the tapped locale becomes their primary.
+  const handleAdd = (0, _react.useCallback)(code => {
+    const next = isAuthenticated && user?.id ? (0, _useLanguageManagement.addLocale)(selected, code) : [code];
+    void commitSelection(next, code);
+  }, [isAuthenticated, user?.id, selected, commitSelection]);
+  const handleSetPrimary = (0, _react.useCallback)(code => {
+    if (selected[0] === code) {
+      return;
+    }
+    void commitSelection((0, _useLanguageManagement.setPrimaryLocale)(selected, code), code);
+  }, [selected, commitSelection]);
+  const handleRemove = (0, _react.useCallback)(code => {
+    if (selected.length <= 1) {
+      return;
     }
-    return _core.SUPPORTED_LANGUAGES.filter(language => language.name.toLowerCase().includes(normalized) || language.nativeName.toLowerCase().includes(normalized));
-  }, [query]);
+    const next = (0, _useLanguageManagement.removeLocale)(selected, code);
+    const announceCode = next[0] ?? code;
+    void commitSelection(next, announceCode);
+  }, [selected, commitSelection]);
+  const renderChip = entry => /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+    className: "bg-fill-secondary items-center justify-center",
+    style: styles.chip,
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_typography.Text, {
+      className: "text-text-secondary",
+      style: styles.chipLabel,
+      children: entry.language.toUpperCase()
+    })
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
     className: "flex-1 bg-bg",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Header.default, {
@@ -125,7 +152,6 @@ const LanguageSelectorScreen = ({
       className: "flex-1",
       contentContainerClassName: "px-screen-margin pt-space-24 pb-space-24",
       showsVerticalScrollIndicator: false,
-      removeClippedSubviews: true,
       keyboardShouldPersistTaps: "handled",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
         className: "mb-space-16",
@@ -147,28 +173,60 @@ const LanguageSelectorScreen = ({
           label: t('language.search') || 'Search languages'
         })
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_settingsList.SettingsListGroup, {
-        children: filteredLanguages.map(language => {
-          const isSelected = currentLanguage === language.id;
+        title: t('language.selected'),
+        children: selectedEntries.map((entry, index) => {
+          const isPrimary = index === 0;
+          const canRemove = selected.length > 1;
           return /*#__PURE__*/(0, _jsxRuntime.jsx)(_settingsList.SettingsListItem, {
-            icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-              className: "bg-fill-secondary items-center justify-center",
-              style: styles.languageFlag,
+            icon: renderChip(entry),
+            title: entry.nativeName,
+            description: entry.name,
+            onPress: isPrimary ? undefined : () => handleSetPrimary(entry.code),
+            disabled: isBusy,
+            accessibilityLabel: isPrimary ? `${entry.name} — ${t('language.primary')}` : entry.name,
+            rightElement: isPrimary ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
+              className: "bg-fill-secondary rounded-full px-space-8 py-space-2",
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_typography.Text, {
-                style: styles.flagEmoji,
-                children: language.flag
+                className: "text-primary",
+                style: styles.primaryBadge,
+                children: t('language.primary')
+              })
+            }) : canRemove ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.TouchableOpacity, {
+              onPress: () => handleRemove(entry.code),
+              disabled: isBusy,
+              hitSlop: {
+                top: 8,
+                bottom: 8,
+                left: 8,
+                right: 8
+              },
+              accessibilityRole: "button",
+              accessibilityLabel: `${t('language.remove')} ${entry.name}`,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.Ionicons, {
+                name: "close-circle",
+                size: REMOVE_ICON_SIZE,
+                color: bloomTheme.colors.textSecondary
               })
-            }),
-            title: language.name,
-            description: language.nativeName,
-            onPress: () => handleLanguageSelect(language.id),
-            rightElement: isSelected ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.Ionicons, {
-              name: "checkmark-circle",
-              size: CHECK_ICON_SIZE,
-              color: bloomTheme.colors.primary
             }) : undefined,
             showChevron: false
-          }, language.id);
+          }, entry.code);
         })
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_settingsList.SettingsListGroup, {
+        title: t('language.available'),
+        children: availableEntries.map(entry => /*#__PURE__*/(0, _jsxRuntime.jsx)(_settingsList.SettingsListItem, {
+          icon: renderChip(entry),
+          title: entry.nativeName,
+          description: entry.name,
+          onPress: () => handleAdd(entry.code),
+          disabled: isBusy,
+          accessibilityLabel: entry.name,
+          rightElement: /*#__PURE__*/(0, _jsxRuntime.jsx)(_vectorIcons.Ionicons, {
+            name: "add-circle-outline",
+            size: REMOVE_ICON_SIZE,
+            color: bloomTheme.colors.textSecondary
+          }),
+          showChevron: false
+        }, entry.code))
       })]
     })]
   });
@@ -185,13 +243,18 @@ const styles = _reactNative.StyleSheet.create({
     fontSize: 16,
     lineHeight: 22
   },
-  languageFlag: {
-    width: FLAG_CHIP_SIZE,
-    height: FLAG_CHIP_SIZE,
-    borderRadius: FLAG_CHIP_SIZE / 2
+  chip: {
+    width: CHIP_SIZE,
+    height: CHIP_SIZE,
+    borderRadius: CHIP_SIZE / 2
+  },
+  chipLabel: {
+    fontSize: 13,
+    fontWeight: '600'
   },
-  flagEmoji: {
-    fontSize: 20
+  primaryBadge: {
+    fontSize: 12,
+    fontWeight: '600'
   }
 });