@oxyhq/services 5.15.8 → 5.16.0

package/src/ui/screens/AccountSettingsScreen.tsx

@@ -36,10 +36,8 @@ import { EditEmailModal } from '../components/profile/EditEmailModal';
 import { EditBioModal } from '../components/profile/EditBioModal';
 import { EditLocationModal } from '../components/profile/EditLocationModal';
 import { EditLinksModal } from '../components/profile/EditLinksModal';
-import { TwoFactorSetupModal } from '../components/profile/TwoFactorSetupModal';
 import { getDisplayName } from '../utils/user-utils';
 import { TTLCache, registerCacheForCleanup } from '../../utils/cache';
-import QRCode from 'react-native-qrcode-svg';
 import { useOxy } from '../context/OxyContext';
 import {
     SCREEN_PADDING_HORIZONTAL,
@@ -102,13 +100,6 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
     const [quickActionsSectionY, setQuickActionsSectionY] = useState<number | null>(null);
     const [securitySectionY, setSecuritySectionY] = useState<number | null>(null);
 
-    // Two-Factor (TOTP) state
-    const [totpSetupUrl, setTotpSetupUrl] = useState<string | null>(null);
-    const [totpCode, setTotpCode] = useState('');
-    const [isTotpBusy, setIsTotpBusy] = useState(false);
-    const [showRecoveryModal, setShowRecoveryModal] = useState(false);
-    const [generatedBackupCodes, setGeneratedBackupCodes] = useState<string[] | null>(null);
-    const [generatedRecoveryKey, setGeneratedRecoveryKey] = useState<string | null>(null);
 
     // Animation refs
     const saveButtonScale = useRef(new Animated.Value(1)).current;
@@ -130,7 +121,6 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
     const [showEditBioModal, setShowEditBioModal] = useState(false);
     const [showEditLocationModal, setShowEditLocationModal] = useState(false);
     const [showEditLinksModal, setShowEditLinksModal] = useState(false);
-    const [showTwoFactorModal, setShowTwoFactorModal] = useState(false);
 
     // Location and links state (for display only - modals handle editing)
     const [locations, setLocations] = useState<Array<{
@@ -342,9 +332,6 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
             case 'links':
                 setTempLinksWithMetadata([...linksMetadata]);
                 break;
-            case 'twoFactor':
-                // No temp state needed for twoFactor
-                break;
         }
     }, [displayName, lastName, username, email, bio, locations, linksMetadata]);
 
@@ -423,8 +410,6 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
                 return bio;
             case 'location':
             case 'links':
-            case 'twoFactor':
-                return '';
             default:
                 return '';
         }
@@ -529,7 +514,6 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
     const handleOpenBioModal = useCallback(() => setShowEditBioModal(true), []);
     const handleOpenLocationModal = useCallback(() => setShowEditLocationModal(true), []);
     const handleOpenLinksModal = useCallback(() => setShowEditLinksModal(true), []);
-    const handleOpenTwoFactorModal = useCallback(() => setShowTwoFactorModal(true), []);
 
     // Handler to refresh data after modal saves
     // Note: Access user directly from store when invoked to get latest value,
@@ -611,9 +595,6 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
                         case 'links':
                             setShowEditLinksModal(true);
                             break;
-                        case 'twoFactor':
-                            setShowTwoFactorModal(true);
-                            break;
                     }
                 }, 300);
             }
@@ -760,135 +741,9 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
     // Memoize display name for avatar
     const displayNameForAvatar = useMemo(() => getDisplayName(user), [user]);
 
-    // Legacy renderEditingField function (still used for twoFactor and fallback)
+    // Legacy renderEditingField function (fallback)
     const renderEditingField = (type: string | null) => {
         if (!type) return null;
-
-        if (type === 'twoFactor') {
-            const enabled = !!user?.privacySettings?.twoFactorEnabled;
-            return (
-                <View style={[styles.editingFieldContainer, { backgroundColor: colors.background }]}>
-                    <View style={styles.editingFieldContent}>
-                        <View style={styles.newValueSection}>
-                            <View style={styles.editingFieldHeader}>
-                                <Text style={[styles.editingFieldLabel, { color: colors.text }]}>Two‑Factor Authentication (TOTP)</Text>
-                            </View>
-
-                            {!enabled ? (
-                                <>
-                                    <Text style={styles.editingFieldDescription}>
-                                        Protect your account with a 6‑digit code from an authenticator app. Scan the QR code then enter the code to enable.
-                                    </Text>
-                                    {!totpSetupUrl ? (
-                                        <TouchableOpacity
-                                            style={[styles.primaryButton, { backgroundColor: colors.iconSecurity }]}
-                                            disabled={isTotpBusy}
-                                            onPress={async () => {
-                                                if (!activeSessionId) { toast.error(t('editProfile.toasts.noActiveSession') || 'No active session'); return; }
-                                                setIsTotpBusy(true);
-                                                try {
-                                                    const { otpauthUrl } = await oxyServices.startTotpEnrollment(activeSessionId);
-                                                    setTotpSetupUrl(otpauthUrl);
-                                                } catch (e: any) {
-                                                    toast.error(e?.message || (t('editProfile.toasts.totpStartFailed') || 'Failed to start TOTP enrollment'));
-                                                } finally {
-                                                    setIsTotpBusy(false);
-                                                }
-                                            }}
-                                        >
-                                            <Ionicons name="shield-checkmark" size={18} color="#fff" />
-                                            <Text style={styles.primaryButtonText}>Generate QR Code</Text>
-                                        </TouchableOpacity>
-                                    ) : (
-                                        <View style={{ alignItems: 'center', gap: 16 }}>
-                                            <View style={{ padding: 16, backgroundColor: '#fff', borderRadius: 16 }}>
-                                                <QRCode value={totpSetupUrl} size={180} />
-                                            </View>
-                                            <View>
-                                                <Text style={styles.editingFieldLabel}>Enter 6‑digit code</Text>
-                                                <TextInput
-                                                    style={styles.editingFieldInput}
-                                                    keyboardType="number-pad"
-                                                    placeholder="123456"
-                                                    value={totpCode}
-                                                    onChangeText={setTotpCode}
-                                                    maxLength={6}
-                                                />
-                                            </View>
-                                            <TouchableOpacity
-                                                style={[styles.primaryButton, { backgroundColor: colors.iconSecurity }]}
-                                                disabled={isTotpBusy || totpCode.length !== 6}
-                                                onPress={async () => {
-                                                    if (!activeSessionId) { toast.error(t('editProfile.toasts.noActiveSession') || 'No active session'); return; }
-                                                    setIsTotpBusy(true);
-                                                    try {
-                                                        const result = await oxyServices.verifyTotpEnrollment(activeSessionId, totpCode);
-                                                        await updateUser({ privacySettings: { twoFactorEnabled: true } }, oxyServices);
-                                                        if (result?.backupCodes || result?.recoveryKey) {
-                                                            setGeneratedBackupCodes(result.backupCodes || null);
-                                                            setGeneratedRecoveryKey(result.recoveryKey || null);
-                                                            setShowRecoveryModal(true);
-                                                        } else {
-                                                            toast.success(t('editProfile.toasts.twoFactorEnabled') || 'Two‑Factor Authentication enabled');
-                                                            setEditingField(null);
-                                                        }
-                                                    } catch (e: any) {
-                                                        toast.error(e?.message || (t('editProfile.toasts.invalidCode') || 'Invalid code'));
-                                                    } finally {
-                                                        setIsTotpBusy(false);
-                                                    }
-                                                }}
-                                            >
-                                                <Ionicons name="checkmark-circle" size={18} color="#fff" />
-                                                <Text style={styles.primaryButtonText}>Verify & Enable</Text>
-                                            </TouchableOpacity>
-                                        </View>
-                                    )}
-                                </>
-                            ) : (
-                                <>
-                                    <Text style={styles.editingFieldDescription}>
-                                        Two‑Factor Authentication is currently enabled. To disable, enter a code from your authenticator app.
-                                    </Text>
-                                    <View>
-                                        <Text style={styles.editingFieldLabel}>Enter 6‑digit code</Text>
-                                        <TextInput
-                                            style={styles.editingFieldInput}
-                                            keyboardType="number-pad"
-                                            placeholder="123456"
-                                            value={totpCode}
-                                            onChangeText={setTotpCode}
-                                            maxLength={6}
-                                        />
-                                    </View>
-                                    <TouchableOpacity
-                                        style={[styles.primaryButton, { backgroundColor: colors.sidebarIconSharing }]}
-                                        disabled={isTotpBusy || totpCode.length !== 6}
-                                        onPress={async () => {
-                                            if (!activeSessionId) { toast.error(t('editProfile.toasts.noActiveSession') || 'No active session'); return; }
-                                            setIsTotpBusy(true);
-                                            try {
-                                                await oxyServices.disableTotp(activeSessionId, totpCode);
-                                                await updateUser({ privacySettings: { twoFactorEnabled: false } }, oxyServices);
-                                                toast.success(t('editProfile.toasts.twoFactorDisabled') || 'Two‑Factor Authentication disabled');
-                                                setEditingField(null);
-                                            } catch (e: any) {
-                                                toast.error(e?.message || t('editProfile.toasts.disableFailed') || 'Failed to disable');
-                                            } finally {
-                                                setIsTotpBusy(false);
-                                            }
-                                        }}
-                                    >
-                                        <Ionicons name="close-circle" size={18} color="#fff" />
-                                        <Text style={styles.primaryButtonText}>Disable 2FA</Text>
-                                    </TouchableOpacity>
-                                </>
-                            )}
-                        </View>
-                    </View>
-                </View>
-            );
-        }
         if (type === 'displayName') {
             return (
                 <View style={[styles.editingFieldContainer, { backgroundColor: colors.background }]}>
@@ -1368,41 +1223,6 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
                             </Text>
                         </View>
 
-                        {showRecoveryModal && (
-                            <View style={{ position: 'absolute', top: 0, left: 0, right: 0, bottom: 0, backgroundColor: 'rgba(0,0,0,0.6)', zIndex: 50, padding: 16, justifyContent: 'center' }}>
-                                <View style={{ backgroundColor: '#fff', borderRadius: 20, padding: 20, maxHeight: '80%' }}>
-                                    <Text style={{ fontSize: 18, fontWeight: '700', marginBottom: 12 }}>Save These Codes Now</Text>
-                                    <Text style={{ fontSize: 14, color: '#444', marginBottom: 12 }}>
-                                        Backup codes and your Recovery Key are shown only once. Store them securely (paper or password manager).
-                                    </Text>
-                                    {generatedBackupCodes && generatedBackupCodes.length > 0 && (
-                                        <View style={{ marginBottom: 12 }}>
-                                            <Text style={{ fontSize: 16, fontWeight: '600', marginBottom: 8 }}>Backup Codes</Text>
-                                            <View style={{ backgroundColor: '#F8F9FA', borderRadius: 12, padding: 12 }}>
-                                                {generatedBackupCodes.map((c, idx) => (
-                                                    <Text key={idx} style={{ fontFamily: Platform.OS === 'web' ? 'monospace' as any : 'monospace', fontSize: 14, marginBottom: 4 }}>{c}</Text>
-                                                ))}
-                                            </View>
-                                        </View>
-                                    )}
-                                    {generatedRecoveryKey && (
-                                        <View style={{ marginBottom: 12 }}>
-                                            <Text style={{ fontSize: 16, fontWeight: '600', marginBottom: 8 }}>Recovery Key</Text>
-                                            <View style={{ backgroundColor: '#F8F9FA', borderRadius: 12, padding: 12 }}>
-                                                <Text style={{ fontFamily: Platform.OS === 'web' ? 'monospace' as any : 'monospace', fontSize: 14 }}>{generatedRecoveryKey}</Text>
-                                            </View>
-                                        </View>
-                                    )}
-                                    <TouchableOpacity
-                                        style={[styles.primaryButton, { backgroundColor: colors.iconSecurity, alignSelf: 'flex-end', marginTop: 8 }]}
-                                        onPress={() => { setShowRecoveryModal(false); setEditingField(null); toast.success(t('editProfile.toasts.twoFactorEnabled') || 'Two‑Factor Authentication enabled'); }}
-                                    >
-                                        <Ionicons name="checkmark" size={18} color="#fff" />
-                                        <Text style={styles.primaryButtonText}>I saved them</Text>
-                                    </TouchableOpacity>
-                                </View>
-                            </View>
-                        )}
                         {/* Profile Picture Section */}
                         <View
                             ref={(ref) => {
@@ -1634,20 +1454,6 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
                                 {t('editProfile.sections.security') || 'SECURITY'}
                             </Text>
                             <View style={styles.groupedSectionWrapper}>
-                                <GroupedSection
-                                    items={[
-                                        {
-                                            id: 'two-factor',
-                                            icon: 'shield-lock',
-                                            iconColor: colors.sidebarIconSecurity,
-                                            title: t('editProfile.items.twoFactor.title') || 'Two‑Factor Authentication',
-                                            subtitle: user?.privacySettings?.twoFactorEnabled
-                                                ? (t('editProfile.items.twoFactor.enabled') || 'Enabled')
-                                                : (t('editProfile.items.twoFactor.disabled') || 'Disabled (recommended)'),
-                                            onPress: handleOpenTwoFactorModal,
-                                        },
-                                    ]}
-                                />
                             </View>
                         </View>
                     </>
@@ -1698,12 +1504,6 @@ const AccountSettingsScreen: React.FC<BaseScreenProps & { initialField?: string;
                 theme={normalizedTheme}
                 onSave={handleModalSave}
             />
-            <TwoFactorSetupModal
-                visible={showTwoFactorModal}
-                onClose={() => setShowTwoFactorModal(false)}
-                isEnabled={!!user?.privacySettings?.twoFactorEnabled}
-                theme={normalizedTheme}
-            />
         </View>
     );
 };

package/src/ui/screens/OxyAuthScreen.tsx

@@ -6,6 +6,7 @@
  * 1. Scan QR code with Oxy Accounts app
  * 2. Open Oxy Accounts app directly (via deep link)
  * 
+ * Uses WebSocket for real-time authorization updates (with polling fallback).
  * The Oxy Accounts app is where users manage their cryptographic identity.
  * This screen should NOT be used within the Accounts app itself.
  */
@@ -21,6 +22,7 @@ import {
   Platform,
   ActivityIndicator,
 } from 'react-native';
+import io, { type Socket } from 'socket.io-client';
 import type { BaseScreenProps } from '../types/navigation';
 import { useThemeColors } from '../styles';
 import { useOxy } from '../context/OxyContext';
@@ -34,11 +36,22 @@ const OXY_ACCOUNTS_WEB_URL = 'https://accounts.oxy.so';
 // Auth session expiration (5 minutes)
 const AUTH_SESSION_EXPIRY_MS = 5 * 60 * 1000;
 
+// Polling interval (fallback if socket fails)
+const POLLING_INTERVAL_MS = 3000;
+
 interface AuthSession {
   sessionToken: string;
   expiresAt: number;
 }
 
+interface AuthUpdatePayload {
+  status: 'authorized' | 'cancelled' | 'expired';
+  sessionId?: string;
+  publicKey?: string;
+  userId?: string;
+  username?: string;
+}
+
 const OxyAuthScreen: React.FC<BaseScreenProps> = ({
   navigate,
   goBack,
@@ -47,18 +60,163 @@ const OxyAuthScreen: React.FC<BaseScreenProps> = ({
 }) => {
   const themeValue = (theme === 'light' || theme === 'dark') ? theme : 'light';
   const colors = useThemeColors(themeValue);
-  const { oxyServices, signIn } = useOxy();
+  const { oxyServices, signIn, switchSession } = useOxy();
 
   const [authSession, setAuthSession] = useState<AuthSession | null>(null);
   const [isLoading, setIsLoading] = useState(true);
   const [error, setError] = useState<string | null>(null);
-  const [isPolling, setIsPolling] = useState(false);
+  const [isWaiting, setIsWaiting] = useState(false);
+  const [connectionType, setConnectionType] = useState<'socket' | 'polling'>('socket');
+
+  const socketRef = useRef<Socket | null>(null);
   const pollingIntervalRef = useRef<ReturnType<typeof setInterval> | null>(null);
+  const isProcessingRef = useRef(false);
+
+  // Handle successful authorization
+  const handleAuthSuccess = useCallback(async (sessionId: string) => {
+    if (isProcessingRef.current) return;
+    isProcessingRef.current = true;
+
+    try {
+      // Switch to the new session (this will get token, user data, and update state)
+      if (switchSession) {
+        const user = await switchSession(sessionId);
+        if (onAuthenticated) {
+          onAuthenticated(user);
+        }
+      } else {
+        // Fallback if switchSession not available (shouldn't happen, but for safety)
+        await oxyServices.getTokenBySession(sessionId);
+        const user = await oxyServices.getUserBySession(sessionId);
+        if (onAuthenticated) {
+          onAuthenticated(user);
+        }
+      }
+    } catch (err) {
+      if (__DEV__) {
+        console.error('Error completing auth:', err);
+      }
+      setError('Authorization successful but failed to complete sign in. Please try again.');
+      isProcessingRef.current = false;
+    }
+  }, [oxyServices, switchSession, onAuthenticated]);
+
+  // Connect to socket for real-time updates
+  const connectSocket = useCallback((sessionToken: string) => {
+    const baseURL = oxyServices.getBaseURL();
+
+    // Connect to the auth-session namespace (no authentication required)
+    const socket = io(`${baseURL}/auth-session`, {
+      transports: ['websocket', 'polling'],
+      reconnection: true,
+      reconnectionAttempts: 3,
+      reconnectionDelay: 1000,
+    });
+
+    socketRef.current = socket;
+
+    socket.on('connect', () => {
+      if (__DEV__) {
+        console.log('Auth socket connected');
+      }
+      // Join the room for this session token
+      socket.emit('join', sessionToken);
+      setConnectionType('socket');
+    });
+
+    socket.on('joined', () => {
+      if (__DEV__) {
+        console.log('Joined auth session room');
+      }
+    });
+
+    socket.on('auth_update', (payload: AuthUpdatePayload) => {
+      if (__DEV__) {
+        console.log('Auth update received:', payload);
+      }
+
+      if (payload.status === 'authorized' && payload.sessionId) {
+        cleanup();
+        handleAuthSuccess(payload.sessionId);
+      } else if (payload.status === 'cancelled') {
+        cleanup();
+        setError('Authorization was denied.');
+      } else if (payload.status === 'expired') {
+        cleanup();
+        setError('Session expired. Please try again.');
+      }
+    });
+
+    socket.on('connect_error', (err) => {
+      if (__DEV__) {
+        console.log('Socket connection error, falling back to polling:', err.message);
+      }
+      // Fall back to polling if socket fails
+      socket.disconnect();
+      startPolling(sessionToken);
+    });
+
+    socket.on('disconnect', () => {
+      if (__DEV__) {
+        console.log('Auth socket disconnected');
+      }
+    });
+  }, [oxyServices, handleAuthSuccess]);
+
+  // Start polling for authorization (fallback)
+  const startPolling = useCallback((sessionToken: string) => {
+    setConnectionType('polling');
+
+    pollingIntervalRef.current = setInterval(async () => {
+      if (isProcessingRef.current) return;
+
+      try {
+        const response = await oxyServices.makeRequest<{
+          authorized: boolean;
+          sessionId?: string;
+          publicKey?: string;
+          status?: string;
+        }>('GET', `/api/auth/session/status/${sessionToken}`, undefined, { cache: false });
+
+        if (response.authorized && response.sessionId) {
+          cleanup();
+          handleAuthSuccess(response.sessionId);
+        } else if (response.status === 'cancelled') {
+          cleanup();
+          setError('Authorization was denied.');
+        } else if (response.status === 'expired') {
+          cleanup();
+          setError('Session expired. Please try again.');
+        }
+      } catch (err) {
+        // Silent fail for polling - will retry
+        if (__DEV__) {
+          console.log('Auth polling error:', err);
+        }
+      }
+    }, POLLING_INTERVAL_MS);
+  }, [oxyServices, handleAuthSuccess]);
+
+  // Cleanup socket and polling
+  const cleanup = useCallback(() => {
+    setIsWaiting(false);
+
+    if (socketRef.current) {
+      socketRef.current.disconnect();
+      socketRef.current = null;
+    }
+
+    if (pollingIntervalRef.current) {
+      clearInterval(pollingIntervalRef.current);
+      pollingIntervalRef.current = null;
+    }
+  }, []);
 
   // Generate a new auth session
   const generateAuthSession = useCallback(async () => {
     setIsLoading(true);
     setError(null);
+    isProcessingRef.current = false;
 
     try {
       // Generate a unique session token for this auth request
@@ -66,7 +224,6 @@ const OxyAuthScreen: React.FC<BaseScreenProps> = ({
       const expiresAt = Date.now() + AUTH_SESSION_EXPIRY_MS;
 
       // Register the auth session with the server
-      // The server will associate this token with the user when they authorize in Accounts
       await oxyServices.makeRequest('POST', '/api/auth/session/create', {
         sessionToken,
         expiresAt,
@@ -74,13 +231,16 @@ const OxyAuthScreen: React.FC<BaseScreenProps> = ({
       }, { cache: false });
 
       setAuthSession({ sessionToken, expiresAt });
-      startPolling(sessionToken);
+      setIsWaiting(true);
+
+      // Try socket first, will fall back to polling if needed
+      connectSocket(sessionToken);
     } catch (err: any) {
       setError(err.message || 'Failed to create auth session');
     } finally {
       setIsLoading(false);
     }
-  }, [oxyServices]);
+  }, [oxyServices, connectSocket]);
 
   // Generate a random session token
   const generateSessionToken = (): string => {
@@ -92,54 +252,12 @@ const OxyAuthScreen: React.FC<BaseScreenProps> = ({
     return result;
   };
 
-  // Start polling for authorization
-  const startPolling = useCallback((sessionToken: string) => {
-    setIsPolling(true);
-
-    pollingIntervalRef.current = setInterval(async () => {
-      try {
-        const response = await oxyServices.makeRequest<{
-          authorized: boolean;
-          sessionId?: string;
-          publicKey?: string;
-        }>('GET', `/api/auth/session/status/${sessionToken}`, undefined, { cache: false });
-
-        if (response.authorized && response.sessionId) {
-          // Authorization successful!
-          stopPolling();
-
-          // Get token and user data
-          await oxyServices.getTokenBySession(response.sessionId);
-          const user = await oxyServices.getUserBySession(response.sessionId);
-
-          if (onAuthenticated) {
-            onAuthenticated(user);
-          }
-        }
-      } catch (err) {
-        // Silent fail for polling - will retry
-        if (__DEV__) {
-          console.log('Auth polling error:', err);
-        }
-      }
-    }, 2000); // Poll every 2 seconds
-  }, [oxyServices, onAuthenticated]);
-
-  // Stop polling
-  const stopPolling = useCallback(() => {
-    setIsPolling(false);
-    if (pollingIntervalRef.current) {
-      clearInterval(pollingIntervalRef.current);
-      pollingIntervalRef.current = null;
-    }
-  }, []);
-
   // Clean up on unmount
   useEffect(() => {
     return () => {
-      stopPolling();
+      cleanup();
     };
-  }, [stopPolling]);
+  }, [cleanup]);
 
   // Initialize auth session
   useEffect(() => {
@@ -149,11 +267,11 @@ const OxyAuthScreen: React.FC<BaseScreenProps> = ({
   // Check if session expired
   useEffect(() => {
     if (authSession && Date.now() > authSession.expiresAt) {
-      stopPolling();
+      cleanup();
       setAuthSession(null);
       setError('Session expired. Please try again.');
     }
-  }, [authSession, stopPolling]);
+  }, [authSession, cleanup]);
 
   // Build the QR code data
   const getQRData = (): string => {
@@ -191,9 +309,9 @@ const OxyAuthScreen: React.FC<BaseScreenProps> = ({
 
   // Refresh session
   const handleRefresh = useCallback(() => {
-    stopPolling();
+    cleanup();
     generateAuthSession();
-  }, [generateAuthSession, stopPolling]);
+  }, [generateAuthSession, cleanup]);
 
   if (isLoading) {
     return (
@@ -246,24 +364,29 @@ const OxyAuthScreen: React.FC<BaseScreenProps> = ({
         </Text>
       </View>
 
-      {/* Divider */}
-      <View style={styles.dividerContainer}>
-        <View style={[styles.divider, { backgroundColor: colors.border }]} />
-        <Text style={[styles.dividerText, { color: colors.secondaryText }]}>or</Text>
-        <View style={[styles.divider, { backgroundColor: colors.border }]} />
-      </View>
-
-      {/* Open Accounts Button */}
-      <TouchableOpacity
-        style={[styles.button, { backgroundColor: colors.primary }]}
-        onPress={handleOpenAccounts}
-      >
-        <OxyLogo width={20} height={20} fillColor="white" style={styles.buttonIcon} />
-        <Text style={styles.buttonText}>Open Oxy Accounts</Text>
-      </TouchableOpacity>
+      {/* Divider and Open Accounts Button - Only show on native platforms */}
+      {Platform.OS !== 'web' && (
+        <>
+          {/* Divider */}
+          <View style={styles.dividerContainer}>
+            <View style={[styles.divider, { backgroundColor: colors.border }]} />
+            <Text style={[styles.dividerText, { color: colors.secondaryText }]}>or</Text>
+            <View style={[styles.divider, { backgroundColor: colors.border }]} />
+          </View>
+
+          {/* Open Accounts Button */}
+          <TouchableOpacity
+            style={[styles.button, { backgroundColor: colors.primary }]}
+            onPress={handleOpenAccounts}
+          >
+            <OxyLogo width={20} height={20} fillColor="white" style={styles.buttonIcon} />
+            <Text style={styles.buttonText}>Open Oxy Accounts</Text>
+          </TouchableOpacity>
+        </>
+      )}
 
       {/* Status */}
-      {isPolling && (
+      {isWaiting && (
         <View style={styles.statusContainer}>
           <ActivityIndicator size="small" color={colors.primary} />
           <Text style={[styles.statusText, { color: colors.secondaryText }]}>
@@ -401,3 +524,4 @@ const styles = StyleSheet.create({
 
 export default OxyAuthScreen;
 
+

package/src/ui/screens/PrivacySettingsScreen.tsx

@@ -21,7 +21,6 @@ interface PrivacySettings {
     hideOnlineStatus: boolean;
     hideLastSeen: boolean;
     profileVisibility: boolean;
-    twoFactorEnabled: boolean;
     loginAlerts: boolean;
     blockScreenshots: boolean;
     login: boolean;
@@ -52,7 +51,6 @@ const PrivacySettingsScreen: React.FC<BaseScreenProps> = ({
         hideOnlineStatus: false,
         hideLastSeen: false,
         profileVisibility: true,
-        twoFactorEnabled: false,
         loginAlerts: true,
         blockScreenshots: false,
         login: true,