@oxyhq/services 5.13.1 → 5.13.3

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

@@ -1,6 +1,6 @@
 "use strict";
 
-import { useState } from 'react';
+import React, { useState, useMemo, useCallback } from 'react';
 import { View, Text, StyleSheet, ScrollView } from 'react-native';
 import { useOxy } from '../context/OxyContext';
 import { useThemeColors } from '../styles';
@@ -8,87 +8,16 @@ import { Ionicons } from '@expo/vector-icons';
 import { toast } from '../../lib/sonner';
 import { Header, Section, GroupedSection } from '../components';
 import { useI18n } from '../hooks/useI18n';
-
-// Supported languages with their metadata
+import { SUPPORTED_LANGUAGES } from '../../utils/languageUtils';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const SUPPORTED_LANGUAGES = [{
-  id: 'en-US',
-  name: 'English',
-  nativeName: 'English',
-  flag: '🇺🇸',
-  icon: 'language-outline',
-  color: '#007AFF'
-}, {
-  id: 'es-ES',
-  name: 'Spanish',
-  nativeName: 'Español',
-  flag: '🇪🇸',
-  icon: 'language-outline',
-  color: '#FF3B30'
-}, {
-  id: 'ca-ES',
-  name: 'Catalan',
-  nativeName: 'Català',
-  flag: '🇪🇸',
-  icon: 'language-outline',
-  color: '#0CA678'
-}, {
-  id: 'fr-FR',
-  name: 'French',
-  nativeName: 'Français',
-  flag: '🇫🇷',
-  icon: 'language-outline',
-  color: '#5856D6'
-}, {
-  id: 'de-DE',
-  name: 'German',
-  nativeName: 'Deutsch',
-  flag: '🇩🇪',
-  icon: 'language-outline',
-  color: '#FF9500'
-}, {
-  id: 'it-IT',
-  name: 'Italian',
-  nativeName: 'Italiano',
-  flag: '🇮🇹',
-  icon: 'language-outline',
-  color: '#34C759'
-}, {
-  id: 'pt-PT',
-  name: 'Portuguese',
-  nativeName: 'Português',
-  flag: '🇵🇹',
-  icon: 'language-outline',
-  color: '#AF52DE'
-}, {
-  id: 'ja-JP',
-  name: 'Japanese',
-  nativeName: '日本語',
-  flag: '🇯🇵',
-  icon: 'language-outline',
-  color: '#FF2D92'
-}, {
-  id: 'ko-KR',
-  name: 'Korean',
-  nativeName: '한국어',
-  flag: '🇰🇷',
-  icon: 'language-outline',
-  color: '#32D74B'
-}, {
-  id: 'zh-CN',
-  name: 'Chinese',
-  nativeName: '中文',
-  flag: '🇨🇳',
-  icon: 'language-outline',
-  color: '#FF9F0A'
-}, {
-  id: 'ar-SA',
-  name: 'Arabic',
-  nativeName: 'العربية',
-  flag: '🇸🇦',
-  icon: 'language-outline',
-  color: '#30B0C7'
-}];
+/**
+ * LanguageSelectorScreen - Optimized for performance
+ * 
+ * Performance optimizations:
+ * - useMemo for language items to prevent recreation on every render
+ * - useCallback for handlers to prevent unnecessary re-renders
+ * - Memoized current language section
+ */
 const LanguageSelectorScreen = ({
   goBack,
   onClose,
@@ -107,12 +36,16 @@ const LanguageSelectorScreen = ({
   } = useI18n();
   const colors = useThemeColors(theme);
   const [isLoading, setIsLoading] = useState(false);
-  const handleLanguageSelect = async languageId => {
-    if (languageId === currentLanguage) {
-      return; // Already selected
+
+  // Memoize the language select handler to prevent recreation on every render
+  const handleLanguageSelect = useCallback(async languageId => {
+    if (languageId === currentLanguage || isLoading) {
+      return; // Already selected or loading
     }
     setIsLoading(true);
     try {
+      let serverSyncFailed = false;
+
       // If signed in, persist preference to backend user settings
       if (isAuthenticated && user?.id) {
         try {
@@ -120,28 +53,40 @@ const LanguageSelectorScreen = ({
             language: languageId
           });
         } catch (e) {
-          console.warn('Failed to update language on server, falling back to local storage', e);
+          // Server sync failed, but we'll save locally anyway
+          serverSyncFailed = true;
+          if (__DEV__) {
+            console.warn('Failed to sync language to server (will save locally only):', e?.message || e);
+          }
         }
       }
 
       // Always persist locally for immediate UX and for guests
       await setLanguage(languageId);
       const selectedLang = SUPPORTED_LANGUAGES.find(lang => lang.id === languageId);
+
+      // Show success message (language is saved locally regardless of server sync)
       toast.success(t('language.changed', {
         lang: selectedLang?.name || languageId
       }));
+
+      // Log server sync failure only in dev mode (user experience is still good - saved locally)
+      if (serverSyncFailed && __DEV__) {
+        console.warn('Language saved locally but server sync failed');
+      }
       setIsLoading(false);
       // Close the bottom sheet if possible; otherwise, go back
       if (onClose) onClose();else goBack();
     } catch (error) {
+      // Only show error if local storage also failed
       console.error('Error saving language preference:', error);
       toast.error('Failed to save language preference');
       setIsLoading(false);
     }
-  };
+  }, [currentLanguage, isLoading, isAuthenticated, user?.id, oxyServices, setLanguage, t, onClose, goBack]);
 
-  // Create grouped items for the language list
-  const languageItems = SUPPORTED_LANGUAGES.map(language => ({
+  // Memoize language items to prevent recreation on every render
+  const languageItems = useMemo(() => SUPPORTED_LANGUAGES.map(language => ({
     id: language.id,
     title: language.name,
     subtitle: language.nativeName,
@@ -158,7 +103,37 @@ const LanguageSelectorScreen = ({
     selected: currentLanguage === language.id,
     onPress: () => handleLanguageSelect(language.id),
     dense: true
-  }));
+  })), [currentLanguage, handleLanguageSelect]);
+
+  // Memoize current language data to prevent recalculation
+  const currentLanguageData = useMemo(() => {
+    if (!currentLanguage) return null;
+    return SUPPORTED_LANGUAGES.find(lang => lang.id === currentLanguage);
+  }, [currentLanguage]);
+
+  // Memoize current language section items
+  const currentLanguageItems = useMemo(() => {
+    if (!currentLanguageData) return [];
+    return [{
+      id: `current-${currentLanguageData.id}`,
+      title: currentLanguageData.name,
+      subtitle: currentLanguageData.nativeName,
+      customIcon: /*#__PURE__*/_jsx(View, {
+        style: [styles.languageFlag, {
+          backgroundColor: `${currentLanguageData.color}20`
+        }],
+        children: /*#__PURE__*/_jsx(Text, {
+          style: styles.flagEmoji,
+          children: currentLanguageData.flag
+        })
+      }),
+      iconColor: currentLanguageData.color,
+      selected: false,
+      showChevron: false,
+      dense: true,
+      disabled: true
+    }];
+  }, [currentLanguageData]);
   return /*#__PURE__*/_jsxs(View, {
     style: [styles.container, {
       backgroundColor: '#f2f2f2'
@@ -173,36 +148,15 @@ const LanguageSelectorScreen = ({
     }), /*#__PURE__*/_jsxs(ScrollView, {
       style: styles.content,
       showsVerticalScrollIndicator: false,
-      children: [currentLanguage && /*#__PURE__*/_jsx(Section, {
+      removeClippedSubviews: true,
+      children: [currentLanguage && currentLanguageItems.length > 0 && /*#__PURE__*/_jsx(Section, {
         title: t('language.current'),
         theme: theme,
         isFirst: true,
-        children: (() => {
-          const current = SUPPORTED_LANGUAGES.find(lang => lang.id === currentLanguage);
-          if (!current) return null;
-          return /*#__PURE__*/_jsx(GroupedSection, {
-            items: [{
-              id: `current-${current.id}`,
-              title: current.name,
-              subtitle: current.nativeName,
-              customIcon: /*#__PURE__*/_jsx(View, {
-                style: [styles.languageFlag, {
-                  backgroundColor: `${current.color}20`
-                }],
-                children: /*#__PURE__*/_jsx(Text, {
-                  style: styles.flagEmoji,
-                  children: current.flag
-                })
-              }),
-              iconColor: current.color,
-              selected: false,
-              showChevron: false,
-              dense: true,
-              disabled: true
-            }],
-            theme: theme
-          });
-        })()
+        children: /*#__PURE__*/_jsx(GroupedSection, {
+          items: currentLanguageItems,
+          theme: theme
+        })
       }), /*#__PURE__*/_jsxs(Section, {
         title: t('language.available'),
         theme: theme,
@@ -342,5 +296,7 @@ const styles = StyleSheet.create({
     marginTop: 2
   }
 });
-export default LanguageSelectorScreen;
+
+// Export memoized component to prevent unnecessary re-renders
+export default /*#__PURE__*/React.memo(LanguageSelectorScreen);
 //# sourceMappingURL=LanguageSelectorScreen.js.map

package/lib/module/ui/screens/LanguageSelectorScreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["useState","View","Text","StyleSheet","ScrollView","useOxy","useThemeColors","Ionicons","toast","Header","Section","GroupedSection","useI18n","jsx","_jsx","jsxs","_jsxs","SUPPORTED_LANGUAGES","id","name","nativeName","flag","icon","color","LanguageSelectorScreen","goBack","onClose","theme","navigate","user","currentLanguage","setLanguage","oxyServices","isAuthenticated","t","colors","isLoading","setIsLoading","handleLanguageSelect","languageId","updateProfile","language","e","console","warn","selectedLang","find","lang","success","error","languageItems","map","title","subtitle","customIcon","style","styles","languageFlag","backgroundColor","children","flagEmoji","iconColor","selected","onPress","dense","container","onBack","variant","elevation","content","showsVerticalScrollIndicator","isFirst","current","items","showChevron","disabled","sectionDescription","secondaryText","languageList","infoCard","inputBackground","borderColor","border","infoHeader","size","primary","infoTitle","text","infoText","create","flex","padding","section","marginBottom","sectionTitle","fontSize","fontWeight","lineHeight","marginTop","width","height","borderRadius","alignItems","justifyContent","infoSection","borderWidth","flexDirection","marginLeft","currentSection","currentLabel","currentFlag","marginRight","currentFlagEmoji","currentInfo","currentName","currentNative"],"sourceRoot":"../../../../src","sources":["ui/screens/LanguageSelectorScreen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useState","useMemo","useCallback","View","Text","StyleSheet","ScrollView","useOxy","useThemeColors","Ionicons","toast","Header","Section","GroupedSection","useI18n","SUPPORTED_LANGUAGES","jsx","_jsx","jsxs","_jsxs","LanguageSelectorScreen","goBack","onClose","theme","navigate","user","currentLanguage","setLanguage","oxyServices","isAuthenticated","t","colors","isLoading","setIsLoading","handleLanguageSelect","languageId","serverSyncFailed","id","updateProfile","language","e","__DEV__","console","warn","message","selectedLang","find","lang","success","name","error","languageItems","map","title","subtitle","nativeName","customIcon","style","styles","languageFlag","backgroundColor","color","children","flagEmoji","flag","iconColor","selected","onPress","dense","currentLanguageData","currentLanguageItems","showChevron","disabled","container","onBack","variant","elevation","content","showsVerticalScrollIndicator","removeClippedSubviews","length","isFirst","items","sectionDescription","secondaryText","languageList","infoCard","inputBackground","borderColor","border","infoHeader","size","primary","infoTitle","text","infoText","create","flex","padding","section","marginBottom","sectionTitle","fontSize","fontWeight","lineHeight","marginTop","width","height","borderRadius","alignItems","justifyContent","infoSection","borderWidth","flexDirection","marginLeft","currentSection","currentLabel","currentFlag","marginRight","currentFlagEmoji","currentInfo","currentName","currentNative","memo"],"sourceRoot":"../../../../src","sources":["ui/screens/LanguageSelectorScreen.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -37,17 +37,6 @@ const SignInScreen = ({
     oxyServices,
     switchSession
   } = useOxy();
-
-  // Only log props in development mode to reduce console noise
-  if (__DEV__) {
-    console.log('SignInScreen props:', {
-      initialStep,
-      initialUsername,
-      initialUserProfile
-    });
-    console.log('🔧 oxyServices available:', !!oxyServices);
-    console.log('🔧 getProfileByUsername available:', typeof oxyServices?.getProfileByUsername);
-  }
   const colors = useThemeColors(theme);
 
   // Check if this should be treated as "Add Account" mode

package/lib/module/ui/screens/SignInScreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["useState","useMemo","useCallback","useOxy","useThemeColors","StepBasedScreen","SignInUsernameStep","SignInPasswordStep","SignInTotpStep","jsx","_jsx","SignInScreen","navigate","goBack","onAuthenticated","theme","initialStep","username","initialUsername","userProfile","initialUserProfile","setUsername","password","setPassword","errorMessage","setErrorMessage","setUserProfile","showPassword","setShowPassword","isInputFocused","setIsInputFocused","isValidating","setIsValidating","validationStatus","setValidationStatus","existingSession","setExistingSession","login","completeMfaLogin","isLoading","user","isAuthenticated","sessions","oxyServices","switchSession","__DEV__","console","log","getProfileByUsername","colors","isAddAccountMode","length","validateUsername","usernameToValidate","error","offlineDetected","navigator","onLine","profile","profileData","displayName","name","full","first","avatar","id","profileUserId","toString","existing","find","s","sessionUserId","userId","status","code","isNetworkError","message","toLowerCase","includes","type","handleUsernameChange","text","handlePasswordChange","handleInputFocus","handleInputBlur","validateUsernameStep","valid","mfaToken","setMfaToken","handleContinueWithExistingAccount","sessionId","currentUser","getUserBySession","handleSignIn","steps","base","component","canProceed","push","handleComplete","stepData","onComplete","showProgressIndicator","enableAnimations"],"sourceRoot":"../../../../src","sources":["ui/screens/SignInScreen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useState","useMemo","useCallback","useOxy","useThemeColors","StepBasedScreen","SignInUsernameStep","SignInPasswordStep","SignInTotpStep","jsx","_jsx","SignInScreen","navigate","goBack","onAuthenticated","theme","initialStep","username","initialUsername","userProfile","initialUserProfile","setUsername","password","setPassword","errorMessage","setErrorMessage","setUserProfile","showPassword","setShowPassword","isInputFocused","setIsInputFocused","isValidating","setIsValidating","validationStatus","setValidationStatus","existingSession","setExistingSession","login","completeMfaLogin","isLoading","user","isAuthenticated","sessions","oxyServices","switchSession","colors","isAddAccountMode","length","validateUsername","usernameToValidate","__DEV__","console","log","getProfileByUsername","error","offlineDetected","navigator","onLine","profile","profileData","displayName","name","full","first","avatar","id","profileUserId","toString","existing","find","s","sessionUserId","userId","status","code","isNetworkError","message","toLowerCase","includes","type","handleUsernameChange","text","handlePasswordChange","handleInputFocus","handleInputBlur","validateUsernameStep","valid","mfaToken","setMfaToken","handleContinueWithExistingAccount","sessionId","currentUser","getUserBySession","handleSignIn","steps","base","component","canProceed","push","handleComplete","stepData","onComplete","showProgressIndicator","enableAnimations"],"sourceRoot":"../../../../src","sources":["ui/screens/SignInScreen.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -9,6 +9,7 @@ import SignUpWelcomeStep from './steps/SignUpWelcomeStep';
 import SignUpIdentityStep from './steps/SignUpIdentityStep';
 import SignUpSecurityStep from './steps/SignUpSecurityStep';
 import SignUpSummaryStep from './steps/SignUpSummaryStep';
+import { TTLCache, registerCacheForCleanup } from '../../utils/cache';
 
 // Types for better type safety
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -50,8 +51,16 @@ const SignUpScreen = ({
   // Error message state
   const [errorMessage, setErrorMessage] = useState('');
 
-  // Username validation with caching
-  const usernameCache = useRef(new Map());
+  // Username validation with caching - uses centralized cache
+  const usernameCache = useRef(new TTLCache(5 * 60 * 1000)); // 5 minutes cache
+
+  // Register cache for cleanup on mount
+  useEffect(() => {
+    registerCacheForCleanup(usernameCache.current);
+    return () => {
+      usernameCache.current.clear();
+    };
+  }, []);
   const validateUsername = useCallback(async usernameToValidate => {
     if (!usernameToValidate || usernameToValidate.length < USERNAME_MIN_LENGTH) {
       setValidationState({
@@ -63,9 +72,8 @@ const SignUpScreen = ({
 
     // Check cache first
     const cached = usernameCache.current.get(usernameToValidate);
-    const now = Date.now();
-    if (cached && now - cached.timestamp < 5 * 60 * 1000) {
-      const isValid = cached.available;
+    if (cached !== null) {
+      const isValid = cached;
       setValidationState({
         status: isValid ? 'valid' : 'invalid',
         message: isValid ? '' : 'Username is already taken'
@@ -81,10 +89,7 @@ const SignUpScreen = ({
       const isValid = result.available;
 
       // Cache the result
-      usernameCache.current.set(usernameToValidate, {
-        available: isValid,
-        timestamp: now
-      });
+      usernameCache.current.set(usernameToValidate, isValid);
       setValidationState({
         status: isValid ? 'valid' : 'invalid',
         message: isValid ? '' : result.message || 'Username is already taken'
@@ -144,13 +149,6 @@ const SignUpScreen = ({
     }
   }, [username, email, password, confirmPassword, validateEmail, validatePassword, signUp, navigate]);
 
-  // Cleanup cache on unmount
-  useEffect(() => {
-    return () => {
-      usernameCache.current.clear();
-    };
-  }, []);
-
   // Step configurations
   const steps = useMemo(() => [{
     id: 'welcome',

package/lib/module/ui/screens/SignUpScreen.js.map

@@ -1 +1 @@
-{"version":3,"names":["useState","useRef","useEffect","useCallback","useMemo","useOxy","useThemeColors","toast","StepBasedScreen","SignUpWelcomeStep","SignUpIdentityStep","SignUpSecurityStep","SignUpSummaryStep","jsx","_jsx","USERNAME_MIN_LENGTH","PASSWORD_MIN_LENGTH","EMAIL_REGEX","SignUpScreen","navigate","goBack","onAuthenticated","theme","signUp","oxyServices","colors","username","setUsername","email","setEmail","password","setPassword","confirmPassword","setConfirmPassword","showPassword","setShowPassword","showConfirmPassword","setShowConfirmPassword","isLoading","setIsLoading","validationState","setValidationState","status","message","errorMessage","setErrorMessage","usernameCache","Map","validateUsername","usernameToValidate","length","cached","current","get","now","Date","timestamp","isValid","available","result","checkUsernameAvailability","set","error","console","validateEmail","emailToValidate","test","validatePassword","passwordToValidate","handleComplete","stepData","user","success","newUser","clear","steps","id","component","canProceed","trim","onEnter","onComplete","showProgressIndicator","enableAnimations"],"sourceRoot":"../../../../src","sources":["ui/screens/SignUpScreen.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useState","useRef","useEffect","useCallback","useMemo","useOxy","useThemeColors","toast","StepBasedScreen","SignUpWelcomeStep","SignUpIdentityStep","SignUpSecurityStep","SignUpSummaryStep","TTLCache","registerCacheForCleanup","jsx","_jsx","USERNAME_MIN_LENGTH","PASSWORD_MIN_LENGTH","EMAIL_REGEX","SignUpScreen","navigate","goBack","onAuthenticated","theme","signUp","oxyServices","colors","username","setUsername","email","setEmail","password","setPassword","confirmPassword","setConfirmPassword","showPassword","setShowPassword","showConfirmPassword","setShowConfirmPassword","isLoading","setIsLoading","validationState","setValidationState","status","message","errorMessage","setErrorMessage","usernameCache","current","clear","validateUsername","usernameToValidate","length","cached","get","isValid","result","checkUsernameAvailability","available","set","error","console","validateEmail","emailToValidate","test","validatePassword","passwordToValidate","handleComplete","stepData","user","success","newUser","steps","id","component","canProceed","trim","onEnter","onComplete","showProgressIndicator","enableAnimations"],"sourceRoot":"../../../../src","sources":["ui/screens/SignUpScreen.tsx"],"mappings":"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","ignoreList":[]}

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

@@ -68,7 +68,18 @@ const WelcomeNewUserScreen = ({
   const fadeAnim = useRef(new Animated.Value(1)).current;
   const slideAnim = useRef(new Animated.Value(0)).current;
   const [currentStep, setCurrentStep] = useState(0);
-  const avatarUri = currentUser?.avatar ? oxyServices.getFileDownloadUrl(currentUser.avatar, 'thumb') : undefined;
+  // Track avatar separately to ensure it updates immediately after selection
+  const [selectedAvatarId, setSelectedAvatarId] = useState(currentUser?.avatar);
+
+  // Update selectedAvatarId when user changes
+  useEffect(() => {
+    if (user?.avatar) {
+      setSelectedAvatarId(user.avatar);
+    } else if (newUser?.avatar) {
+      setSelectedAvatarId(newUser.avatar);
+    }
+  }, [user?.avatar, newUser?.avatar]);
+  const avatarUri = selectedAvatarId ? oxyServices.getFileDownloadUrl(selectedAvatarId, 'thumb') : undefined;
 
   // Steps content
   const welcomeTitle = currentUser?.username ? t('welcomeNew.welcome.titleWithName', {
@@ -102,7 +113,7 @@ const WelcomeNewUserScreen = ({
   }];
   const totalSteps = steps.length;
   const avatarStepIndex = steps.findIndex(s => s.showAvatar);
-  const animateToStep = next => {
+  const animateToStepCallback = useCallback(next => {
     Animated.timing(fadeAnim, {
       toValue: 0,
       duration: 180,
@@ -120,48 +131,68 @@ const WelcomeNewUserScreen = ({
         friction: 9
       })]).start();
     });
-  };
+  }, [fadeAnim, slideAnim]);
   const nextStep = useCallback(() => {
-    if (currentStep < totalSteps - 1) animateToStep(currentStep + 1);
-  }, [currentStep, totalSteps]);
+    if (currentStep < totalSteps - 1) animateToStepCallback(currentStep + 1);
+  }, [currentStep, totalSteps, animateToStepCallback]);
   const prevStep = useCallback(() => {
-    if (currentStep > 0) animateToStep(currentStep - 1);
-  }, [currentStep]);
+    if (currentStep > 0) animateToStepCallback(currentStep - 1);
+  }, [currentStep, animateToStepCallback]);
   const skipToAvatar = useCallback(() => {
-    if (avatarStepIndex >= 0) animateToStep(avatarStepIndex);
-  }, [avatarStepIndex]);
+    if (avatarStepIndex >= 0) animateToStepCallback(avatarStepIndex);
+  }, [avatarStepIndex, animateToStepCallback]);
   const finish = useCallback(() => {
     if (onAuthenticated && currentUser) onAuthenticated(currentUser);
   }, [onAuthenticated, currentUser]);
   const openAvatarPicker = useCallback(() => {
+    // Ensure we're on the avatar step before opening picker
+    if (avatarStepIndex >= 0 && currentStep !== avatarStepIndex) {
+      animateToStepCallback(avatarStepIndex);
+    }
     navigate('FileManagement', {
       selectMode: true,
       multiSelect: false,
       disabledMimeTypes: ['video/', 'audio/', 'application/pdf'],
-      afterSelect: 'back',
+      afterSelect: 'none',
+      // Don't navigate away - stay on current screen
       onSelect: async file => {
         if (!file.contentType.startsWith('image/')) {
           toast.error(t('editProfile.toasts.selectImage') || 'Please select an image file');
           return;
         }
         try {
-          // Update file visibility to public for avatar
-          try {
-            await oxyServices.assetUpdateVisibility(file.id, 'public');
-            console.log('[WelcomeNewUser] Avatar visibility updated to public');
-          } catch (visError) {
-            console.warn('[WelcomeNewUser] Failed to update avatar visibility, continuing anyway:', visError);
+          // Update file visibility to public for avatar (skip if temporary asset ID)
+          if (file.id && !file.id.startsWith('temp-')) {
+            try {
+              await oxyServices.assetUpdateVisibility(file.id, 'public');
+              console.log('[WelcomeNewUser] Avatar visibility updated to public');
+            } catch (visError) {
+              // Only log non-404 errors (404 means asset doesn't exist yet, which is OK)
+              if (visError?.response?.status !== 404) {
+                console.warn('[WelcomeNewUser] Failed to update avatar visibility, continuing anyway:', visError);
+              }
+            }
           }
+
+          // Update the avatar immediately in local state
+          setSelectedAvatarId(file.id);
+
+          // Update user in store
           await updateUser({
             avatar: file.id
           }, oxyServices);
           toast.success(t('editProfile.toasts.avatarUpdated') || 'Avatar updated');
+
+          // Ensure we stay on the avatar step
+          if (avatarStepIndex >= 0 && currentStep !== avatarStepIndex) {
+            animateToStepCallback(avatarStepIndex);
+          }
         } catch (e) {
           toast.error(e.message || t('editProfile.toasts.updateAvatarFailed') || 'Failed to update avatar');
         }
       }
     });
-  }, [navigate, updateUser, oxyServices]);
+  }, [navigate, updateUser, oxyServices, currentStep, avatarStepIndex, animateToStepCallback, t]);
   const step = steps[currentStep];
   const pillButtons = useMemo(() => {
     if (currentStep === totalSteps - 1) {
@@ -274,9 +305,10 @@ const WelcomeNewUserScreen = ({
             style: [styles.avatarSection, styles.sectionSpacing],
             children: [/*#__PURE__*/_jsx(Avatar, {
               size: 120,
-              name: currentUser?.username,
+              name: currentUser?.name?.full || currentUser?.name?.first || currentUser?.username,
               uri: avatarUri,
               theme: theme,
+              backgroundColor: colors.primary + '20',
               style: styles.avatar
             }), /*#__PURE__*/_jsxs(TouchableOpacity, {
               style: [styles.changeAvatarButton, {