@oxyhq/services 6.9.45 → 6.10.1

package/lib/module/ui/components/OxyProvider.js

@@ -1,26 +1,52 @@
 "use strict";
 
 import { lazy, Suspense, useEffect, useRef, useState } from 'react';
-import { AppState, Platform } from 'react-native';
+import { AppState, Platform, StyleSheet, View } from 'react-native';
 import { OxyContextProvider } from "../context/OxyContext.js";
 import { QueryClientProvider, focusManager, onlineManager } from '@tanstack/react-query';
-import { BloomThemeProvider } from '@oxyhq/bloom';
+import { BloomDialogProvider, BloomThemeProvider } from '@oxyhq/bloom';
+import { ToastOutlet } from '@oxyhq/bloom/toast';
 import { setupFonts } from "./FontLoader.js";
-import { Toaster } from '../../lib/sonner';
-import { createQueryClient } from "../hooks/queryClient.js";
+import { attachQueryPersistence, createQueryClient } from "../hooks/queryClient.js";
 import { createPlatformStorage } from "../utils/storageHelpers.js";
 
-// Initialize fonts automatically
+/**
+ * Background color shown for the brief window between mount and the
+ * persisted-cache hydration completing. Matches the typical splash-screen
+ * backgrounds used across Oxy apps (dark surface, white-on-dark text), so
+ * the transition reads as a continuation of the splash instead of a
+ * white flash. Apps that need a different boot color can keep doing their
+ * own `expo-splash-screen` orchestration — this placeholder just guarantees
+ * we never render a transparent `null` while we wait.
+ *
+ * Light-mode background. Apps that boot into dark mode see a brief light
+ * flash here, which is unavoidable without re-implementing the BloomTheme
+ * resolver outside of `<BloomThemeProvider>`. The light value is far less
+ * jarring than `null` (transparent) on either theme.
+ */
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+const BOOT_BG_COLOR = '#ffffff';
+const bootStyles = StyleSheet.create({
+  bootShell: {
+    flex: 1,
+    backgroundColor: BOOT_BG_COLOR
+  }
+});
+
+// Initialize fonts automatically
 setupFonts();
 
 // Detect if running on web
 const isWeb = Platform.OS === 'web';
 
+// Variable indirection: the module name is computed at runtime so Metro's
+// static analyzer cannot trace this into the web bundle. Native-only.
+const KEYBOARD_CONTROLLER_MODULE = 'react-native-keyboard-controller';
+
 // Lazy-load optional components (avoids require() for ESM compatibility).
 // The .then() extracts + casts the default export so that `lazy()` sees
 // `Promise<{ default: ComponentType }>` instead of the full module namespace.
-const LazyBottomSheetRouter = /*#__PURE__*/lazy(() => import('./BottomSheetRouter.js').then(mod => ({
+const LazyBottomSheetRouter = /*#__PURE__*/lazy(() => import('./BottomSheetRouter').then(mod => ({
   default: mod.default
 }), error => {
   if (__DEV__) {
@@ -30,7 +56,7 @@ const LazyBottomSheetRouter = /*#__PURE__*/lazy(() => import('./BottomSheetRoute
     default: () => null
   };
 }));
-const LazySignInModal = /*#__PURE__*/lazy(() => import('./SignInModal.js').then(mod => ({
+const LazySignInModal = /*#__PURE__*/lazy(() => import('./SignInModal').then(mod => ({
   default: mod.default
 }), () => ({
   default: () => null
@@ -81,12 +107,19 @@ const OxyProvider = ({
   themeMode = 'system',
   colorPreset
 }) => {
-  // Dynamic KeyboardProvider for native (avoids require() for ESM compatibility)
+  // Dynamic KeyboardProvider for native. Uses variable indirection
+  // (KEYBOARD_CONTROLLER_MODULE) so Metro's static analyzer cannot trace
+  // the import into the web bundle. On web, the runtime guard short-circuits
+  // before the import runs.
   const [KBProvider, setKBProvider] = useState(null);
   useEffect(() => {
     if (isWeb) return;
-    const moduleName = 'react-native-keyboard-controller';
-    import(/* webpackIgnore: true */moduleName).then(mod => setKBProvider(() => mod.KeyboardProvider)).catch(() => {/* KeyboardProvider not available */});
+    const moduleName = KEYBOARD_CONTROLLER_MODULE;
+    import(moduleName).then(mod => setKBProvider(() => mod.KeyboardProvider)).catch(error => {
+      if (__DEV__) {
+        console.warn('[OxyProvider] react-native-keyboard-controller not available, skipping keyboard support', error);
+      }
+    });
   }, []);
   const KeyboardWrapper = KBProvider ?? (({
     children
@@ -94,10 +127,19 @@ const OxyProvider = ({
     children: children
   }));
 
-  // Simple storage initialization for query persistence
+  // Storage + persistence wiring.
+  //
+  // We MUST await the restore() promise before exposing the QueryClient to
+  // children — otherwise the first render sees an empty cache and any
+  // <Suspense> queries or `enabled: !!cached` gates would skip the offline
+  // hit. Once the persisted blob has been hydrated (or definitively failed
+  // to hydrate), we mark the client ready and unblock rendering.
   const storageRef = useRef(null);
   const queryClientRef = useRef(null);
-  // Initialize immediately if provided via prop to avoid a null-render frame
+  const persistenceUnsubRef = useRef(null);
+
+  // If the consumer supplied their own QueryClient we use it as-is and skip
+  // persistence — their host app owns that lifecycle.
   const [queryClient, setQueryClient] = useState(() => {
     if (providedQueryClient) {
       queryClientRef.current = providedQueryClient;
@@ -111,29 +153,40 @@ const OxyProvider = ({
       setQueryClient(providedQueryClient);
       return;
     }
-
-    // Initialize storage and create query client
     let mounted = true;
-    createPlatformStorage().then(storage => {
-      if (mounted && !queryClientRef.current) {
-        storageRef.current = storage;
-        const client = createQueryClient(storage);
-        queryClientRef.current = client;
-        setQueryClient(client);
-      }
-    }).catch(error => {
-      // If storage fails, create query client without persistence
-      if (mounted && !queryClientRef.current) {
+    const bootstrap = async () => {
+      let storage = null;
+      try {
+        storage = await createPlatformStorage();
+      } catch (error) {
         if (__DEV__) {
           console.warn('[OxyProvider] Failed to initialize storage for query persistence', error);
         }
-        const client = createQueryClient(null);
-        queryClientRef.current = client;
-        setQueryClient(client);
       }
-    });
+      if (!mounted || queryClientRef.current) return;
+      storageRef.current = storage;
+      const client = createQueryClient();
+      const {
+        restored,
+        unsubscribe
+      } = attachQueryPersistence(client, storage);
+      persistenceUnsubRef.current = unsubscribe;
+
+      // Block first render until the persisted cache is restored so
+      // offline reads land synchronously on the very first paint.
+      await restored;
+      if (!mounted) {
+        unsubscribe();
+        return;
+      }
+      queryClientRef.current = client;
+      setQueryClient(client);
+    };
+    bootstrap();
     return () => {
       mounted = false;
+      persistenceUnsubRef.current?.();
+      persistenceUnsubRef.current = null;
     };
   }, [providedQueryClient]);
 
@@ -200,9 +253,18 @@ const OxyProvider = ({
     };
   }, []);
 
-  // Ensure we have a valid QueryClient
+  // While the QueryClient is being created and the persisted cache is
+  // hydrating, render a solid-color shell instead of `null`. Returning
+  // `null` here on mid-range Android devices flashed a transparent
+  // surface for 200–600ms after the native splash hid, which read as a
+  // glitch. The shell keeps the screen filled with a sensible default
+  // until children can mount under a real <QueryClientProvider>.
   if (!queryClient) {
-    return null;
+    return /*#__PURE__*/_jsx(KeyboardWrapper, {
+      children: /*#__PURE__*/_jsx(View, {
+        style: bootStyles.bootShell
+      })
+    });
   }
 
   // Core content: QueryClient + OxyContext + UI overlays
@@ -211,17 +273,19 @@ const OxyProvider = ({
     children: /*#__PURE__*/_jsx(BloomThemeProvider, {
       mode: themeMode,
       colorPreset: colorPreset,
-      children: /*#__PURE__*/_jsxs(OxyContextProvider, {
-        oxyServices: oxyServices,
-        baseURL: baseURL,
-        authWebUrl: authWebUrl,
-        authRedirectUri: authRedirectUri,
-        storageKeyPrefix: storageKeyPrefix,
-        onAuthStateChange: onAuthStateChange,
-        children: [children, /*#__PURE__*/_jsxs(Suspense, {
-          fallback: null,
-          children: [/*#__PURE__*/_jsx(LazyBottomSheetRouter, {}), /*#__PURE__*/_jsx(LazySignInModal, {})]
-        }), /*#__PURE__*/_jsx(Toaster, {})]
+      children: /*#__PURE__*/_jsx(BloomDialogProvider, {
+        children: /*#__PURE__*/_jsxs(OxyContextProvider, {
+          oxyServices: oxyServices,
+          baseURL: baseURL,
+          authWebUrl: authWebUrl,
+          authRedirectUri: authRedirectUri,
+          storageKeyPrefix: storageKeyPrefix,
+          onAuthStateChange: onAuthStateChange,
+          children: [children, /*#__PURE__*/_jsxs(Suspense, {
+            fallback: null,
+            children: [/*#__PURE__*/_jsx(LazyBottomSheetRouter, {}), /*#__PURE__*/_jsx(LazySignInModal, {})]
+          }), /*#__PURE__*/_jsx(ToastOutlet, {})]
+        })
       })
     })
   });

package/lib/module/ui/components/OxyProvider.js.map

@@ -1 +1 @@
-{"version":3,"names":["lazy","Suspense","useEffect","useRef","useState","AppState","Platform","OxyContextProvider","QueryClientProvider","focusManager","onlineManager","BloomThemeProvider","setupFonts","Toaster","createQueryClient","createPlatformStorage","Fragment","_Fragment","jsx","_jsx","jsxs","_jsxs","isWeb","OS","LazyBottomSheetRouter","then","mod","default","error","__DEV__","console","LazySignInModal","OxyProvider","oxyServices","children","onAuthStateChange","storageKeyPrefix","baseURL","authWebUrl","authRedirectUri","queryClient","providedQueryClient","themeMode","colorPreset","KBProvider","setKBProvider","moduleName","KeyboardProvider","catch","KeyboardWrapper","storageRef","queryClientRef","setQueryClient","current","mounted","storage","client","warn","handleVisibilityChange","setFocused","document","visibilityState","addEventListener","removeEventListener","subscription","state","remove","cleanup","setupNetworkMonitoring","setOnline","navigator","onLine","handleOnline","handleOffline","window","NetInfo","fetch","isConnected","unsubscribe","coreContent","mode","fallback"],"sourceRoot":"../../../../src","sources":["ui/components/OxyProvider.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["lazy","Suspense","useEffect","useRef","useState","AppState","Platform","StyleSheet","View","OxyContextProvider","QueryClientProvider","focusManager","onlineManager","BloomDialogProvider","BloomThemeProvider","ToastOutlet","setupFonts","attachQueryPersistence","createQueryClient","createPlatformStorage","Fragment","_Fragment","jsx","_jsx","jsxs","_jsxs","BOOT_BG_COLOR","bootStyles","create","bootShell","flex","backgroundColor","isWeb","OS","KEYBOARD_CONTROLLER_MODULE","LazyBottomSheetRouter","then","mod","default","error","__DEV__","console","LazySignInModal","OxyProvider","oxyServices","children","onAuthStateChange","storageKeyPrefix","baseURL","authWebUrl","authRedirectUri","queryClient","providedQueryClient","themeMode","colorPreset","KBProvider","setKBProvider","moduleName","KeyboardProvider","catch","warn","KeyboardWrapper","storageRef","queryClientRef","persistenceUnsubRef","setQueryClient","current","mounted","bootstrap","storage","client","restored","unsubscribe","handleVisibilityChange","setFocused","document","visibilityState","addEventListener","removeEventListener","subscription","state","remove","cleanup","setupNetworkMonitoring","setOnline","navigator","onLine","handleOnline","handleOffline","window","NetInfo","fetch","isConnected","style","coreContent","mode","fallback"],"sourceRoot":"../../../../src","sources":["ui/components/OxyProvider.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/components/OxySignInButton.js

@@ -5,7 +5,7 @@ import { TouchableOpacity, Text, View, StyleSheet, Platform } from 'react-native
 import { useAuthStore } from "../stores/authStore.js";
 import { useShallow } from 'zustand/react/shallow';
 import { useTheme } from '@oxyhq/bloom/theme';
-import { fontFamilies } from "../styles/fonts.js";
+import { useOxy } from "../context/OxyContext.js";
 import OxyLogo from "./OxyLogo.js";
 import { showSignInModal, subscribeToSignInModal } from "./SignInModal.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
@@ -43,6 +43,9 @@ export const OxySignInButton = ({
   showWhenAuthenticated = false
 }) => {
   const theme = useTheme();
+  const {
+    showBottomSheet
+  } = useOxy();
   const {
     isAuthenticated,
     isLoading
@@ -50,23 +53,32 @@ export const OxySignInButton = ({
     isAuthenticated: state.isAuthenticated,
     isLoading: state.isLoading
   })));
+  // Tracks visibility of the web full-screen sign-in modal so we can show
+  // "Signing in..." while it's open. On native we open a bottom sheet whose
+  // visibility is owned by the sheet manager — no subscription needed.
   const [isModalOpen, setIsModalOpen] = useState(false);
 
-  // Subscribe to modal close events
+  // Subscribe to web modal visibility only — bottom sheet manages its own state.
   useEffect(() => {
+    if (Platform.OS !== 'web') return;
     return subscribeToSignInModal(setIsModalOpen);
   }, []);
 
-  // Handle button press - opens full-screen sign-in modal with QR code and auth options
+  // Handle button press
+  // - Web: legacy full-screen Modal (dialog UX fits desktop / browser)
+  // - Native: bottom sheet (sheet UX fits iOS/Android)
   const handlePress = useCallback(() => {
     if (onPress) {
       onPress();
       return;
     }
-    setIsModalOpen(true);
-    // Show the full-screen sign-in modal on all platforms
-    showSignInModal();
-  }, [onPress]);
+    if (Platform.OS === 'web') {
+      setIsModalOpen(true);
+      showSignInModal();
+    } else {
+      showBottomSheet?.('OxyAuth');
+    }
+  }, [onPress, showBottomSheet]);
   const themedStyles = useMemo(() => StyleSheet.create({
     button: {
       padding: 14,
@@ -75,7 +87,7 @@ export const OxySignInButton = ({
       justifyContent: 'center'
     },
     buttonDefault: {
-      backgroundColor: '#FFFFFF',
+      backgroundColor: theme.colors.card,
       borderWidth: 1,
       borderColor: theme.colors.borderLight,
       ...Platform.select({
@@ -111,7 +123,9 @@ export const OxySignInButton = ({
       justifyContent: 'center'
     },
     text: {
-      fontFamily: fontFamilies.interSemiBold,
+      // Bloom's BloomThemeProvider sets the default font via Text.defaultProps,
+      // so we intentionally do NOT set fontFamily here. Setting it would defeat
+      // the theme-wide font.
       fontWeight: Platform.OS === 'web' ? '600' : undefined,
       fontSize: 16,
       marginLeft: 10

package/lib/module/ui/components/OxySignInButton.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useState","useEffect","useMemo","TouchableOpacity","Text","View","StyleSheet","Platform","useAuthStore","useShallow","useTheme","fontFamilies","OxyLogo","showSignInModal","subscribeToSignInModal","jsx","_jsx","jsxs","_jsxs","OxySignInButton","variant","onPress","style","textStyle","text","disabled","showWhenAuthenticated","theme","isAuthenticated","isLoading","state","isModalOpen","setIsModalOpen","handlePress","themedStyles","create","button","padding","borderRadius","alignItems","justifyContent","buttonDefault","backgroundColor","borderWidth","borderColor","colors","borderLight","select","web","boxShadow","default","shadowColor","shadowOffset","width","height","shadowOpacity","shadowRadius","elevation","buttonOutline","primary","buttonContained","buttonDisabled","opacity","buttonContent","flexDirection","fontFamily","interSemiBold","fontWeight","OS","undefined","fontSize","marginLeft","textDefault","color","textOutline","textContained","textDisabled","textTertiary","isButtonDisabled","getButtonStyle","getTextStyle","children","size","fillColor","innerFillColor"],"sourceRoot":"../../../../src","sources":["ui/components/OxySignInButton.tsx"],"mappings":";;AACA,SAASA,WAAW,EAAEC,QAAQ,EAAEC,SAAS,EAAEC,OAAO,QAAQ,OAAO;AACjE,SAASC,gBAAgB,EAAEC,IAAI,EAAEC,IAAI,EAAEC,UAAU,EAAkDC,QAAQ,QAAQ,cAAc;AACjI,SAASC,YAAY,QAAQ,wBAAqB;AAClD,SAASC,UAAU,QAAQ,uBAAuB;AAClD,SAASC,QAAQ,QAAQ,oBAAoB;AAC7C,SAASC,YAAY,QAAQ,oBAAiB;AAC9C,OAAOC,OAAO,MAAM,cAAW;AAC/B,SAASC,eAAe,EAAEC,sBAAsB,QAAQ,kBAAe;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AA4CxE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,eAA+C,GAAGA,CAAC;EAC5DC,OAAO,GAAG,SAAS;EACnBC,OAAO;EACPC,KAAK;EACLC,SAAS;EACTC,IAAI,GAAG,kBAAkB;EACzBC,QAAQ,GAAG,KAAK;EAChBC,qBAAqB,GAAG;AAC5B,CAAC,KAAK;EACF,MAAMC,KAAK,GAAGjB,QAAQ,CAAC,CAAC;EACxB,MAAM;IAAEkB,eAAe;IAAEC;EAAU,CAAC,GAAGrB,YAAY,CAC/CC,UAAU,CAAEqB,KAAK,KAAM;IAAEF,eAAe,EAAEE,KAAK,CAACF,eAAe;IAAEC,SAAS,EAAEC,KAAK,CAACD;EAAU,CAAC,CAAC,CAClG,CAAC;EACD,MAAM,CAACE,WAAW,EAAEC,cAAc,CAAC,GAAGhC,QAAQ,CAAC,KAAK,CAAC;;EAErD;EACAC,SAAS,CAAC,MAAM;IACZ,OAAOa,sBAAsB,CAACkB,cAAc,CAAC;EACjD,CAAC,EAAE,EAAE,CAAC;;EAEN;EACA,MAAMC,WAAW,GAAGlC,WAAW,CAAC,MAAM;IAClC,IAAIsB,OAAO,EAAE;MACTA,OAAO,CAAC,CAAC;MACT;IACJ;IAEAW,cAAc,CAAC,IAAI,CAAC;IACpB;IACAnB,eAAe,CAAC,CAAC;EACrB,CAAC,EAAE,CAACQ,OAAO,CAAC,CAAC;EAEb,MAAMa,YAAY,GAAGhC,OAAO,CAAC,MAAMI,UAAU,CAAC6B,MAAM,CAAC;IACjDC,MAAM,EAAE;MACJC,OAAO,EAAE,EAAE;MACXC,YAAY,EAAE,EAAE;MAChBC,UAAU,EAAE,QAAQ;MACpBC,cAAc,EAAE;IACpB,CAAC;IACDC,aAAa,EAAE;MACXC,eAAe,EAAE,SAAS;MAC1BC,WAAW,EAAE,CAAC;MACdC,WAAW,EAAEjB,KAAK,CAACkB,MAAM,CAACC,WAAW;MACrC,GAAGvC,QAAQ,CAACwC,MAAM,CAAC;QACfC,GAAG,EAAE;UACDC,SAAS,EAAE;QACf,CAAC;QACDC,OAAO,EAAE;UACLC,WAAW,EAAE,SAAS;UACtBC,YAAY,EAAE;YAAEC,KAAK,EAAE,CAAC;YAAEC,MAAM,EAAE;UAAE,CAAC;UACrCC,aAAa,EAAE,GAAG;UAClBC,YAAY,EAAE,CAAC;UACfC,SAAS,EAAE;QACf;MACJ,CAAC;IACL,CAAC;IACDC,aAAa,EAAE;MACXhB,eAAe,EAAE,aAAa;MAC9BC,WAAW,EAAE,CAAC;MACdC,WAAW,EAAEjB,KAAK,CAACkB,MAAM,CAACc;IAC9B,CAAC;IACDC,eAAe,EAAE;MACblB,eAAe,EAAEf,KAAK,CAACkB,MAAM,CAACc;IAClC,CAAC;IACDE,cAAc,EAAE;MACZC,OAAO,EAAE;IACb,CAAC;IACDC,aAAa,EAAE;MACXC,aAAa,EAAE,KAAK;MACpBzB,UAAU,EAAE,QAAQ;MACpBC,cAAc,EAAE;IACpB,CAAC;IACDhB,IAAI,EAAE;MACFyC,UAAU,EAAEtD,YAAY,CAACuD,aAAa;MACtCC,UAAU,EAAE5D,QAAQ,CAAC6D,EAAE,KAAK,KAAK,GAAG,KAAK,GAAGC,SAAS;MACrDC,QAAQ,EAAE,EAAE;MACZC,UAAU,EAAE;IAChB,CAAC;IACDC,WAAW,EAAE;MACTC,KAAK,EAAE9C,KAAK,CAACkB,MAAM,CAACrB;IACxB,CAAC;IACDkD,WAAW,EAAE;MACTD,KAAK,EAAE9C,KAAK,CAACkB,MAAM,CAACc;IACxB,CAAC;IACDgB,aAAa,EAAE;MACXF,KAAK,EAAE;IACX,CAAC;IACDG,YAAY,EAAE;MACVH,KAAK,EAAE9C,KAAK,CAACkB,MAAM,CAACgC;IACxB;EACJ,CAAC,CAAC,EAAE,CAAClD,KAAK,CAAC,CAAC;;EAEZ;EACA,IAAIC,eAAe,IAAI,CAACF,qBAAqB,EAAE,OAAO,IAAI;EAE1D,MAAMoD,gBAAgB,GAAGrD,QAAQ,IAAII,SAAS,IAAIE,WAAW;;EAE7D;EACA,MAAMgD,cAAc,GAAGA,CAAA,KAAM;IACzB,QAAQ3D,OAAO;MACX,KAAK,SAAS;QACV,OAAO,CAACc,YAAY,CAACwB,aAAa,EAAEpC,KAAK,CAAC;MAC9C,KAAK,WAAW;QACZ,OAAO,CAACY,YAAY,CAAC0B,eAAe,EAAEtC,KAAK,CAAC;MAChD;QACI,OAAO,CAACY,YAAY,CAACO,aAAa,EAAEnB,KAAK,CAAC;IAClD;EACJ,CAAC;;EAED;EACA,MAAM0D,YAAY,GAAGA,CAAA,KAAM;IACvB,QAAQ5D,OAAO;MACX,KAAK,SAAS;QACV,OAAO,CAACc,YAAY,CAACwC,WAAW,EAAEnD,SAAS,CAAC;MAChD,KAAK,WAAW;QACZ,OAAO,CAACW,YAAY,CAACyC,aAAa,EAAEpD,SAAS,CAAC;MAClD;QACI,OAAO,CAACW,YAAY,CAACsC,WAAW,EAAEjD,SAAS,CAAC;IACpD;EACJ,CAAC;EAED,oBACIP,IAAA,CAACb,gBAAgB;IACbmB,KAAK,EAAE,CAACY,YAAY,CAACE,MAAM,EAAE2C,cAAc,CAAC,CAAC,EAAED,gBAAgB,IAAI5C,YAAY,CAAC2B,cAAc,CAAE;IAChGxC,OAAO,EAAEY,WAAY;IACrBR,QAAQ,EAAEqD,gBAAiB;IAAAG,QAAA,eAE3B/D,KAAA,CAACb,IAAI;MAACiB,KAAK,EAAEY,YAAY,CAAC6B,aAAc;MAAAkB,QAAA,gBACpCjE,IAAA,CAACJ,OAAO;QACJQ,OAAO,EAAC,MAAM;QACd8D,IAAI,EAAE,EAAG;QACTC,SAAS,EAAE/D,OAAO,KAAK,WAAW,GAAG,OAAO,GAAGO,KAAK,CAACkB,MAAM,CAACc,OAAQ;QACpEyB,cAAc,EAAEhE,OAAO,KAAK,WAAW,GAAGO,KAAK,CAACkB,MAAM,CAACc,OAAO,GAAGU,SAAU;QAC3E/C,KAAK,EAAEwD,gBAAgB,GAAG;UAAEhB,OAAO,EAAE;QAAI,CAAC,GAAGO;MAAU,CAC1D,CAAC,eACFrD,IAAA,CAACZ,IAAI;QAACkB,KAAK,EAAE,CAACY,YAAY,CAACV,IAAI,EAAEwD,YAAY,CAAC,CAAC,EAAEF,gBAAgB,IAAI5C,YAAY,CAAC0C,YAAY,CAAE;QAAAK,QAAA,EAC3FpD,SAAS,IAAIE,WAAW,GAAG,eAAe,GAAGP;MAAI,CAChD,CAAC;IAAA,CACL;EAAC,CACO,CAAC;AAE3B,CAAC;AAED,eAAeL,eAAe","ignoreList":[]}
+{"version":3,"names":["useCallback","useState","useEffect","useMemo","TouchableOpacity","Text","View","StyleSheet","Platform","useAuthStore","useShallow","useTheme","useOxy","OxyLogo","showSignInModal","subscribeToSignInModal","jsx","_jsx","jsxs","_jsxs","OxySignInButton","variant","onPress","style","textStyle","text","disabled","showWhenAuthenticated","theme","showBottomSheet","isAuthenticated","isLoading","state","isModalOpen","setIsModalOpen","OS","handlePress","themedStyles","create","button","padding","borderRadius","alignItems","justifyContent","buttonDefault","backgroundColor","colors","card","borderWidth","borderColor","borderLight","select","web","boxShadow","default","shadowColor","shadowOffset","width","height","shadowOpacity","shadowRadius","elevation","buttonOutline","primary","buttonContained","buttonDisabled","opacity","buttonContent","flexDirection","fontWeight","undefined","fontSize","marginLeft","textDefault","color","textOutline","textContained","textDisabled","textTertiary","isButtonDisabled","getButtonStyle","getTextStyle","children","size","fillColor","innerFillColor"],"sourceRoot":"../../../../src","sources":["ui/components/OxySignInButton.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/components/ProfileCard.js

@@ -7,7 +7,7 @@ import { useI18n } from "../hooks/useI18n.js";
 import Avatar from "./Avatar.js";
 import { useOxy } from "../context/OxyContext.js";
 import { useFileDownloadUrl } from "../hooks/index.js";
-import { fontFamilies } from "../styles/fonts.js";
+import { getAccountDisplayName, getAccountFallbackHandle } from '@oxyhq/core';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const ProfileCard = ({
   user,
@@ -23,11 +23,15 @@ const ProfileCard = ({
     oxyServices
   } = useOxy();
   const {
-    t
+    t,
+    locale
   } = useI18n();
   const avatarUrl = useFileDownloadUrl(oxyServices, user?.avatar, {
     variant: 'thumb'
   }).url || undefined;
+  const displayName = getAccountDisplayName(user, locale);
+  const handle = getAccountFallbackHandle(user);
+  const secondaryLine = user?.email ?? (handle && user?.username ? `@${handle}` : handle) ?? null;
   return /*#__PURE__*/_jsx(View, {
     style: styles.headerSection,
     children: /*#__PURE__*/_jsxs(View, {
@@ -37,7 +41,7 @@ const ProfileCard = ({
         style: styles.userProfile,
         children: [/*#__PURE__*/_jsx(Avatar, {
           uri: user?.avatar ? avatarUrl : undefined,
-          name: user?.name?.full || user?.username,
+          name: displayName,
           size: 60,
           theme: theme
         }), /*#__PURE__*/_jsxs(View, {
@@ -45,12 +49,12 @@ const ProfileCard = ({
           children: [/*#__PURE__*/_jsx(Text, {
             className: "text-foreground",
             style: styles.userName,
-            children: user.username
-          }), user.email && /*#__PURE__*/_jsx(Text, {
+            children: displayName
+          }), secondaryLine ? /*#__PURE__*/_jsx(Text, {
             className: "text-muted-foreground",
             style: styles.userEmail,
-            children: user.email
-          }), onEditPress && /*#__PURE__*/_jsx(TouchableOpacity, {
+            children: secondaryLine
+          }) : null, onEditPress && /*#__PURE__*/_jsx(TouchableOpacity, {
             style: styles.editProfileButton,
             onPress: onEditPress,
             children: /*#__PURE__*/_jsx(Text, {
@@ -104,7 +108,6 @@ const styles = StyleSheet.create({
   userName: {
     fontSize: 22,
     fontWeight: 'bold',
-    fontFamily: fontFamilies.interBold,
     marginBottom: 4
   },
   userEmail: {

package/lib/module/ui/components/ProfileCard.js.map

@@ -1 +1 @@
-{"version":3,"names":["View","Text","TouchableOpacity","StyleSheet","Ionicons","useTheme","useI18n","Avatar","useOxy","useFileDownloadUrl","fontFamilies","jsx","_jsx","jsxs","_jsxs","ProfileCard","user","theme","onEditPress","onClosePress","showCloseButton","colors","oxyServices","t","avatarUrl","avatar","variant","url","undefined","style","styles","headerSection","children","className","profileCard","firstGroupedItem","lastGroupedItem","userProfile","uri","name","full","username","size","userInfo","userName","email","userEmail","editProfileButton","onPress","editProfileText","closeButton","color","text","create","padding","paddingTop","flexDirection","alignItems","justifyContent","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius","marginBottom","flex","marginLeft","fontSize","fontWeight","fontFamily","interBold","alignSelf"],"sourceRoot":"../../../../src","sources":["ui/components/ProfileCard.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["View","Text","TouchableOpacity","StyleSheet","Ionicons","useTheme","useI18n","Avatar","useOxy","useFileDownloadUrl","getAccountDisplayName","getAccountFallbackHandle","jsx","_jsx","jsxs","_jsxs","ProfileCard","user","theme","onEditPress","onClosePress","showCloseButton","colors","oxyServices","t","locale","avatarUrl","avatar","variant","url","undefined","displayName","handle","secondaryLine","email","username","style","styles","headerSection","children","className","profileCard","firstGroupedItem","lastGroupedItem","userProfile","uri","name","size","userInfo","userName","userEmail","editProfileButton","onPress","editProfileText","closeButton","color","text","create","padding","paddingTop","flexDirection","alignItems","justifyContent","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius","marginBottom","flex","marginLeft","fontSize","fontWeight","alignSelf"],"sourceRoot":"../../../../src","sources":["ui/components/ProfileCard.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/components/QuickActions.js

@@ -9,7 +9,7 @@ const QuickActions = ({
   theme
 }) => {
   const {
-    isDark
+    colors
   } = useTheme();
   return /*#__PURE__*/_jsx(View, {
     className: "bg-secondary",
@@ -20,7 +20,7 @@ const QuickActions = ({
         style: styles.quickActionItem,
         children: [/*#__PURE__*/_jsx(TouchableOpacity, {
           style: [styles.quickActionCircle, {
-            backgroundColor: isDark ? 'rgba(255,255,255,0.08)' : 'rgba(0,0,0,0.03)'
+            backgroundColor: colors.backgroundTertiary
           }],
           onPress: action.onPress,
           children: /*#__PURE__*/_jsx(Ionicons, {

package/lib/module/ui/components/QuickActions.js.map

@@ -1 +1 @@
-{"version":3,"names":["View","Text","TouchableOpacity","StyleSheet","Ionicons","useTheme","jsx","_jsx","jsxs","_jsxs","QuickActions","actions","theme","isDark","className","style","styles","quickActionsContainer","firstGroupedItem","lastGroupedItem","children","quickActionsRow","map","action","quickActionItem","quickActionCircle","backgroundColor","onPress","name","icon","size","color","iconColor","quickActionText","title","id","create","padding","marginBottom","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius","flexDirection","alignItems","justifyContent","flexWrap","minWidth","width","height","borderRadius","fontSize","fontWeight","textAlign"],"sourceRoot":"../../../../src","sources":["ui/components/QuickActions.tsx"],"mappings":";;AACA,SAASA,IAAI,EAAEC,IAAI,EAAEC,gBAAgB,EAAEC,UAAU,QAAQ,cAAc;AACvE,SAASC,QAAQ,QAAQ,oBAAoB;AAC7C,SAASC,QAAQ,QAAQ,oBAAoB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAe9C,MAAMC,YAAyC,GAAGA,CAAC;EAAEC,OAAO;EAAEC;AAAM,CAAC,KAAK;EACtE,MAAM;IAAEC;EAAO,CAAC,GAAGR,QAAQ,CAAC,CAAC;EAE7B,oBACIE,IAAA,CAACP,IAAI;IACDc,SAAS,EAAC,cAAc;IACxBC,KAAK,EAAE,CACHC,MAAM,CAACC,qBAAqB,EAC5BD,MAAM,CAACE,gBAAgB,EACvBF,MAAM,CAACG,eAAe,CACxB;IAAAC,QAAA,eAEFb,IAAA,CAACP,IAAI;MAACe,KAAK,EAAEC,MAAM,CAACK,eAAgB;MAAAD,QAAA,EAC/BT,OAAO,CAACW,GAAG,CAAEC,MAAM,iBAChBd,KAAA,CAACT,IAAI;QAAiBe,KAAK,EAAEC,MAAM,CAACQ,eAAgB;QAAAJ,QAAA,gBAChDb,IAAA,CAACL,gBAAgB;UACba,KAAK,EAAE,CACHC,MAAM,CAACS,iBAAiB,EACxB;YAAEC,eAAe,EAAEb,MAAM,GAAG,wBAAwB,GAAG;UAAmB,CAAC,CAC7E;UACFc,OAAO,EAAEJ,MAAM,CAACI,OAAQ;UAAAP,QAAA,eAExBb,IAAA,CAACH,QAAQ;YAACwB,IAAI,EAAEL,MAAM,CAACM,IAAsD;YAACC,IAAI,EAAE,EAAG;YAACC,KAAK,EAAER,MAAM,CAACS;UAAU,CAAE;QAAC,CACrG,CAAC,eACnBzB,IAAA,CAACN,IAAI;UAACa,SAAS,EAAC,iBAAiB;UAACC,KAAK,EAAEC,MAAM,CAACiB,eAAgB;UAAAb,QAAA,EAAEG,MAAM,CAACW;QAAK,CAAO,CAAC;MAAA,GAV/EX,MAAM,CAACY,EAWZ,CACT;IAAC,CACA;EAAC,CACL,CAAC;AAEf,CAAC;AAED,MAAMnB,MAAM,GAAGb,UAAU,CAACiC,MAAM,CAAC;EAC7BnB,qBAAqB,EAAE;IACnBoB,OAAO,EAAE,EAAE;IACXC,YAAY,EAAE;EAClB,CAAC;EACDpB,gBAAgB,EAAE;IACdqB,mBAAmB,EAAE,EAAE;IACvBC,oBAAoB,EAAE;EAC1B,CAAC;EACDrB,eAAe,EAAE;IACbsB,sBAAsB,EAAE,EAAE;IAC1BC,uBAAuB,EAAE,EAAE;IAC3BJ,YAAY,EAAE;EAClB,CAAC;EACDjB,eAAe,EAAE;IACbsB,aAAa,EAAE,KAAK;IACpBC,UAAU,EAAE,YAAY;IACxBC,cAAc,EAAE,cAAc;IAC9BC,QAAQ,EAAE;EACd,CAAC;EACDtB,eAAe,EAAE;IACboB,UAAU,EAAE,QAAQ;IACpBG,QAAQ,EAAE,EAAE;IACZT,YAAY,EAAE;EAClB,CAAC;EACDb,iBAAiB,EAAE;IACfuB,KAAK,EAAE,EAAE;IACTC,MAAM,EAAE,EAAE;IACVC,YAAY,EAAE,EAAE;IAChBN,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE,QAAQ;IACxBP,YAAY,EAAE;EAClB,CAAC;EACDL,eAAe,EAAE;IACbkB,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE,KAAK;IACjBC,SAAS,EAAE;EACf;AACJ,CAAC,CAAC;AAEF,eAAe3C,YAAY","ignoreList":[]}
+{"version":3,"names":["View","Text","TouchableOpacity","StyleSheet","Ionicons","useTheme","jsx","_jsx","jsxs","_jsxs","QuickActions","actions","theme","colors","className","style","styles","quickActionsContainer","firstGroupedItem","lastGroupedItem","children","quickActionsRow","map","action","quickActionItem","quickActionCircle","backgroundColor","backgroundTertiary","onPress","name","icon","size","color","iconColor","quickActionText","title","id","create","padding","marginBottom","borderTopLeftRadius","borderTopRightRadius","borderBottomLeftRadius","borderBottomRightRadius","flexDirection","alignItems","justifyContent","flexWrap","minWidth","width","height","borderRadius","fontSize","fontWeight","textAlign"],"sourceRoot":"../../../../src","sources":["ui/components/QuickActions.tsx"],"mappings":";;AACA,SAASA,IAAI,EAAEC,IAAI,EAAEC,gBAAgB,EAAEC,UAAU,QAAQ,cAAc;AACvE,SAASC,QAAQ,QAAQ,oBAAoB;AAC7C,SAASC,QAAQ,QAAQ,oBAAoB;AAAC,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAe9C,MAAMC,YAAyC,GAAGA,CAAC;EAAEC,OAAO;EAAEC;AAAM,CAAC,KAAK;EACtE,MAAM;IAAEC;EAAO,CAAC,GAAGR,QAAQ,CAAC,CAAC;EAE7B,oBACIE,IAAA,CAACP,IAAI;IACDc,SAAS,EAAC,cAAc;IACxBC,KAAK,EAAE,CACHC,MAAM,CAACC,qBAAqB,EAC5BD,MAAM,CAACE,gBAAgB,EACvBF,MAAM,CAACG,eAAe,CACxB;IAAAC,QAAA,eAEFb,IAAA,CAACP,IAAI;MAACe,KAAK,EAAEC,MAAM,CAACK,eAAgB;MAAAD,QAAA,EAC/BT,OAAO,CAACW,GAAG,CAAEC,MAAM,iBAChBd,KAAA,CAACT,IAAI;QAAiBe,KAAK,EAAEC,MAAM,CAACQ,eAAgB;QAAAJ,QAAA,gBAChDb,IAAA,CAACL,gBAAgB;UACba,KAAK,EAAE,CACHC,MAAM,CAACS,iBAAiB,EACxB;YAAEC,eAAe,EAAEb,MAAM,CAACc;UAAmB,CAAC,CAChD;UACFC,OAAO,EAAEL,MAAM,CAACK,OAAQ;UAAAR,QAAA,eAExBb,IAAA,CAACH,QAAQ;YAACyB,IAAI,EAAEN,MAAM,CAACO,IAAsD;YAACC,IAAI,EAAE,EAAG;YAACC,KAAK,EAAET,MAAM,CAACU;UAAU,CAAE;QAAC,CACrG,CAAC,eACnB1B,IAAA,CAACN,IAAI;UAACa,SAAS,EAAC,iBAAiB;UAACC,KAAK,EAAEC,MAAM,CAACkB,eAAgB;UAAAd,QAAA,EAAEG,MAAM,CAACY;QAAK,CAAO,CAAC;MAAA,GAV/EZ,MAAM,CAACa,EAWZ,CACT;IAAC,CACA;EAAC,CACL,CAAC;AAEf,CAAC;AAED,MAAMpB,MAAM,GAAGb,UAAU,CAACkC,MAAM,CAAC;EAC7BpB,qBAAqB,EAAE;IACnBqB,OAAO,EAAE,EAAE;IACXC,YAAY,EAAE;EAClB,CAAC;EACDrB,gBAAgB,EAAE;IACdsB,mBAAmB,EAAE,EAAE;IACvBC,oBAAoB,EAAE;EAC1B,CAAC;EACDtB,eAAe,EAAE;IACbuB,sBAAsB,EAAE,EAAE;IAC1BC,uBAAuB,EAAE,EAAE;IAC3BJ,YAAY,EAAE;EAClB,CAAC;EACDlB,eAAe,EAAE;IACbuB,aAAa,EAAE,KAAK;IACpBC,UAAU,EAAE,YAAY;IACxBC,cAAc,EAAE,cAAc;IAC9BC,QAAQ,EAAE;EACd,CAAC;EACDvB,eAAe,EAAE;IACbqB,UAAU,EAAE,QAAQ;IACpBG,QAAQ,EAAE,EAAE;IACZT,YAAY,EAAE;EAClB,CAAC;EACDd,iBAAiB,EAAE;IACfwB,KAAK,EAAE,EAAE;IACTC,MAAM,EAAE,EAAE;IACVC,YAAY,EAAE,EAAE;IAChBN,UAAU,EAAE,QAAQ;IACpBC,cAAc,EAAE,QAAQ;IACxBP,YAAY,EAAE;EAClB,CAAC;EACDL,eAAe,EAAE;IACbkB,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE,KAAK;IACjBC,SAAS,EAAE;EACf;AACJ,CAAC,CAAC;AAEF,eAAe5C,YAAY","ignoreList":[]}

package/lib/module/ui/components/SignInModal.js

@@ -113,15 +113,34 @@ const SignInModal = () => {
     }]
   }));
 
-  // Handle successful authorization
-  const handleAuthSuccess = useCallback(async sessionId => {
+  // Handle successful authorization.
+  //
+  // The auth-session socket (or fallback poll) hands us the new
+  // `sessionId`. Before any session-management code can touch it we
+  // MUST first exchange the secret `sessionToken` (held only by this
+  // client) for the first access token via `claimSessionByToken` —
+  // this is the device-flow equivalent of OAuth's code-for-token
+  // exchange (RFC 8628 §3.4).
+  //
+  // Without that exchange the SDK has no bearer token and every
+  // subsequent call (including `switchSession` -> `getTokenBySession`)
+  // would 401 against the C1-hardened API. Once `claimSessionByToken`
+  // plants the tokens in the HttpService, the rest of the session
+  // wiring (state, persistence, language preference) flows through
+  // the normal `switchSession` path.
+  const handleAuthSuccess = useCallback(async (sessionId, sessionToken) => {
     if (isProcessingRef.current) return;
     isProcessingRef.current = true;
     try {
+      // Plant the bearer + refresh tokens for this newly-authorized
+      // session. Single-use — replay attempts on this sessionToken
+      // are rejected by the API.
+      await oxyServices.claimSessionByToken(sessionToken);
+
+      // Now the SDK has a bearer token, the normal session
+      // management path can hydrate state from the sessionId.
       if (switchSession) {
         await switchSession(sessionId);
-      } else {
-        await oxyServices.getTokenBySession(sessionId);
       }
       hideSignInModal();
     } catch (err) {
@@ -162,7 +181,10 @@ const SignInModal = () => {
       debug.log('Auth update received:', payload);
       if (payload.status === 'authorized' && payload.sessionId) {
         cleanup();
-        handleAuthSuccess(payload.sessionId);
+        // `sessionToken` was generated by this client and is in scope
+        // via the `sessionToken` arg — pass it through so the claim
+        // call can exchange it for the first access token.
+        handleAuthSuccess(payload.sessionId, sessionToken);
       } else if (payload.status === 'cancelled') {
         cleanup();
         setError('Authorization was denied.');
@@ -188,7 +210,9 @@ const SignInModal = () => {
         });
         if (response.authorized && response.sessionId) {
           cleanup();
-          handleAuthSuccess(response.sessionId);
+          // Pass the original sessionToken through; the claim
+          // exchange needs it to mint the first access token.
+          handleAuthSuccess(response.sessionId, sessionToken);
         } else if (response.status === 'cancelled') {
           cleanup();
           setError('Authorization was denied.');
@@ -230,14 +254,14 @@ const SignInModal = () => {
     }
   }, [oxyServices, connectSocket]);
 
-  // Generate a random session token
+  // Generate a cryptographically random session token.
+  // 16 random bytes -> 32 hex chars (128 bits of entropy) — unguessable.
+  // crypto.getRandomValues is guaranteed available because importing
+  // @oxyhq/core installs a polyfill via expo-crypto on React Native.
   const generateSessionToken = () => {
-    const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-    let result = '';
-    for (let i = 0; i < 32; i++) {
-      result += chars.charAt(Math.floor(Math.random() * chars.length));
-    }
-    return result;
+    const bytes = new Uint8Array(16);
+    crypto.getRandomValues(bytes);
+    return Array.from(bytes, b => b.toString(16).padStart(2, '0')).join('');
   };
 
   // Build the QR code data