Resolve merge conflict in eas.json

Author: umetaku5

frontend/app.json

@@ -4,7 +4,7 @@
     "slug": "oto",
     "version": "0.0.1",
     "orientation": "portrait",
-    "icon": "./assets/images/icon.png",
+    "icon": "./assets/images/oto-bg-white-logo.png",
     "scheme": "otoapp",
     "userInterfaceStyle": "automatic",
     "newArchEnabled": true,
@@ -15,7 +15,7 @@
         "NSMicrophoneUsageDescription": "This app needs access to your microphone to record audio for voice analysis and transcription."
       },
       "icon": {
-        "image": "./assets/images/icon.png",
+        "image": "./assets/images/oto-bg-white-logo.png",
         "prerendered": true
       },
       "splash": {
@@ -53,7 +53,13 @@
     ],
     "experiments": {
       "typedRoutes": true
+    },
+    "updates": {
+      "url": "https://u.expo.dev/4dd98174-a84b-40e7-9aff-02d7e312d2b9"
+    },
+    "runtimeVersion": {
+      "policy": "appVersion"
     }
   },
   "owner": "leq6c"
-}
+}

frontend/app/(tabs)/logout.tsx

@@ -1,13 +1,15 @@
+import { navigateToTabs } from '@/lib/session';
 import { useAuth } from '@/lib/oto-auth';
 import { useRouter } from 'expo-router';
 import { useEffect } from 'react';
 
 export default function Logout() {
   const { logout } = useAuth();
-  const router = useRouter();
 
   useEffect(() => {
-    logout();
-    router.replace('/login');
-  }, [logout, router]);
+    (async () => {
+      await logout();
+      navigateToTabs('/login');
+    })();
+  }, [logout]);
 }

frontend/assets/images/oto-bg-white-logo.png

@@ -6,11 +6,18 @@ import { Button, ButtonText } from '@/components/ui/button';
 import { Text, Heading } from '@/components/ui/text';
 import { Ionicons } from '@expo/vector-icons';
 import { useAuth } from '@/lib/oto-auth';
+import { navigateToTabs } from '@/lib/session';
 
 export default function LoginScreen() {
   const { login } = useLogin();
   const [error, setError] = useState('');
-  const { isReady } = useAuth();
+  const { isReady, user } = useAuth();
+
+  useEffect(() => {
+    if (user) {
+      navigateToTabs('/(tabs)');
+    }
+  }, [user]);
 
   if (!isReady)
     return (

frontend/components/LoginScreen.tsx

@@ -15,13 +15,16 @@
       "distribution": "internal",
       "ios": {
         "simulator": true
-      }
+      },
+      "channel": "development"
     },
     "preview": {
-      "distribution": "internal"
+      "distribution": "internal",
+      "channel": "preview"
     },
     "production": {
-      "autoIncrement": true
+      "autoIncrement": true,
+      "channel": "production"
     },
     "testflight": {
       "distribution": "store",

frontend/eas.json

@@ -7,15 +7,25 @@ export const useAuthStatus = () => {
   const [isLoggedIn, setIsLoggedIn] = useState<boolean | null>(null);
 
   useEffect(() => {
-    if (isReady) {
-      // Check if user is authenticated through Privy
-      const privyLoggedIn = !!user;
+    const checkAuthStatus = async () => {
+      if (isReady) {
+        try {
+          // Check if user is authenticated through Privy
+          const privyLoggedIn = !!user;
 
-      // Check if user is authenticated through wallet
-      const walletLoggedIn = hasSession();
+          // Check if user is authenticated through wallet
+          const walletLoggedIn = await hasSession();
 
-      setIsLoggedIn(!!(privyLoggedIn || walletLoggedIn));
-    }
+          const loggedIn = !!(privyLoggedIn || walletLoggedIn);
+          setIsLoggedIn(loggedIn);
+        } catch (error) {
+          console.error('Error checking auth status:', error);
+          setIsLoggedIn(false);
+        }
+      }
+    };
+
+    checkAuthStatus();
   }, [user, isReady]);
 
   return { isLoggedIn, isReady };

frontend/hooks/useAuthStatus.ts

@@ -1,7 +1,36 @@
+import { Platform } from 'react-native';
+import { Href, router } from 'expo-router';
 import * as SecureStore from 'expo-secure-store';
 
-export const hasSession = () => {
-  const walletToken = SecureStore.getItem('wallet_token');
-  const walletAddress = SecureStore.getItem('wallet_address');
-  return walletToken && walletAddress;
+export const hasSession = async (): Promise<boolean> => {
+  try {
+    const walletToken = await SecureStore.getItemAsync('wallet_token');
+    const walletAddress = await SecureStore.getItemAsync('wallet_address');
+    return !!(walletToken && walletAddress);
+  } catch (error) {
+    console.error('Error checking session:', error);
+    return false;
+  }
+};
+
+// Helper function for robust navigation on iOS mobile device
+export const navigateToTabs = (href: Href) => {
+  const navigate = () => {
+    try {
+      console.log('Attempting navigation to tabs');
+      router.replace(href);
+    } catch (error) {
+      console.error('Navigation error:', error);
+      // Fallback: try push instead of replace
+      try {
+        router.push(href);
+      } catch (pushError) {
+        console.error('Push navigation also failed:', pushError);
+      }
+    }
+  };
+
+  // Use platform-specific timing for iOS mobile device
+  const delay = Platform.OS === 'ios' ? 200 : 100;
+  setTimeout(navigate, delay);
 };