@onairos/react-native 3.0.57 → 3.0.59

package/src/components/UniversalOnboarding.tsx

@@ -50,6 +50,7 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
   visible,
   onClose,
   AppName,
+  appIcon,
   requestData,
   returnLink,
   onComplete,
@@ -217,8 +218,16 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
   };
 
   const loadInitialStatus = useCallback(async () => {
-    const status = await getConnectionStatus();
-    setConnections(status);
+    try {
+      console.log('🔄 Loading initial connection status...');
+      const status = await getConnectionStatus();
+      console.log('✅ Connection status loaded:', status);
+      setConnections(status || {});
+    } catch (error) {
+      console.error('❌ Failed to load connection status:', error);
+      // Set empty connections to prevent crashes
+      setConnections({});
+    }
   }, [getConnectionStatus]);
 
   const togglePlatform = useCallback(async (platformId: string) => {
@@ -454,32 +463,38 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
 
   // Function to handle email submission
   const handleEmailSubmit = useCallback(async () => {
-    if (!email.trim()) {
-      Alert.alert('Error', 'Please enter your email address');
-      return;
-    }
-    
-    // Basic email validation
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    if (!emailRegex.test(email.trim())) {
-      Alert.alert('Error', 'Please enter a valid email address');
-      return;
-    }
-    
-    console.log('📧 Email submitted:', email.trim());
-    
-    // Request verification code
     try {
-      const result = await requestEmailVerification(email.trim());
-      if (result.success) {
-        console.log('✅ Verification code requested');
-        setStep('verify');
-      } else {
-        Alert.alert('Error', result.error || 'Failed to send verification code');
+      if (!email || !email.trim()) {
+        Alert.alert('Error', 'Please enter your email address');
+        return;
+      }
+      
+      // Basic email validation
+      const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+      if (!emailRegex.test(email.trim())) {
+        Alert.alert('Error', 'Please enter a valid email address');
+        return;
+      }
+      
+      console.log('📧 Email submitted:', email.trim());
+      
+      // Request verification code
+      try {
+        const result = await requestEmailVerification(email.trim());
+        if (result && result.success) {
+          console.log('✅ Verification code requested');
+          setStep('verify');
+        } else {
+          console.warn('⚠️ Email verification request failed:', result);
+          Alert.alert('Error', result?.error || 'Failed to send verification code');
+        }
+      } catch (verificationError) {
+        console.error('❌ Error requesting verification:', verificationError);
+        Alert.alert('Error', 'Failed to send verification code. Please check your internet connection.');
       }
     } catch (error) {
-      console.error('❌ Error requesting verification:', error);
-      Alert.alert('Error', 'Failed to send verification code');
+      console.error('❌ Unexpected error in email submission:', error);
+      Alert.alert('Error', 'An unexpected error occurred. Please try again.');
     }
   }, [email]);
 
@@ -508,7 +523,18 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
           setShowDataRequestModal(true);
         } else {
           console.log('New user, proceeding to platform connection');
-          setUsername(email.split('@')[0]); // Use email prefix as username
+          // Safely set username from email prefix
+          try {
+            const emailPrefix = email.trim().split('@')[0];
+            if (emailPrefix && emailPrefix.length > 0) {
+              setUsername(emailPrefix);
+            } else {
+              setUsername('User'); // Fallback username
+            }
+          } catch (usernameError) {
+            console.warn('Failed to extract username from email, using fallback:', usernameError);
+            setUsername('User');
+          }
           setStep('connect');
         }
       } else {
@@ -520,7 +546,7 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
     } finally {
       setIsVerifyingCode(false);
     }
-  }, [email, verificationCode, onComplete]);
+  }, [email, verificationCode]);
 
   const handlePinSubmit = useCallback(async (userPin: string) => {
     setPin(userPin);
@@ -781,15 +807,9 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
 
                 {step === 'connect' && (
                   <>
-                    {/* Header with app icon and arrow to Onairos icon */}
+                    {/* Header with Onairos icon and arrow to app icon */}
                     <View style={styles.header}>
                       <View style={styles.headerContent}>
-                        <View style={styles.appIcon}>
-                          <Text style={styles.appIconText}>
-                            {AppName.charAt(0)}
-                          </Text>
-                        </View>
-                        <Icon name="arrow-forward" size={24} color="#666" style={styles.arrow} />
                         <View style={styles.onairosIcon}>
                           <Image 
                             source={require('../assets/images/onairos_logo.png')} 
@@ -797,6 +817,20 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
                             resizeMode="contain"
                           />
                         </View>
+                        <Icon name="arrow-forward" size={24} color="#666" style={styles.arrow} />
+                        <View style={styles.appIcon}>
+                          {appIcon ? (
+                            <Image 
+                              source={appIcon} 
+                              style={styles.appIconImage} 
+                              resizeMode="contain"
+                            />
+                          ) : (
+                            <Text style={styles.appIconText}>
+                              {AppName.charAt(0)}
+                            </Text>
+                          )}
+                        </View>
                       </View>
                       
 
@@ -959,21 +993,7 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
           visible={showDataRequestModal}
           onClose={handleDataRequestDecline}
           onAccept={handleDataRequestAccept}
-          requestData={{
-            // Convert DataTier format to expected format
-            Small: {
-              description: requestData.Small?.descriptions || 'Basic data access',
-              type: requestData.Small?.type || 'basic'
-            },
-            Medium: {
-              description: requestData.Medium?.descriptions || 'Standard data access',
-              type: requestData.Medium?.type || 'standard'
-            },
-            Large: {
-              description: requestData.Large?.descriptions || 'Full data access',
-              type: requestData.Large?.type || 'full'
-            }
-          }}
+          requestData={requestData}
           AppName={AppName}
         />
       )}
@@ -1034,6 +1054,10 @@ const styles = StyleSheet.create({
     fontSize: 24,
     color: '#000',
   },
+  appIconImage: {
+    width: 32,
+    height: 32,
+  },
   arrow: {
     marginHorizontal: 16,
   },

package/src/hooks/useConnections.ts

@@ -30,28 +30,37 @@ export const useConnections = () => {
   const getConnectionStatus = useCallback(async (): Promise<ConnectionStatus> => {
     try {
       if (isKeychainAvailable()) {
-        const stored = await Keychain.getGenericPassword({
-          service: STORAGE_KEYS.connections
-        });
-        if (stored) {
-          return JSON.parse(stored.password);
+        try {
+          const stored = await Keychain.getGenericPassword({
+            service: STORAGE_KEYS.connections
+          });
+          if (stored && stored.password) {
+            const parsed = JSON.parse(stored.password);
+            // Validate the parsed data structure
+            if (parsed && typeof parsed === 'object') {
+              return parsed;
+            }
+          }
+        } catch (keychainError) {
+          console.warn('Keychain access failed, using fallback:', keychainError);
+          // Clear corrupted data
+          try {
+            await Keychain.resetGenericPassword({ service: STORAGE_KEYS.connections });
+          } catch (resetError) {
+            console.warn('Failed to reset keychain:', resetError);
+          }
         }
-      } else {
-        // Use in-memory mock storage if Keychain is not available
-        return mockConnectionStorage[STORAGE_KEYS.connections] || {};
       }
-      return {};
+      
+      // Use in-memory mock storage if Keychain is not available or failed
+      const mockData = mockConnectionStorage[STORAGE_KEYS.connections] || {};
+      console.log('Using mock connection storage:', mockData);
+      return mockData;
     } catch (error) {
       console.error('Error getting connection status:', error);
       
-      // Return mock data in debug mode to prevent crashes
-      if (__DEV__) {
-        return {
-          instagram: { userName: 'instagram_debug_user', connected: true },
-          youtube: { userName: 'youtube_debug_user', connected: true }
-        };
-      }
-      
+      // Always return empty object as safe fallback
+      console.log('Returning empty connections due to error');
       return {};
     }
   }, []);

package/src/types.ts

@@ -4,14 +4,26 @@ export interface DataTier {
   reward: string;
 }
 
+export interface DataRequest {
+  name: string;
+  description: string;
+  reward: string;
+}
+
 export interface UniversalOnboardingProps {
   visible: boolean;
   onClose: () => void;
   AppName: string;
+  appIcon?: any; // Optional app icon (React Native ImageSourcePropType)
   requestData: {
-    Small: DataTier;
-    Medium: DataTier;
-    Large: DataTier;
+    // Support both old format (for backward compatibility)
+    Small?: DataTier;
+    Medium?: DataTier;
+    Large?: DataTier;
+    // And new format
+    personality_traits?: DataRequest;
+    sentiment_analysis?: DataRequest;
+    [key: string]: DataTier | DataRequest | undefined;
   };
   returnLink: string;
   onComplete: (apiUrl: string, token: string, data: any) => void;
@@ -38,11 +50,17 @@ export interface OnairosButtonProps {
   returnLink?: string;
   prefillUrl?: string;
   AppName: string;
+  appIcon?: any; // Optional app icon (React Native ImageSourcePropType)
   buttonType?: 'normal' | 'pill';
   requestData?: {
-    Small: DataTier;
-    Medium: DataTier;
-    Large: DataTier;
+    // Support both old format (for backward compatibility)
+    Small?: DataTier;
+    Medium?: DataTier;
+    Large?: DataTier;
+    // And new format
+    personality_traits?: DataRequest;
+    sentiment_analysis?: DataRequest;
+    [key: string]: DataTier | DataRequest | undefined;
   };
   buttonWidth?: number;
   buttonHeight?: number;
@@ -135,15 +153,21 @@ export interface CredentialsResult {
 
 export interface OverlayProps {
   data: {
-    [key: string]: {
-      type: string;
-      descriptions: string;
-      reward: string;
-    };
+    // Support both old format (for backward compatibility)
+    Small?: DataTier;
+    Medium?: DataTier;
+    Large?: DataTier;
+    // And new format
+    personality_traits?: DataRequest;
+    sentiment_analysis?: DataRequest;
+    [key: string]: DataTier | DataRequest | undefined;
   };
   username: string;
   modelKey: string;
   onResolved: (apiUrl: string, accessToken: string, loginDetails: any) => void;
+  appName?: string;
+  darkMode?: boolean;
+  platforms?: Array<{id: string, name: string, icon: any}>;
 }
 
 export interface BiometricOptions {