@oxyhq/services 5.6.0 → 5.6.1

package/lib/module/ui/context/OxyContext.js

@@ -1,9 +1,10 @@
 "use strict";
 
-import React, { createContext, useContext, useState, useEffect, useCallback, useMemo } from 'react';
+import React, { createContext, useContext, useEffect, useCallback, useMemo } from 'react';
 import { DeviceManager } from '../../utils/deviceManager';
 import { useSessionSocket } from '../hooks/useSessionSocket';
 import { toast } from '../../lib/sonner';
+import { useAuthStore } from '../stores/authStore';
 
 // Define the context shape
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -68,14 +69,20 @@ export const OxyContextProvider = ({
   onAuthStateChange,
   bottomSheetRef
 }) => {
-  // Authentication state
-  const [user, setUser] = useState(null);
-  const [minimalUser, setMinimalUser] = useState(null);
-  const [sessions, setSessions] = useState([]);
-  const [activeSessionId, setActiveSessionId] = useState(null);
-  const [isLoading, setIsLoading] = useState(true);
-  const [error, setError] = useState(null);
-  const [storage, setStorage] = useState(null);
+  // Zustand state
+  const user = useAuthStore(state => state.user);
+  const isAuthenticated = useAuthStore(state => state.isAuthenticated);
+  const isLoading = useAuthStore(state => state.isLoading);
+  const error = useAuthStore(state => state.error);
+  const loginSuccess = useAuthStore(state => state.loginSuccess);
+  const loginFailure = useAuthStore(state => state.loginFailure);
+  const logoutStore = useAuthStore(state => state.logout);
+
+  // Local state for non-auth fields
+  const [minimalUser, setMinimalUser] = React.useState(null);
+  const [sessions, setSessions] = React.useState([]);
+  const [activeSessionId, setActiveSessionId] = React.useState(null);
+  const [storage, setStorage] = React.useState(null);
 
   // Storage keys (memoized to prevent infinite loops)
   const keys = useMemo(() => getSecureStorageKeys(storageKeyPrefix), [storageKeyPrefix]);
@@ -88,7 +95,9 @@ export const OxyContextProvider = ({
         setStorage(platformStorage);
       } catch (error) {
         console.error('Failed to initialize storage:', error);
-        setError('Failed to initialize storage');
+        useAuthStore.setState({
+          error: 'Failed to initialize storage'
+        });
       }
     };
     initStorage();
@@ -98,7 +107,9 @@ export const OxyContextProvider = ({
   useEffect(() => {
     const initAuth = async () => {
       if (!storage) return;
-      setIsLoading(true);
+      useAuthStore.setState({
+        isLoading: true
+      });
       try {
         // Load stored sessions
         const sessionsData = await storage.getItem(keys.sessions);
@@ -155,7 +166,7 @@ export const OxyContextProvider = ({
 
                   // Load full user data
                   const fullUser = await oxyServices.getUserBySession(activeSession.sessionId);
-                  setUser(fullUser);
+                  loginSuccess(fullUser);
                   setMinimalUser({
                     id: fullUser.id,
                     username: fullUser.username,
@@ -179,7 +190,9 @@ export const OxyContextProvider = ({
         console.error('Secure auth initialization error:', err);
         await clearAllStorage();
       } finally {
-        setIsLoading(false);
+        useAuthStore.setState({
+          isLoading: false
+        });
       }
     };
     if (storage) {
@@ -199,14 +212,14 @@ export const OxyContextProvider = ({
     } else {
       // No valid sessions left
       setActiveSessionId(null);
-      setUser(null);
+      logoutStore();
       setMinimalUser(null);
       await storage?.removeItem(keys.activeSessionId);
       if (onAuthStateChange) {
         onAuthStateChange(null);
       }
     }
-  }, [sessions, storage, keys, onAuthStateChange]);
+  }, [sessions, storage, keys, onAuthStateChange, logoutStore]);
 
   // Save sessions to storage
   const saveSessionsToStorage = useCallback(async sessionsList => {
@@ -234,7 +247,9 @@ export const OxyContextProvider = ({
   // Switch to a different session
   const switchToSession = useCallback(async sessionId => {
     try {
-      setIsLoading(true);
+      useAuthStore.setState({
+        isLoading: true
+      });
 
       // Get access token for this session
       await oxyServices.getTokenBySession(sessionId);
@@ -242,7 +257,7 @@ export const OxyContextProvider = ({
       // Load full user data
       const fullUser = await oxyServices.getUserBySession(sessionId);
       setActiveSessionId(sessionId);
-      setUser(fullUser);
+      loginSuccess(fullUser);
       setMinimalUser({
         id: fullUser.id,
         username: fullUser.username,
@@ -254,17 +269,23 @@ export const OxyContextProvider = ({
       }
     } catch (error) {
       console.error('Switch session error:', error);
-      setError('Failed to switch session');
+      useAuthStore.setState({
+        error: 'Failed to switch session'
+      });
     } finally {
-      setIsLoading(false);
+      useAuthStore.setState({
+        isLoading: false
+      });
     }
-  }, [oxyServices, onAuthStateChange, saveActiveSessionId]);
+  }, [oxyServices, onAuthStateChange, loginSuccess, saveActiveSessionId]);
 
   // Secure login method
   const login = async (username, password, deviceName) => {
     if (!storage) throw new Error('Storage not initialized');
-    setIsLoading(true);
-    setError(null);
+    useAuthStore.setState({
+      isLoading: true,
+      error: null
+    });
     try {
       // Get device fingerprint for enhanced device identification
       const deviceFingerprint = DeviceManager.getDeviceFingerprint();
@@ -316,17 +337,19 @@ export const OxyContextProvider = ({
 
       // Load full user data
       const fullUser = await oxyServices.getUserBySession(response.sessionId);
-      setUser(fullUser);
+      loginSuccess(fullUser);
       setMinimalUser(response.user);
       if (onAuthStateChange) {
         onAuthStateChange(fullUser);
       }
       return fullUser;
     } catch (error) {
-      setError(error.message || 'Login failed');
+      loginFailure(error.message || 'Login failed');
       throw error;
     } finally {
-      setIsLoading(false);
+      useAuthStore.setState({
+        isLoading: false
+      });
     }
   };
 
@@ -350,7 +373,7 @@ export const OxyContextProvider = ({
         } else {
           // No sessions left
           setActiveSessionId(null);
-          setUser(null);
+          logoutStore();
           setMinimalUser(null);
           await storage?.removeItem(keys.activeSessionId);
           if (onAuthStateChange) {
@@ -360,7 +383,9 @@ export const OxyContextProvider = ({
       }
     } catch (error) {
       console.error('Logout error:', error);
-      setError('Logout failed');
+      useAuthStore.setState({
+        error: 'Logout failed'
+      });
     }
   };
 
@@ -369,12 +394,16 @@ export const OxyContextProvider = ({
     console.log('logoutAll called with activeSessionId:', activeSessionId);
     if (!activeSessionId) {
       console.error('No active session ID found, cannot logout all');
-      setError('No active session found');
+      useAuthStore.setState({
+        error: 'No active session found'
+      });
       throw new Error('No active session found');
     }
     if (!oxyServices) {
       console.error('OxyServices not initialized');
-      setError('Service not available');
+      useAuthStore.setState({
+        error: 'Service not available'
+      });
       throw new Error('Service not available');
     }
     try {
@@ -385,7 +414,7 @@ export const OxyContextProvider = ({
       // Clear all local data
       setSessions([]);
       setActiveSessionId(null);
-      setUser(null);
+      logoutStore();
       setMinimalUser(null);
       await clearAllStorage();
       console.log('Local storage cleared');
@@ -395,7 +424,9 @@ export const OxyContextProvider = ({
       }
     } catch (error) {
       console.error('Logout all error:', error);
-      setError(`Logout all failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
+      useAuthStore.setState({
+        error: `Logout all failed: ${error instanceof Error ? error.message : 'Unknown error'}`
+      });
       throw error;
     }
   };
@@ -403,8 +434,10 @@ export const OxyContextProvider = ({
   // Sign up method
   const signUp = async (username, email, password) => {
     if (!storage) throw new Error('Storage not initialized');
-    setIsLoading(true);
-    setError(null);
+    useAuthStore.setState({
+      isLoading: true,
+      error: null
+    });
     try {
       // Create new account using the OxyServices signUp method
       const response = await oxyServices.signUp(username, email, password);
@@ -415,10 +448,12 @@ export const OxyContextProvider = ({
       const user = await login(username, password);
       return user;
     } catch (error) {
-      setError(error.message || 'Sign up failed');
+      loginFailure(error.message || 'Sign up failed');
       throw error;
     } finally {
-      setIsLoading(false);
+      useAuthStore.setState({
+        isLoading: false
+      });
     }
   };
 
@@ -471,7 +506,7 @@ export const OxyContextProvider = ({
       // Clear all local sessions since we logged out from all devices
       setSessions([]);
       setActiveSessionId(null);
-      setUser(null);
+      logoutStore();
       setMinimalUser(null);
       await clearAllStorage();
       if (onAuthStateChange) {
@@ -537,16 +572,6 @@ export const OxyContextProvider = ({
     }
   }, [bottomSheetRef]);
 
-  // Compute comprehensive authentication status
-  // This is the single source of truth for authentication across the entire app
-  const isAuthenticated = useMemo(() => {
-    // User is authenticated if:
-    // 1. We have a full user object loaded, OR
-    // 2. We have an active session with a valid token
-    // This covers both the loaded state and the loading-but-authenticated state
-    return !!user || !!activeSessionId && !!oxyServices?.getCurrentUserId();
-  }, [user, activeSessionId, oxyServices]);
-
   // Integrate socket for real-time session updates
   console.log('OxyContextProvider: userId', user?.id, 'baseURL', oxyServices.getBaseURL());
   useSessionSocket({
@@ -572,14 +597,31 @@ export const OxyContextProvider = ({
     error,
     login,
     logout,
-    logoutAll,
-    signUp,
-    switchSession,
-    removeSession,
-    refreshSessions,
-    getDeviceSessions,
-    logoutAllDeviceSessions,
-    updateDeviceName,
+    logoutAll: async () => {
+      await logout();
+    },
+    signUp: async (username, email, password) => {
+      await signUp(username, email, password);
+      return user; // Return the latest user from Zustand
+    },
+    switchSession: async sessionId => {
+      await switchToSession(sessionId);
+    },
+    removeSession: async sessionId => {
+      await removeSession(sessionId);
+    },
+    refreshSessions: async () => {
+      await refreshSessions();
+    },
+    getDeviceSessions: async () => {
+      return await getDeviceSessions();
+    },
+    logoutAllDeviceSessions: async () => {
+      await logoutAllDeviceSessions();
+    },
+    updateDeviceName: async deviceName => {
+      await updateDeviceName(deviceName);
+    },
     oxyServices,
     bottomSheetRef,
     showBottomSheet,

package/lib/module/ui/context/OxyContext.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","createContext","useContext","useState","useEffect","useCallback","useMemo","DeviceManager","useSessionSocket","toast","jsx","_jsx","OxyContext","WebStorage","getItem","key","localStorage","setItem","value","removeItem","clear","AsyncStorage","isReactNative","navigator","product","getStorage","asyncStorageModule","default","error","console","Error","getSecureStorageKeys","prefix","sessions","activeSessionId","OxyContextProvider","children","oxyServices","storageKeyPrefix","onAuthStateChange","bottomSheetRef","user","setUser","minimalUser","setMinimalUser","setSessions","setActiveSessionId","isLoading","setIsLoading","setError","storage","setStorage","keys","initStorage","platformStorage","initAuth","sessionsData","storedActiveSessionId","log","parsedSessions","JSON","parse","migratedSessions","shouldUpdateStorage","session","userId","sessionUser","getUserBySession","sessionId","push","id","saveSessionsToStorage","length","activeSession","find","s","validation","validateSession","valid","getTokenBySession","fullUser","username","avatar","removeInvalidSession","err","clearAllStorage","filteredSessions","filter","switchToSession","sessionsList","stringify","saveActiveSessionId","login","password","deviceName","deviceFingerprint","getDeviceFingerprint","deviceInfo","getDeviceInfo","deviceId","response","secureLogin","getDefaultDeviceName","clientSession","expiresAt","lastActive","Date","toISOString","existingUserSessionIndex","findIndex","updatedSessions","existingSession","message","logout","targetSessionId","sessionToLogout","logoutSecureSession","logoutAll","logoutAllSecureSessions","signUp","email","switchSession","removeSession","refreshSessions","serverSessions","getSessionsBySessionId","map","serverSession","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","showBottomSheet","screenOrConfig","current","expand","present","warn","setTimeout","_navigateToScreen","screen","props","hideBottomSheet","dismiss","isAuthenticated","getCurrentUserId","getBaseURL","baseURL","onRemoteSignOut","info","contextValue","Provider","useOxy","context"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","createContext","useContext","useEffect","useCallback","useMemo","DeviceManager","useSessionSocket","toast","useAuthStore","jsx","_jsx","OxyContext","WebStorage","getItem","key","localStorage","setItem","value","removeItem","clear","AsyncStorage","isReactNative","navigator","product","getStorage","asyncStorageModule","default","error","console","Error","getSecureStorageKeys","prefix","sessions","activeSessionId","OxyContextProvider","children","oxyServices","storageKeyPrefix","onAuthStateChange","bottomSheetRef","user","state","isAuthenticated","isLoading","loginSuccess","loginFailure","logoutStore","logout","minimalUser","setMinimalUser","useState","setSessions","setActiveSessionId","storage","setStorage","keys","initStorage","platformStorage","setState","initAuth","sessionsData","storedActiveSessionId","log","parsedSessions","JSON","parse","migratedSessions","shouldUpdateStorage","session","userId","sessionUser","getUserBySession","sessionId","push","id","saveSessionsToStorage","length","activeSession","find","s","validation","validateSession","valid","getTokenBySession","fullUser","username","avatar","removeInvalidSession","err","clearAllStorage","filteredSessions","filter","switchToSession","sessionsList","stringify","saveActiveSessionId","login","password","deviceName","deviceFingerprint","getDeviceFingerprint","deviceInfo","getDeviceInfo","deviceId","response","secureLogin","getDefaultDeviceName","clientSession","expiresAt","lastActive","Date","toISOString","existingUserSessionIndex","findIndex","updatedSessions","existingSession","message","targetSessionId","sessionToLogout","logoutSecureSession","logoutAll","logoutAllSecureSessions","signUp","email","switchSession","removeSession","refreshSessions","serverSessions","getSessionsBySessionId","map","serverSession","getDeviceSessions","logoutAllDeviceSessions","updateDeviceName","showBottomSheet","screenOrConfig","current","expand","present","warn","setTimeout","_navigateToScreen","screen","props","hideBottomSheet","dismiss","getBaseURL","baseURL","onRemoteSignOut","info","contextValue","Provider","useOxy","context"],"sourceRoot":"../../../../src","sources":["ui/context/OxyContext.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/ui/screens/AccountSettingsScreen.js

@@ -9,6 +9,7 @@ import { Ionicons } from '@expo/vector-icons';
 import { toast } from '../../lib/sonner';
 import { fontFamilies } from '../styles/fonts';
 import { confirmAction } from '../utils/confirmAction';
+import { useAuthStore } from '../stores/authStore';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const AccountSettingsScreen = ({
   onClose,
@@ -22,6 +23,7 @@ const AccountSettingsScreen = ({
     isLoading: authLoading,
     isAuthenticated
   } = useOxy();
+  const updateUser = useAuthStore(state => state.updateUser);
   const [isLoading, setIsLoading] = useState(false);
   const [isSaving, setIsSaving] = useState(false);
 
@@ -30,11 +32,12 @@ const AccountSettingsScreen = ({
 
   // Form state
   const [displayName, setDisplayName] = useState('');
+  const [lastName, setLastName] = useState('');
   const [username, setUsername] = useState('');
   const [email, setEmail] = useState('');
   const [bio, setBio] = useState('');
   const [location, setLocation] = useState('');
-  const [website, setWebsite] = useState('');
+  const [links, setLinks] = useState([]);
   const [avatarUrl, setAvatarUrl] = useState('');
 
   // Editing states
@@ -42,11 +45,12 @@ const AccountSettingsScreen = ({
 
   // Temporary input states for inline editing
   const [tempDisplayName, setTempDisplayName] = useState('');
+  const [tempLastName, setTempLastName] = useState('');
   const [tempUsername, setTempUsername] = useState('');
   const [tempEmail, setTempEmail] = useState('');
   const [tempBio, setTempBio] = useState('');
   const [tempLocation, setTempLocation] = useState('');
-  const [tempWebsite, setTempWebsite] = useState('');
+  const [tempLinks, setTempLinks] = useState([]);
 
   // Memoize theme-related calculations to prevent unnecessary recalculations
   const themeStyles = useMemo(() => {
@@ -71,13 +75,15 @@ const AccountSettingsScreen = ({
   // Load user data
   useEffect(() => {
     if (user) {
-      const userDisplayName = typeof user.name === 'string' ? user.name : user.name?.full || user.name?.first || '';
+      const userDisplayName = typeof user.name === 'string' ? user.name : user.name?.first || user.name?.full || '';
+      const userLastName = typeof user.name === 'object' ? user.name?.last || '' : '';
       setDisplayName(userDisplayName);
+      setLastName(userLastName);
       setUsername(user.username || '');
       setEmail(user.email || '');
       setBio(user.bio || '');
       setLocation(user.location || '');
-      setWebsite(user.website || '');
+      setLinks(Array.isArray(user.links) ? user.links.map(l => typeof l === 'string' ? l : l.link).filter(Boolean) : user.website ? [user.website] : []);
       setAvatarUrl(user.avatar?.url || '');
     }
   }, [user]);
@@ -92,12 +98,15 @@ const AccountSettingsScreen = ({
         email,
         bio,
         location,
-        website
+        links
       };
 
       // Handle name field
-      if (displayName) {
-        updates.name = displayName;
+      if (displayName || lastName) {
+        updates.name = {
+          first: displayName,
+          last: lastName
+        };
       }
 
       // Handle avatar
@@ -106,7 +115,7 @@ const AccountSettingsScreen = ({
           url: avatarUrl
         };
       }
-      await oxyServices.updateProfile(updates);
+      await updateUser(updates, oxyServices);
       toast.success('Profile updated successfully');
       animateSaveButton(1); // Scale back to normal
 
@@ -132,7 +141,8 @@ const AccountSettingsScreen = ({
   const startEditing = (type, currentValue) => {
     switch (type) {
       case 'displayName':
-        setTempDisplayName(currentValue);
+        setTempDisplayName(displayName);
+        setTempLastName(lastName);
         break;
       case 'username':
         setTempUsername(currentValue);
@@ -146,8 +156,8 @@ const AccountSettingsScreen = ({
       case 'location':
         setTempLocation(currentValue);
         break;
-      case 'website':
-        setTempWebsite(currentValue);
+      case 'links':
+        setTempLinks([...links]);
         break;
     }
     setEditingField(type);
@@ -158,6 +168,7 @@ const AccountSettingsScreen = ({
     switch (type) {
       case 'displayName':
         setDisplayName(tempDisplayName);
+        setLastName(tempLastName);
         break;
       case 'username':
         setUsername(tempUsername);
@@ -171,8 +182,8 @@ const AccountSettingsScreen = ({
       case 'location':
         setLocation(tempLocation);
         break;
-      case 'website':
-        setWebsite(tempWebsite);
+      case 'links':
+        setLinks(tempLinks);
         break;
     }
 
@@ -192,7 +203,7 @@ const AccountSettingsScreen = ({
       email: 'Email',
       bio: 'Bio',
       location: 'Location',
-      website: 'Website'
+      links: 'Links'
     };
     return labels[type] || 'Field';
   };
@@ -218,7 +229,7 @@ const AccountSettingsScreen = ({
         name: 'location',
         color: '#FF3B30'
       },
-      website: {
+      links: {
         name: 'link',
         color: '#32D74B'
       }
@@ -229,6 +240,52 @@ const AccountSettingsScreen = ({
     };
   };
   const renderEditingField = type => {
+    if (type === 'displayName') {
+      return /*#__PURE__*/_jsx(View, {
+        style: styles.editingFieldContainer,
+        children: /*#__PURE__*/_jsx(View, {
+          style: styles.editingFieldContent,
+          children: /*#__PURE__*/_jsxs(View, {
+            style: [styles.newValueSection, {
+              flexDirection: 'row',
+              gap: 12
+            }],
+            children: [/*#__PURE__*/_jsxs(View, {
+              style: {
+                flex: 1
+              },
+              children: [/*#__PURE__*/_jsx(Text, {
+                style: styles.editingFieldLabel,
+                children: "First Name"
+              }), /*#__PURE__*/_jsx(TextInput, {
+                style: styles.editingFieldInput,
+                value: tempDisplayName,
+                onChangeText: setTempDisplayName,
+                placeholder: "Enter your first name",
+                placeholderTextColor: themeStyles.isDarkTheme ? '#aaa' : '#999',
+                autoFocus: true,
+                selectionColor: themeStyles.primaryColor
+              })]
+            }), /*#__PURE__*/_jsxs(View, {
+              style: {
+                flex: 1
+              },
+              children: [/*#__PURE__*/_jsx(Text, {
+                style: styles.editingFieldLabel,
+                children: "Last Name"
+              }), /*#__PURE__*/_jsx(TextInput, {
+                style: styles.editingFieldInput,
+                value: tempLastName,
+                onChangeText: setTempLastName,
+                placeholder: "Enter your last name",
+                placeholderTextColor: themeStyles.isDarkTheme ? '#aaa' : '#999',
+                selectionColor: themeStyles.primaryColor
+              })]
+            })]
+          })
+        })
+      });
+    }
     const fieldConfig = {
       displayName: {
         label: 'Display Name',
@@ -275,10 +332,10 @@ const AccountSettingsScreen = ({
         multiline: false,
         keyboardType: 'default'
       },
-      website: {
-        label: 'Website',
-        value: website,
-        placeholder: 'Enter your website URL',
+      links: {
+        label: 'Links',
+        value: links.join(', '),
+        placeholder: 'Enter your links (comma separated)',
         icon: 'link',
         color: '#32D74B',
         multiline: false,
@@ -299,8 +356,8 @@ const AccountSettingsScreen = ({
           return tempBio;
         case 'location':
           return tempLocation;
-        case 'website':
-          return tempWebsite;
+        case 'links':
+          return tempLinks.join(', ');
         default:
           return '';
       }
@@ -322,8 +379,8 @@ const AccountSettingsScreen = ({
         case 'location':
           setTempLocation(text);
           break;
-        case 'website':
-          setTempWebsite(text);
+        case 'links':
+          setTempLinks(text.split(',').map(s => s.trim()).filter(Boolean));
           break;
       }
     };
@@ -537,13 +594,15 @@ const AccountSettingsScreen = ({
           children: [/*#__PURE__*/_jsx(Text, {
             style: styles.sectionTitle,
             children: "Basic Information"
-          }), renderField('displayName', 'Display Name', displayName, 'Add your display name', 'person', '#007AFF', false, 'default', true, false), renderField('username', 'Username', username, 'Choose a username', 'at', '#5856D6', false, 'default', false, false), renderField('email', 'Email', email, 'Add your email address', 'mail', '#FF9500', false, 'email-address', false, true)]
+          }), renderField('displayName', 'Display Name', [displayName, lastName].filter(Boolean).join(' '),
+          // Show full name
+          'Add your display name', 'person', '#007AFF', false, 'default', true, false), renderField('username', 'Username', username, 'Choose a username', 'at', '#5856D6', false, 'default', false, false), renderField('email', 'Email', email, 'Add your email address', 'mail', '#FF9500', false, 'email-address', false, true)]
         }), /*#__PURE__*/_jsxs(View, {
           style: styles.section,
           children: [/*#__PURE__*/_jsx(Text, {
             style: styles.sectionTitle,
             children: "About You"
-          }), renderField('bio', 'Bio', bio, 'Tell people about yourself', 'document-text', '#34C759', true, 'default', true, false), renderField('location', 'Location', location, 'Add your location', 'location', '#FF3B30', false, 'default', false, false), renderField('website', 'Website', website, 'Add your website', 'link', '#32D74B', false, 'url', false, true)]
+          }), renderField('bio', 'Bio', bio, 'Tell people about yourself', 'document-text', '#34C759', true, 'default', true, false), renderField('location', 'Location', location, 'Add your location', 'location', '#FF3B30', false, 'default', false, false), renderField('links', 'Links', links.join(', '), 'Add your links', 'link', '#32D74B', false, 'url', false, true)]
         }), /*#__PURE__*/_jsxs(View, {
           style: styles.section,
           children: [/*#__PURE__*/_jsx(Text, {