composeApp/src/androidMain/kotlin/su/reya/coop/screens/HomeScreen.kt

@@ -781,7 +781,7 @@ fun BottomMenuList(
         }
         Spacer(modifier = Modifier.size(16.dp))
         FilledTonalButton(
-            onClick = { viewModel.logout() },
+            onClick = { onDismiss { viewModel.logout() } },
             colors = ButtonDefaults.filledTonalButtonColors(
                 containerColor = MaterialTheme.colorScheme.error,
                 contentColor = MaterialTheme.colorScheme.onError

shared/src/commonMain/kotlin/su/reya/coop/Nostr.kt

@@ -188,6 +188,14 @@ class Nostr {
         }
     }
 
+    suspend fun prune() {
+        try {
+            client?.database()?.wipe()
+        } catch (e: Exception) {
+            throw IllegalStateException("Failed to prune database: ${e.message}", e)
+        }
+    }
+
     suspend fun setSigner(new: AsyncNostrSigner) {
         try {
             signer.switch(new)
@@ -994,7 +1002,7 @@ class Nostr {
         try {
             val currentUser =
                 signer.getPublicKeyAsync() ?: throw IllegalStateException("User not signed in")
-            
+
             val kind = Kind.fromStd(KindStandard.CONTACT_LIST)
             val filter = Filter().kind(kind).author(currentUser).limit(1u)
 

shared/src/commonMain/kotlin/su/reya/coop/NostrViewModel.kt

@@ -325,12 +325,34 @@ class NostrViewModel(
 
     fun logout() {
         viewModelScope.launch {
-            secretStore.clear("user_signer")
-            nostr.signer.switch(Keys.generate())
-            _signerRequired.value = true
+            try {
+                _isBusy.value = true
+                // Reset the nostr signer and prune the database
+                nostr.signer.switch(Keys.generate())
+                nostr.prune()
+            } catch (e: Exception) {
+                showError("Logout encountered an error: ${e.message}")
+            } finally {
+                // Clear credentials from persistent storage
+                secretStore.clear("user_signer")
+
+                // Reset all UI states
+                resetInternalState()
+
+                _isBusy.value = false
+                _signerRequired.value = true
+            }
         }
     }
 
+    private fun resetInternalState() {
+        _chatRooms.value = emptySet()
+        _contactList.value = emptySet()
+        _isPartialProcessedGiftWrap.value = false
+        _isRelayListEmpty.value = false
+        _isNotificationBannerDismissed.value = false
+    }
+
     fun dismissNotificationBanner() {
         viewModelScope.launch {
             secretStore.set("notification_banner_dismissed", "true")
@@ -821,7 +843,7 @@ class NostrViewModel(
         }
         return emptyList()
     }
-    
+
     suspend fun verifyActivity(pubkey: PublicKey): Timestamp? {
         return try {
             nostr.verifyActivity(pubkey)