@oxyhq/services 5.17.17 → 5.17.18

package/src/ui/components/BottomSheetRouter.tsx

@@ -31,7 +31,12 @@ export interface BottomSheetRouterProps {
     onDismiss?: () => void;
 }
 
-// Compatibility re-exports removed. Import types/functions directly from their sources instead.
+// Re-export types for backward compatibility
+export type { BottomSheetRouterState };
+export { subscribeToBottomSheetState };
+
+// Re-export BottomSheetRef for backward compatibility
+export type { BottomSheetRef };
 
 /**
  * BottomSheetRouter - Manages navigation within bottom sheet modals

package/src/ui/components/Icon.tsx

@@ -125,7 +125,7 @@ const Icon = ({
       ? source.source
       : source;
   const iconColor =
-    color || (theme.isV3 ? theme.colors.onSurface : ((theme.colors as any).text || theme.colors.onSurface));
+    color || (theme.isV3 ? theme.colors.onSurface : (theme.colors.text || theme.colors.onSurface));
 
   if (isImageSource(s)) {
     return (

package/src/ui/components/IconButton/utils.ts

@@ -124,7 +124,7 @@ const getIconColor = ({
     return customIconColor;
   }
 
-  return (theme.colors as any).text || theme.colors.onSurface;
+  return theme.colors.text || theme.colors.onSurface;
 };
 
 const getRippleColor = ({

package/src/ui/components/OxyProvider.tsx

@@ -10,6 +10,7 @@ import { setupFonts } from './FontLoader';
 import BottomSheetRouter from './BottomSheetRouter';
 import { Toaster } from '../../lib/sonner';
 import { createQueryClient } from '../hooks/queryClient';
+import { createPlatformStorage, type StorageInterface } from '../utils/storageHelpers';
 
 // Initialize fonts automatically
 setupFonts();
@@ -23,30 +24,53 @@ setupFonts();
 const OxyProvider: FC<OxyProviderProps> = ({
     oxyServices,
     children,
-    contextOnly = false,
     onAuthStateChange,
     storageKeyPrefix,
     baseURL,
+    authWebUrl,
+    authRedirectUri,
     queryClient: providedQueryClient,
 }) => {
-    // contextOnly is retained for backwards compatibility while the UI-only
-    // bottom sheet experience is removed. At the moment both modes behave the same.
-    void contextOnly;
 
-    // Initialize React Query Client (in-memory; persistence handled separately if needed)
+    // Simple storage initialization for query persistence
+    const storageRef = useRef<StorageInterface | null>(null);
     const queryClientRef = useRef<ReturnType<typeof createQueryClient> | null>(null);
-    const [queryClient, setQueryClient] = useState<ReturnType<typeof createQueryClient>>(
-        () => providedQueryClient ?? createQueryClient(),
-    );
+    const [queryClient, setQueryClient] = useState<ReturnType<typeof createQueryClient> | null>(null);
 
     useEffect(() => {
-        if (providedQueryClient && queryClientRef.current !== providedQueryClient) {
+        if (providedQueryClient) {
             queryClientRef.current = providedQueryClient;
             setQueryClient(providedQueryClient);
-        } else if (!queryClientRef.current) {
-            queryClientRef.current = queryClient;
+            return;
         }
-    }, [providedQueryClient, queryClient]);
+
+        // 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) {
+                    if (__DEV__) {
+                        console.warn('[OxyProvider] Failed to initialize storage for query persistence', error);
+                    }
+                    const client = createQueryClient(null);
+                    queryClientRef.current = client;
+                    setQueryClient(client);
+                }
+            });
+
+        return () => {
+            mounted = false;
+        };
+    }, [providedQueryClient]);
 
     // Hook React Query focus manager into React Native AppState
     useEffect(() => {
@@ -107,6 +131,12 @@ const OxyProvider: FC<OxyProviderProps> = ({
         };
     }, []);
 
+    // Ensure we have a valid QueryClient
+    if (!queryClient) {
+        // Return loading state or fallback
+        return null;
+    }
+
     return (
         <SafeAreaProvider>
             <GestureHandlerRootView style={{ flex: 1 }}>
@@ -116,6 +146,8 @@ const OxyProvider: FC<OxyProviderProps> = ({
                             <OxyContextProvider
                                 oxyServices={oxyServices as any}
                                 baseURL={baseURL}
+                                authWebUrl={authWebUrl}
+                                authRedirectUri={authRedirectUri}
                                 storageKeyPrefix={storageKeyPrefix}
                                 onAuthStateChange={onAuthStateChange as any}
                             >

package/src/ui/components/TextField/Addons/Outline.tsx

@@ -7,7 +7,7 @@ import {
   ViewStyle,
 } from 'react-native';
 
-import { TextFieldLabelProp } from '../types';
+import { TextInputLabelProp } from '../types';
 
 type OutlineProps = {
   isV3: boolean;
@@ -17,7 +17,7 @@ type OutlineProps = {
   focused?: boolean;
   outlineColor?: string;
   roundness?: number;
-  label?: TextFieldLabelProp;
+  label?: TextInputLabelProp;
   style?: StyleProp<ViewStyle>;
 };
 

package/src/ui/components/TextField/Adornment/utils.ts

@@ -33,7 +33,7 @@ export function getTextColor({ theme, disabled }: BaseProps) {
     return theme.colors.onSurfaceVariant;
   }
   // For non-V3 themes, apply opacity to text color
-  const textColor = theme?.colors?.onSurface || (theme?.colors as any)?.text || '#000000';
+  const textColor = theme?.colors?.onSurface || theme?.colors?.text || '#000000';
   const opacity = theme.dark ? 0.7 : 0.54;
   return hexToRgba(textColor, opacity);
 }
@@ -55,7 +55,7 @@ export function getIconColor({
   }
 
   if (!theme.isV3) {
-    return (theme.colors as any).text || theme.colors.onSurface;
+    return theme.colors.text || theme.colors.onSurface;
   }
 
   if (disabled) {

package/src/ui/components/TextField/helpers.tsx

@@ -26,7 +26,7 @@ import {
   MD3_MIN_HEIGHT,
   MD3_OUTLINED_INPUT_OFFSET,
 } from './constants';
-import type { TextFieldLabelProp } from './types';
+import type { TextInputLabelProp } from './types';
 import type { InternalTheme } from "../types";
 
 type PaddingProps = {
@@ -37,7 +37,7 @@ type PaddingProps = {
   topPosition: number;
   fontSize: number;
   lineHeight?: number;
-  label?: TextFieldLabelProp | null;
+  label?: TextInputLabelProp | null;
   scale: number;
   offset: number;
   isAndroid: boolean;
@@ -329,10 +329,10 @@ const getInputTextColor = ({
   }
 
   if (disabled) {
-    return color((theme.colors as any).text || theme.colors.onSurface).alpha(0.54).rgb().string();
+    return color(theme.colors.text || theme.colors.onSurface).alpha(0.54).rgb().string();
   }
 
-  return (theme.colors as any).text || theme.colors.onSurface;
+  return theme.colors.text || theme.colors.onSurface;
 };
 
 const getActiveColor = ({
@@ -364,7 +364,7 @@ const getActiveColor = ({
       return theme.colors.onSurfaceDisabled;
     }
 
-    return color((theme.colors as any).text || theme.colors.onSurface).alpha(0.54).rgb().string();
+    return color(theme.colors.text || theme.colors.onSurface).alpha(0.54).rgb().string();
   }
 
   return theme.colors.primary;
@@ -380,10 +380,10 @@ const getPlaceholderColor = ({ theme, disabled }: BaseProps) => {
   }
 
   if (disabled) {
-    return (theme.colors as any).disabled || theme.colors.onSurfaceDisabled;
+    return theme.colors.disabled || theme.colors.onSurfaceDisabled;
   }
 
-  return (theme.colors as any).placeholder || theme.colors.onSurfaceVariant;
+  return theme.colors.placeholder || theme.colors.onSurfaceVariant;
 };
 
 const getSelectionColor = ({
@@ -443,7 +443,7 @@ const getFlatUnderlineColor = ({
     return 'transparent';
   }
 
-  return (theme.colors as any).disabled || theme.colors.onSurfaceVariant;
+  return theme.colors.disabled || theme.colors.onSurfaceVariant;
 };
 
 const getOutlinedOutlineInputColor = ({
@@ -472,9 +472,9 @@ const getOutlinedOutlineInputColor = ({
     if (isTransparent) {
       return customOutlineColor;
     }
-    return (theme.colors as any).disabled || theme.colors.onSurfaceDisabled;
+    return theme.colors.disabled || theme.colors.onSurfaceDisabled;
   }
-  return (theme.colors as any).placeholder || theme.colors.onSurfaceVariant;
+  return theme.colors.placeholder || theme.colors.onSurfaceVariant;
 };
 
 export const getFlatInputColors = ({

package/src/ui/components/TextField/types.tsx

@@ -15,7 +15,7 @@ import type {
 import type { $Omit, InternalTheme, ThemeProp } from '../types';
 
 export type TextFieldLabelProp = string | React.ReactElement;
-// Removed alias `TextInputLabelProp`; use `TextFieldLabelProp` directly.
+export type TextInputLabelProp = TextFieldLabelProp; // Alias for backward compatibility
 
 type TextInputProps = React.ComponentPropsWithRef<typeof NativeTextInput> & {
   mode?: 'flat' | 'outlined';

package/src/ui/components/TouchableRipple/utils.ts

@@ -40,9 +40,9 @@ const getRippleColor = ({
   }
 
   if (theme.dark) {
-    return colorUtil(theme.colors.onSurface || (theme.colors as any).text || '#000000').alpha(0.32).rgb().string();
+    return colorUtil(theme.colors.onSurface || theme.colors.text || '#000000').alpha(0.32).rgb().string();
   }
-  return colorUtil((theme.colors as any).text || theme.colors.onSurface || '#000000').alpha(0.2).rgb().string();
+  return colorUtil(theme.colors.text || theme.colors.onSurface || '#000000').alpha(0.2).rgb().string();
 };
 
 export const getTouchableRippleColors = ({

package/src/ui/components/Typography/AnimatedText.tsx

@@ -72,10 +72,10 @@ const AnimatedText = forwardRef<Text & HTMLElement, Props<never>>(
         />
       );
     } else {
-      const font = !theme.isV3 ? ((theme.fonts as any).regular || theme.fonts.default) : theme.fonts.bodyMedium;
+      const font = !theme.isV3 ? (theme.fonts.regular || theme.fonts.default) : theme.fonts.bodyMedium;
       const textStyle = {
         ...font,
-        color: theme.isV3 ? theme.colors.onSurface : ((theme.colors as any).text || theme.colors.onSurface),
+        color: theme.isV3 ? theme.colors.onSurface : (theme.colors.text || theme.colors.onSurface),
       };
       return (
         <Animated.Text

package/src/ui/components/types.tsx

@@ -55,6 +55,10 @@ export type InternalTheme = {
       level4: string;
       level5: string;
     };
+    // Legacy properties for backward compatibility
+    text?: string;
+    disabled?: string;
+    placeholder?: string;
   };
   fonts: {
     displayLarge: any;
@@ -73,6 +77,8 @@ export type InternalTheme = {
     bodyMedium: any;
     bodySmall: any;
     default: any;
+    // Legacy property for backward compatibility
+    regular?: any;
   };
 };