Merge remote-tracking branch 'refs/remotes/origin/master'

app/src/main/java/com/rosetta/messenger/ui/auth/AuthFlow.kt

@@ -130,7 +130,7 @@ fun AuthFlow(
                             currentScreen = AuthScreen.CONFIRM_SEED
                         }
                     },
-                    onAccountCreated = { onAuthComplete(null) }
+                    onAccountCreated = { account -> onAuthComplete(account) }
                 )
             }
             

app/src/main/java/com/rosetta/messenger/ui/auth/SetPasswordScreen.kt

@@ -27,6 +27,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.rosetta.messenger.crypto.CryptoManager
 import com.rosetta.messenger.data.AccountManager
+import com.rosetta.messenger.data.DecryptedAccount
 import com.rosetta.messenger.data.EncryptedAccount
 import com.rosetta.messenger.network.ProtocolManager
 import com.rosetta.messenger.ui.onboarding.PrimaryBlue
@@ -38,7 +39,7 @@ fun SetPasswordScreen(
     seedPhrase: List<String>,
     isDarkTheme: Boolean,
     onBack: () -> Unit,
-    onAccountCreated: () -> Unit
+    onAccountCreated: (DecryptedAccount) -> Unit
 ) {
     val themeAnimSpec = tween<Color>(durationMillis = 500, easing = CubicBezierEasing(0.4f, 0f, 0.2f, 1f))
     val backgroundColor by animateColorAsState(if (isDarkTheme) AuthBackground else AuthBackgroundLight, animationSpec = themeAnimSpec)
@@ -497,9 +498,21 @@ fun SetPasswordScreen(
                                 // 🔌 Connect to server and authenticate
                                 val privateKeyHash = CryptoManager.generatePrivateKeyHash(keyPair.privateKey)
                                 Log.d("SetPasswordScreen", "🔌 Connecting to server...")
+                                ProtocolManager.connect()
+                                // Give WebSocket time to connect before authenticating
+                                kotlinx.coroutines.delay(500)
                                 ProtocolManager.authenticate(keyPair.publicKey, privateKeyHash)
                                 
-                                onAccountCreated()
+                                // Create DecryptedAccount to pass to callback
+                                val decryptedAccount = DecryptedAccount(
+                                    publicKey = keyPair.publicKey,
+                                    privateKey = keyPair.privateKey,
+                                    seedPhrase = seedPhrase,
+                                    privateKeyHash = privateKeyHash,
+                                    name = truncatedKey
+                                )
+                                
+                                onAccountCreated(decryptedAccount)
                             } catch (e: Exception) {
                                 error = "Failed to create account: ${e.message}"
                                 isCreating = false

app/src/main/java/com/rosetta/messenger/ui/auth/UnlockScreen.kt

@@ -581,6 +581,9 @@ fun UnlockScreen(
                                 
                                 // Connect to server and authenticate
                                 Log.d("UnlockScreen", "Connecting to server...")
+                                ProtocolManager.connect()
+                                // Give WebSocket time to connect before authenticating
+                                kotlinx.coroutines.delay(500)
                                 ProtocolManager.authenticate(account.publicKey, privateKeyHash)
                                 
                                 accountManager.setCurrentAccount(account.publicKey)