@onairos/react-native 3.0.55 → 3.0.57

package/src/components/UniversalOnboarding.tsx

@@ -22,6 +22,7 @@ import Icon from 'react-native-vector-icons/MaterialIcons';
 import { PlatformList } from './PlatformList';
 import { PinInput } from './PinInput';
 import { TrainingModal } from './TrainingModal';
+import { DataRequestModal } from './DataRequestModal';
 import { OAuthWebView } from './onboarding/OAuthWebView';
 import { useConnections } from '../hooks/useConnections';
 import { COLORS, DEEP_LINK_CONFIG } from '../constants';
@@ -60,7 +61,7 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
   auto = false,
   partner,
 }) => {
-  const [step, setStep] = useState<'email' | 'verify' | 'connect' | 'pin' | 'training' | 'oauth' | 'success'>('email');
+  const [step, setStep] = useState<'email' | 'verify' | 'dataRequest' | 'connect' | 'pin' | 'training' | 'oauth' | 'success'>('email');
   const [connections, setConnections] = useState<ConnectionStatus>({});
   const [pin, setPin] = useState<string>('');
   const [selectedTier, setSelectedTier] = useState<'Small' | 'Medium' | 'Large'>('Medium');
@@ -78,6 +79,8 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
   const [email, setEmail] = useState<string>('');
   const [verificationCode, setVerificationCode] = useState<string>('');
   const [isVerifyingCode, setIsVerifyingCode] = useState<boolean>(false);
+  const [showDataRequestModal, setShowDataRequestModal] = useState<boolean>(false);
+  const [isExistingUser, setIsExistingUser] = useState<boolean>(false);
   
   // Add refs for cleanup
   const successTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
@@ -495,16 +498,14 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
       if (result.success) {
         console.log('✅ Email verification successful');
         
-        // For now, assume all are new users (existing user detection can be added later)
-        const isExistingUser = false;
+        // For now, always treat as new users for testing (can be updated later)
+        // In production, this would check if user exists in database
+        const existingUser = false; // TODO: Check backend for existing user
+        setIsExistingUser(existingUser);
         
-        if (isExistingUser) {
-          console.log('Existing user detected, skipping onboarding');
-          onComplete('https://api2.onairos.uk', 'existing-session-token', {
-            existingAccount: true,
-            email: email.trim(),
-            skipOnboarding: true,
-          });
+        if (existingUser) {
+          console.log('Existing user detected, showing data request modal');
+          setShowDataRequestModal(true);
         } else {
           console.log('New user, proceeding to platform connection');
           setUsername(email.split('@')[0]); // Use email prefix as username
@@ -554,41 +555,62 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
     } catch (error) {
       console.error('Failed to save session data:', error);
     }
+  }, [connections, selectedTier, platformToggles, username, AppName, auto, inferenceData, partner]);
+
+  const handleTrainingComplete = useCallback(() => {
+    console.log('🎉 Training completed successfully');
     
-    // Simulate training progress over 10 seconds
-    let progress = 0;
-    const interval = setInterval(() => {
-      progress += 0.1; // 10% every second for 10 seconds total
-      setTraining({
-        progress,
-        eta: `${Math.round((1 - progress) * 10)} seconds remaining`,
-      });
-      if (progress >= 1) {
-        clearInterval(interval);
-        
-        // Prepare completion data
-        const completionData = {
-          pin: userPin,
-          connections,
-          platformToggles,
-          selectedTier,
-          tierData: requestData?.[selectedTier],
-          sessionSaved: true,
-          // Add inference data if auto mode is enabled
-          ...(auto && inferenceData && { inferenceData }),
-          // Add partner info for special partners
-          ...(partner && { partner: partner === 'couplebible' ? 'CoupleBible' : partner }),
-        };
-        
-        console.log('Completion data prepared:', completionData);
-        
-        // Close overlay and call the original onComplete callback
-        onComplete('https://api2.onairos.uk', 'dummy-token', completionData);
-      }
-    }, 1000); // Update every 1 second
-  }, [connections, onComplete, selectedTier, requestData, platformToggles, username, AppName, auto, inferenceData, partner]);
+    // Prepare completion data
+    const completionData = {
+      pin,
+      connections,
+      platformToggles,
+      selectedTier,
+      tierData: requestData?.[selectedTier],
+      sessionSaved: true,
+      // Add inference data if auto mode is enabled
+      ...(auto && inferenceData && { inferenceData }),
+      // Add partner info for special partners
+      ...(partner && { partner: partner === 'couplebible' ? 'CoupleBible' : partner }),
+    };
+    
+    console.log('Completion data prepared:', completionData);
+    
+    // Close the modal first
+    handleClose();
+    
+    // Then call the completion callback
+    setTimeout(() => {
+      onComplete('https://api2.onairos.uk', 'dummy-token', completionData);
+    }, 100);
+  }, [pin, connections, platformToggles, selectedTier, requestData, auto, inferenceData, partner, handleClose, onComplete]);
+
+  const handleDataRequestAccept = useCallback(() => {
+    console.log('Data request accepted for existing user');
+    setShowDataRequestModal(false);
+    
+    // Complete onboarding for existing user
+    onComplete('https://api2.onairos.uk', 'existing-session-token', {
+      existingAccount: true,
+      email: email.trim(),
+      dataRequestAccepted: true,
+      requestData,
+    });
+  }, [email, onComplete, requestData]);
+
+  const handleDataRequestDecline = useCallback(() => {
+    console.log('Data request declined');
+    setShowDataRequestModal(false);
+    handleClose();
+  }, [handleClose]);
 
   const canProceedToPin = useCallback(() => {
+    // For testing, allow proceeding without any platforms connected
+    if (debug || test) {
+      console.log('🧪 Testing mode: Allowing proceed without platform connections');
+      return true;
+    }
+    
     // Check if at least one platform is toggled on
     const hasPlatformConnected = Object.values(platformToggles).some(value => value === true);
     
@@ -599,7 +621,7 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
     }
     
     return hasPlatformConnected;
-  }, [platformToggles, auto, partner, inferenceData]);
+  }, [platformToggles, auto, partner, inferenceData, debug, test]);
 
   const handleProceed = () => {
     console.log('Proceeding to next step');
@@ -904,15 +926,7 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
                     progress={training.progress}
                     eta={training.eta}
                     onCancel={handleClose}
-                    onComplete={() => {
-                      onComplete('https://api2.onairos.uk', 'dummy-token', {
-                        pin,
-                        connections,
-                        platformToggles,
-                        selectedTier,
-                        tierData: requestData?.[selectedTier],
-                      });
-                    }}
+                    onComplete={handleTrainingComplete}
                     modelKey="onairosTrainingModel"
                     username={username}
                   />
@@ -938,6 +952,31 @@ export const UniversalOnboarding: React.FC<UniversalOnboardingProps> = ({
           </TouchableWithoutFeedback>
         </View>
       </TouchableWithoutFeedback>
+      
+      {/* Data Request Modal for existing users */}
+      {showDataRequestModal && requestData && (
+        <DataRequestModal
+          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'
+            }
+          }}
+          AppName={AppName}
+        />
+      )}
     </Modal>
   );
 };
@@ -952,7 +991,7 @@ const styles = StyleSheet.create({
   bottomSheet: {
     backgroundColor: '#fff',
     width: width,
-    height: height * 0.6,
+    height: height * 0.8,
     borderTopLeftRadius: 24,
     borderTopRightRadius: 24,
     overflow: 'hidden',
@@ -1180,9 +1219,10 @@ const styles = StyleSheet.create({
   // Email input styles
   emailInputContainer: {
     flex: 1,
-    justifyContent: 'center',
+    justifyContent: 'flex-start',
     alignItems: 'center',
     padding: 24,
+    paddingTop: 60,
   },
   emailHeader: {
     alignItems: 'center',