v0.44.0

- launching navigate in a thread

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 150
-        versionName "0.43.2"
+        versionCode 151
+        versionName "0.44.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {

app/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt

@@ -50,6 +50,7 @@ private object PrefKeys {
     const val DEFAULT_FILE_SERVER = "defaultFileServer"
     const val DEFAULT_HOME_FOLLOW_LIST = "defaultHomeFollowList"
     const val DEFAULT_STORIES_FOLLOW_LIST = "defaultStoriesFollowList"
+    const val DEFAULT_NOTIFICATION_FOLLOW_LIST = "defaultNotificationFollowList"
     const val ZAP_PAYMENT_REQUEST_SERVER = "zapPaymentServer"
     const val LATEST_CONTACT_LIST = "latestContactList"
     const val HIDE_DELETE_REQUEST_DIALOG = "hide_delete_request_dialog"
@@ -203,6 +204,7 @@ object LocalPreferences {
             putString(PrefKeys.DEFAULT_FILE_SERVER, gson.toJson(account.defaultFileServer))
             putString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, account.defaultHomeFollowList)
             putString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, account.defaultStoriesFollowList)
+            putString(PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST, account.defaultNotificationFollowList)
             putString(PrefKeys.ZAP_PAYMENT_REQUEST_SERVER, gson.toJson(account.zapPaymentRequest))
             putString(PrefKeys.LATEST_CONTACT_LIST, Event.gson.toJson(account.backupContactList))
             putBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, account.hideDeleteRequestDialog)
@@ -225,6 +227,7 @@ object LocalPreferences {
             val translateTo = getString(PrefKeys.TRANSLATE_TO, null) ?: Locale.getDefault().language
             val defaultHomeFollowList = getString(PrefKeys.DEFAULT_HOME_FOLLOW_LIST, null) ?: KIND3_FOLLOWS
             val defaultStoriesFollowList = getString(PrefKeys.DEFAULT_STORIES_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
+            val defaultNotificationFollowList = getString(PrefKeys.DEFAULT_NOTIFICATION_FOLLOW_LIST, null) ?: GLOBAL_FOLLOWS
 
             val zapAmountChoices = gson.fromJson(
                 getString(PrefKeys.ZAP_AMOUNTS, "[]"),
@@ -288,6 +291,7 @@ object LocalPreferences {
                 defaultFileServer,
                 defaultHomeFollowList,
                 defaultStoriesFollowList,
+                defaultNotificationFollowList,
                 zapPaymentRequestServer,
                 hideDeleteRequestDialog,
                 hideBlockAlertDialog,

app/src/main/java/com/vitorpamplona/amethyst/NotificationCache.kt

@@ -38,19 +38,15 @@ object NotificationCache {
 
 class NotificationLiveData(val cache: NotificationCache) : LiveData<NotificationState>(NotificationState(cache)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+    private val bundler = BundledUpdate(300, Dispatchers.IO) {
         if (hasActiveObservers()) {
-            refresh()
+            postValue(NotificationState(cache))
         }
     }
 
     fun invalidateData() {
         bundler.invalidate()
     }
-
-    fun refresh() {
-        postValue(NotificationState(cache))
-    }
 }
 
 class NotificationState(val cache: NotificationCache)

app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -55,6 +55,7 @@ class Account(
     var defaultFileServer: ServersAvailable = ServersAvailable.IMGUR,
     var defaultHomeFollowList: String = KIND3_FOLLOWS,
     var defaultStoriesFollowList: String = GLOBAL_FOLLOWS,
+    var defaultNotificationFollowList: String = GLOBAL_FOLLOWS,
     var zapPaymentRequest: Nip47URI? = null,
     var hideDeleteRequestDialog: Boolean = false,
     var hideBlockAlertDialog: Boolean = false,
@@ -751,6 +752,12 @@ class Account(
         saveable.invalidateData()
     }
 
+    fun changeDefaultNotificationFollowList(name: String) {
+        defaultNotificationFollowList = name
+        live.invalidateData()
+        saveable.invalidateData()
+    }
+
     fun changeZapAmounts(newAmounts: List<Long>) {
         zapAmountChoices = newAmounts
         live.invalidateData()

app/src/main/java/com/vitorpamplona/amethyst/model/AntiSpamFilter.kt

@@ -55,19 +55,15 @@ class AntiSpamFilter {
 class AntiSpamLiveData(val cache: AntiSpamFilter) : LiveData<AntiSpamState>(AntiSpamState(cache)) {
 
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+    private val bundler = BundledUpdate(300, Dispatchers.IO) {
         if (hasActiveObservers()) {
-            refresh()
+            postValue(AntiSpamState(cache))
         }
     }
 
     fun invalidateData() {
         bundler.invalidate()
     }
-
-    private fun refresh() {
-        postValue(AntiSpamState(cache))
-    }
 }
 
 class AntiSpamState(val cache: AntiSpamFilter)

app/src/main/java/com/vitorpamplona/amethyst/model/Channel.kt

@@ -74,9 +74,9 @@ class Channel(val idHex: String) {
 
 class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelState(channel)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+    private val bundler = BundledUpdate(300, Dispatchers.IO) {
         if (hasActiveObservers()) {
-            refresh()
+            postValue(ChannelState(channel))
         }
     }
 
@@ -84,10 +84,6 @@ class ChannelLiveData(val channel: Channel) : LiveData<ChannelState>(ChannelStat
         bundler.invalidate()
     }
 
-    private fun refresh() {
-        postValue(ChannelState(channel))
-    }
-
     override fun onActive() {
         super.onActive()
         NostrSingleChannelDataSource.add(channel.idHex)

app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt

@@ -736,20 +736,24 @@ object LocalCache {
             note.addRelay(relay)
         }
 
+        val file = File(Amethyst.instance.applicationContext.externalCacheDir, "NIP95")
+
+        if (!file.exists()) {
+            try {
+                val cachePath = File(Amethyst.instance.applicationContext.externalCacheDir, "NIP95")
+                cachePath.mkdirs()
+                val stream = FileOutputStream(File(cachePath, event.id))
+                stream.write(event.decode())
+                stream.close()
+                Log.e("EventLogger", "Saved to disk as ${File(cachePath, event.id).toUri()}")
+            } catch (e: IOException) {
+                Log.e("FileSotrageEvent", "FileStorageEvent save to disk error: " + event.id, e)
+            }
+        }
+
         // Already processed this event.
         if (note.event != null) return
 
-        try {
-            val cachePath = File(Amethyst.instance.applicationContext.externalCacheDir, "NIP95")
-            cachePath.mkdirs()
-            val stream = FileOutputStream(File(cachePath, event.id))
-            stream.write(event.decode())
-            stream.close()
-            Log.e("EventLogger", "Saved to disk as ${File(cachePath, event.id).toUri()}")
-        } catch (e: IOException) {
-            Log.e("FileSotrageEvent", "FileStorageEvent save to disk error: " + event.id, e)
-        }
-
         // this is an invalid event. But we don't need to keep the data in memory.
         val eventNoData = FileStorageEvent(event.id, event.pubKey, event.createdAt, event.tags, "", event.sig)
 
@@ -912,7 +916,7 @@ object LocalCache {
 class LocalCacheLiveData : LiveData<Set<Note>>(setOf<Note>()) {
 
     // Refreshes observers in batches.
-    private val bundler = BundledInsert<Note>(300, Dispatchers.Main)
+    private val bundler = BundledInsert<Note>(300, Dispatchers.IO)
 
     fun invalidateData(newNote: Note) {
         bundler.invalidateList(newNote) { bundledNewNotes ->

app/src/main/java/com/vitorpamplona/amethyst/model/Note.kt

@@ -410,9 +410,9 @@ class NoteLiveSet(u: Note) {
 
 class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+    private val bundler = BundledUpdate(300, Dispatchers.IO) {
         if (hasActiveObservers()) {
-            refresh()
+            postValue(NoteState(note))
         }
     }
 
@@ -420,10 +420,6 @@ class NoteLiveData(val note: Note) : LiveData<NoteState>(NoteState(note)) {
         bundler.invalidate()
     }
 
-    private fun refresh() {
-        postValue(NoteState(note))
-    }
-
     override fun onActive() {
         super.onActive()
         if (note is AddressableNote) {

app/src/main/java/com/vitorpamplona/amethyst/model/User.kt

@@ -396,9 +396,9 @@ class UserMetadata {
 
 class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
     // Refreshes observers in batches.
-    private val bundler = BundledUpdate(300, Dispatchers.Main) {
+    private val bundler = BundledUpdate(300, Dispatchers.IO) {
         if (hasActiveObservers()) {
-            refresh()
+            postValue(UserState(user))
         }
     }
 
@@ -406,10 +406,6 @@ class UserLiveData(val user: User) : LiveData<UserState>(UserState(user)) {
         bundler.invalidate()
     }
 
-    private fun refresh() {
-        postValue(UserState(user))
-    }
-
     override fun onActive() {
         super.onActive()
         NostrSingleUserDataSource.add(user)

app/src/main/java/com/vitorpamplona/amethyst/service/NostrAccountDataSource.kt

@@ -75,7 +75,7 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
             filter = JsonFilter(
                 kinds = listOf(ReportEvent.kind),
                 authors = listOf(account.userProfile().pubkeyHex),
-                since = latestEOSEs.users[account.userProfile()]?.relayList
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultNotificationFollowList)?.relayList
             )
         )
     }
@@ -96,12 +96,12 @@ object NostrAccountDataSource : NostrDataSource("AccountData") {
             ),
             tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
             limit = 400,
-            since = latestEOSEs.users[account.userProfile()]?.relayList
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultNotificationFollowList)?.relayList
         )
     )
 
     val accountChannel = requestNewChannel { time, relayUrl ->
-        latestEOSEs.addOrUpdate(account.userProfile(), relayUrl, time)
+        latestEOSEs.addOrUpdate(account.userProfile(), account.defaultNotificationFollowList, relayUrl, time)
     }
 
     override fun updateChannelFilters() {

app/src/main/java/com/vitorpamplona/amethyst/service/NostrChatroomListDataSource.kt

@@ -15,13 +15,14 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
     lateinit var account: Account
 
     val latestEOSEs = EOSEAccount()
+    val chatRoomList = "ChatroomList"
 
     fun createMessagesToMeFilter() = TypedFilter(
         types = setOf(FeedType.PRIVATE_DMS),
         filter = JsonFilter(
             kinds = listOf(PrivateDmEvent.kind),
             tags = mapOf("p" to listOf(account.userProfile().pubkeyHex)),
-            since = latestEOSEs.users[account.userProfile()]?.relayList
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )
     )
 
@@ -30,7 +31,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         filter = JsonFilter(
             kinds = listOf(PrivateDmEvent.kind),
             authors = listOf(account.userProfile().pubkeyHex),
-            since = latestEOSEs.users[account.userProfile()]?.relayList
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )
     )
 
@@ -39,7 +40,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         filter = JsonFilter(
             kinds = listOf(ChannelCreateEvent.kind, ChannelMetadataEvent.kind),
             authors = listOf(account.userProfile().pubkeyHex),
-            since = latestEOSEs.users[account.userProfile()]?.relayList
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )
     )
 
@@ -48,7 +49,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
         filter = JsonFilter(
             kinds = listOf(ChannelCreateEvent.kind),
             ids = account.followingChannels.toList(),
-            since = latestEOSEs.users[account.userProfile()]?.relayList
+            since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList
         )
     )
 
@@ -72,7 +73,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
                 filter = JsonFilter(
                     kinds = listOf(ChannelMessageEvent.kind),
                     tags = mapOf("e" to listOf(it)),
-                    since = latestEOSEs.users[account.userProfile()]?.relayList,
+                    since = latestEOSEs.users[account.userProfile()]?.followList?.get(chatRoomList)?.relayList,
                     limit = 25 // Remember to consider spam that is being removed from the UI
                 )
             )
@@ -80,7 +81,7 @@ object NostrChatroomListDataSource : NostrDataSource("MailBoxFeed") {
     }
 
     val chatroomListChannel = requestNewChannel { time, relayUrl ->
-        latestEOSEs.addOrUpdate(account.userProfile(), relayUrl, time)
+        latestEOSEs.addOrUpdate(account.userProfile(), chatRoomList, relayUrl, time)
     }
 
     override fun updateChannelFilters() {

app/src/main/java/com/vitorpamplona/amethyst/service/NostrHomeDataSource.kt

@@ -59,7 +59,7 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                 kinds = listOf(TextNoteEvent.kind, LongTextNoteEvent.kind, PollNoteEvent.kind, HighlightEvent.kind),
                 authors = followSet,
                 limit = 400,
-                since = latestEOSEs.users[account.userProfile()]?.relayList
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList
             )
         )
     }
@@ -79,13 +79,13 @@ object NostrHomeDataSource : NostrDataSource("HomeFeed") {
                     }.flatten()
                 ),
                 limit = 100,
-                since = latestEOSEs.users[account.userProfile()]?.relayList
+                since = latestEOSEs.users[account.userProfile()]?.followList?.get(account.defaultHomeFollowList)?.relayList
             )
         )
     }
 
     val followAccountChannel = requestNewChannel { time, relayUrl ->
-        latestEOSEs.addOrUpdate(account.userProfile(), relayUrl, time)
+        latestEOSEs.addOrUpdate(account.userProfile(), account.defaultHomeFollowList, relayUrl, time)
     }
 
     override fun updateChannelFilters() {

app/src/main/java/com/vitorpamplona/amethyst/service/relays/EOSE.kt

@@ -19,13 +19,28 @@ class EOSERelayList(var relayList: Map<String, EOSETime> = emptyMap()) {
     }
 }
 
-class EOSEAccount(var users: Map<User, EOSERelayList> = emptyMap()) {
-    fun addOrUpdate(user: User, relayUrl: String, time: Long) {
-        val relayList = users[user]
+class EOSEFollowList(var followList: Map<String, EOSERelayList> = emptyMap()) {
+    fun addOrUpdate(listCode: String, relayUrl: String, time: Long) {
+        val relayList = followList[listCode]
         if (relayList == null) {
-            users = users + mapOf(user to EOSERelayList(mapOf(relayUrl to EOSETime(time))))
+            val newList = EOSERelayList()
+            newList.addOrUpdate(relayUrl, time)
+            followList = followList + mapOf(listCode to newList)
         } else {
             relayList.addOrUpdate(relayUrl, time)
         }
     }
 }
+
+class EOSEAccount(var users: Map<User, EOSEFollowList> = emptyMap()) {
+    fun addOrUpdate(user: User, listCode: String, relayUrl: String, time: Long) {
+        val followList = users[user]
+        if (followList == null) {
+            val newList = EOSEFollowList()
+            newList.addOrUpdate(listCode, relayUrl, time)
+            users = users + mapOf(user to newList)
+        } else {
+            followList.addOrUpdate(listCode, relayUrl, time)
+        }
+    }
+}

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt

@@ -9,10 +9,11 @@ object ChatroomListKnownFeedFilter : FeedFilter<Note>() {
     // returns the last Note of each user.
     override fun feed(): List<Note> {
         val me = account.userProfile()
+        val followingKeySet = account.followingKeySet()
 
         val privateChatrooms = me.privateChatrooms
         val messagingWith = privateChatrooms.keys.filter {
-            me.hasSentMessagesTo(it) && account.isAcceptable(it)
+            (it.pubkeyHex in followingKeySet || me.hasSentMessagesTo(it)) && !account.isHidden(it)
         }
 
         val privateMessages = messagingWith.mapNotNull { it ->

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListNewFeedFilter.kt

@@ -8,11 +8,12 @@ object ChatroomListNewFeedFilter : FeedFilter<Note>() {
 
     // returns the last Note of each user.
     override fun feed(): List<Note> {
-        val me = ChatroomListKnownFeedFilter.account.userProfile()
+        val me = account.userProfile()
+        val followingKeySet = ChatroomListKnownFeedFilter.account.followingKeySet()
 
         val privateChatrooms = account.userProfile().privateChatrooms
         val messagingWith = privateChatrooms.keys.filter {
-            !me.hasSentMessagesTo(it) && account.isAcceptable(it)
+            it.pubkeyHex !in followingKeySet && !me.hasSentMessagesTo(it) && account.isAcceptable(it)
         }
 
         val privateMessages = messagingWith.mapNotNull { it ->

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.ui.dal
 
 import com.vitorpamplona.amethyst.model.Account
+import com.vitorpamplona.amethyst.model.GLOBAL_FOLLOWS
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.Note
 import com.vitorpamplona.amethyst.model.User
@@ -18,6 +19,10 @@ object NotificationFeedFilter : AdditiveFeedFilter<Note>() {
     }
 
     private fun innerApplyFilter(collection: Collection<Note>): Set<Note> {
+        val isGlobal = account.defaultNotificationFollowList == GLOBAL_FOLLOWS
+
+        val followingKeySet = account.selectedUsersFollowList(account.defaultNotificationFollowList) ?: emptySet()
+
         val loggedInUser = account.userProfile()
         val loggedInUserHex = loggedInUser.pubkeyHex
 
@@ -28,6 +33,7 @@ object NotificationFeedFilter : AdditiveFeedFilter<Note>() {
                 it.event !is BadgeDefinitionEvent &&
                 it.event !is BadgeProfilesEvent &&
                 it.author !== loggedInUser &&
+                (isGlobal || it.author?.pubkeyHex in followingKeySet) &&
                 it.event?.isTaggedUser(loggedInUserHex) ?: false &&
                 (it.author == null || !account.isHidden(it.author!!.pubkeyHex)) &&
                 tagsAnEventByUser(it, loggedInUser)

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt

@@ -81,6 +81,7 @@ fun AppTopBar(navController: NavHostController, scaffoldState: ScaffoldState, ac
         // Route.Profile.route -> TopBarWithBackButton(navController)
         Route.Home.base -> HomeTopBar(scaffoldState, accountViewModel)
         Route.Video.base -> StoriesTopBar(scaffoldState, accountViewModel)
+        Route.Notification.base -> NotificationTopBar(scaffoldState, accountViewModel)
         else -> MainTopBar(scaffoldState, accountViewModel)
     }
 }
@@ -103,6 +104,15 @@ fun HomeTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel)
     }
 }
 
+@Composable
+fun NotificationTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
+    GenericTopBar(scaffoldState, accountViewModel) { account ->
+        FollowList(account.defaultNotificationFollowList, account.userProfile(), true) { listName ->
+            account.changeDefaultNotificationFollowList(listName)
+        }
+    }
+}
+
 @Composable
 fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) {
     GenericTopBar(scaffoldState, accountViewModel) {
@@ -273,13 +283,13 @@ fun SimpleTextSpinner(
 ) {
     val interactionSource = remember { MutableInteractionSource() }
     var optionsShowing by remember { mutableStateOf(false) }
-    var currentText by remember { mutableStateOf(placeholder) }
+    var currentText by remember(placeholder) { mutableStateOf(placeholder) }
 
     Box(
         modifier = modifier,
         contentAlignment = Alignment.Center
     ) {
-        Text(currentText)
+        Text(placeholder)
         Box(
             modifier = Modifier
                 .matchParentSize()

app/src/main/java/com/vitorpamplona/amethyst/ui/note/BadgeCompose.kt

@@ -75,10 +75,12 @@ fun BadgeCompose(likeSetCard: BadgeCard, isInnerNote: Boolean = false, routeForL
                 .background(backgroundColor)
                 .combinedClickable(
                     onClick = {
-                        routeFor(
-                            note,
-                            accountViewModel.userProfile()
-                        )?.let { navController.navigate(it) }
+                        scope.launch {
+                            routeFor(
+                                note,
+                                accountViewModel.userProfile()
+                            )?.let { navController.navigate(it) }
+                        }
                     },
                     onLongClick = { popupExpanded = true }
                 )

app/src/main/java/com/vitorpamplona/amethyst/ui/note/BoostSetCompose.kt

@@ -17,6 +17,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -31,6 +32,7 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.screen.BoostSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -45,6 +47,8 @@ fun BoostSetCompose(boostSetCard: BoostSetCard, isInnerNote: Boolean = false, ro
     val noteEvent = note?.event
     var popupExpanded by remember { mutableStateOf(false) }
 
+    val scope = rememberCoroutineScope()
+
     if (note == null) {
         BlankNote(Modifier, isInnerNote)
     } else {
@@ -65,12 +69,19 @@ fun BoostSetCompose(boostSetCard: BoostSetCard, isInnerNote: Boolean = false, ro
         }
 
         Column(
-            modifier = Modifier.background(backgroundColor).combinedClickable(
-                onClick = {
-                    routeFor(note, account.userProfile())?.let { navController.navigate(it) }
-                },
-                onLongClick = { popupExpanded = true }
-            )
+            modifier = Modifier
+                .background(backgroundColor)
+                .combinedClickable(
+                    onClick = {
+                        scope.launch {
+                            routeFor(
+                                note,
+                                account.userProfile()
+                            )?.let { navController.navigate(it) }
+                        }
+                    },
+                    onLongClick = { popupExpanded = true }
+                )
         ) {
             Row(
                 modifier = Modifier
@@ -90,7 +101,9 @@ fun BoostSetCompose(boostSetCard: BoostSetCard, isInnerNote: Boolean = false, ro
                         Icon(
                             painter = painterResource(R.drawable.ic_retweeted),
                             null,
-                            modifier = Modifier.size(16.dp).align(Alignment.TopEnd),
+                            modifier = Modifier
+                                .size(16.dp)
+                                .align(Alignment.TopEnd),
                             tint = Color.Unspecified
                         )
                     }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/LikeSetCompose.kt

@@ -17,6 +17,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -31,6 +32,7 @@ import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.screen.LikeSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -44,6 +46,7 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, isInnerNote: Boolean = false, route
 
     val noteEvent = note?.event
     var popupExpanded by remember { mutableStateOf(false) }
+    val scope = rememberCoroutineScope()
 
     if (note == null) {
         BlankNote(Modifier, isInnerNote)
@@ -65,12 +68,19 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, isInnerNote: Boolean = false, route
         }
 
         Column(
-            modifier = Modifier.background(backgroundColor).combinedClickable(
-                onClick = {
-                    routeFor(note, account.userProfile())?.let { navController.navigate(it) }
-                },
-                onLongClick = { popupExpanded = true }
-            )
+            modifier = Modifier
+                .background(backgroundColor)
+                .combinedClickable(
+                    onClick = {
+                        scope.launch {
+                            routeFor(
+                                note,
+                                account.userProfile()
+                            )?.let { navController.navigate(it) }
+                        }
+                    },
+                    onLongClick = { popupExpanded = true }
+                )
         ) {
             Row(
                 modifier = Modifier
@@ -90,7 +100,9 @@ fun LikeSetCompose(likeSetCard: LikeSetCard, isInnerNote: Boolean = false, route
                         Icon(
                             painter = painterResource(R.drawable.ic_liked),
                             null,
-                            modifier = Modifier.size(16.dp).align(Alignment.TopEnd),
+                            modifier = Modifier
+                                .size(16.dp)
+                                .align(Alignment.TopEnd),
                             tint = Color.Unspecified
                         )
                     }

app/src/main/java/com/vitorpamplona/amethyst/ui/note/MessageSetCompose.kt

@@ -69,7 +69,12 @@ fun MessageSetCompose(messageSetCard: MessageSetCard, isInnerNote: Boolean = fal
         Column(
             modifier = Modifier.background(backgroundColor).combinedClickable(
                 onClick = {
-                    routeFor(note, accountViewModel.userProfile())?.let { navController.navigate(it) }
+                    scope.launch {
+                        routeFor(
+                            note,
+                            accountViewModel.userProfile()
+                        )?.let { navController.navigate(it) }
+                    }
                 },
                 onLongClick = { popupExpanded = true }
             )

app/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt

@@ -89,7 +89,9 @@ fun MultiSetCompose(multiSetCard: MultiSetCard, routeForLastRead: String, accoun
                 .background(backgroundColor)
                 .combinedClickable(
                     onClick = {
-                        routeFor(note, account.userProfile())?.let { navController.navigate(it) }
+                        scope.launch {
+                            routeFor(note, account.userProfile())?.let { navController.navigate(it) }
+                        }
                     },
                     onLongClick = { popupExpanded = true }
                 )

app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt

@@ -274,7 +274,9 @@ fun NoteComposeInner(
             modifier = modifier
                 .combinedClickable(
                     onClick = {
-                        routeFor(note, loggedIn)?.let { navController.navigate(it) }
+                        scope.launch {
+                            routeFor(note, loggedIn)?.let { navController.navigate(it) }
+                        }
                     },
                     onLongClick = { popupExpanded = true }
                 )

app/src/main/java/com/vitorpamplona/amethyst/ui/note/ZapSetCompose.kt

@@ -19,6 +19,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -33,6 +34,7 @@ import com.vitorpamplona.amethyst.ui.screen.ZapSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.BitcoinOrange
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 
 @OptIn(ExperimentalFoundationApi::class)
@@ -46,6 +48,7 @@ fun ZapSetCompose(zapSetCard: ZapSetCard, isInnerNote: Boolean = false, routeFor
 
     val noteEvent = note?.event
     var popupExpanded by remember { mutableStateOf(false) }
+    val scope = rememberCoroutineScope()
 
     if (note == null) {
         BlankNote(Modifier, isInnerNote)
@@ -67,12 +70,19 @@ fun ZapSetCompose(zapSetCard: ZapSetCard, isInnerNote: Boolean = false, routeFor
         }
 
         Column(
-            modifier = Modifier.background(backgroundColor).combinedClickable(
-                onClick = {
-                    routeFor(note, account.userProfile())?.let { navController.navigate(it) }
-                },
-                onLongClick = { popupExpanded = true }
-            )
+            modifier = Modifier
+                .background(backgroundColor)
+                .combinedClickable(
+                    onClick = {
+                        scope.launch {
+                            routeFor(
+                                note,
+                                account.userProfile()
+                            )?.let { navController.navigate(it) }
+                        }
+                    },
+                    onLongClick = { popupExpanded = true }
+                )
         ) {
             Row(
                 modifier = Modifier

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/CardFeedViewModel.kt

@@ -38,7 +38,7 @@ open class CardFeedViewModel(val localFilter: FeedFilter<Note>) : ViewModel() {
     private var lastAccount: Account? = null
     private var lastNotes: List<Note>? = null
 
-    private fun refresh() {
+    fun refresh() {
         val scope = CoroutineScope(Job() + Dispatchers.Default)
         scope.launch {
             refreshSuspended()

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ChatroomFeedView.kt

@@ -67,7 +67,7 @@ fun ChatroomFeedView(viewModel: FeedViewModel, accountViewModel: AccountViewMode
                         }
                     }
                 }
-                FeedState.Loading -> {
+                is FeedState.Loading -> {
                     LoadingFeed()
                 }
             }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/BookmarkListScreen.kt

@@ -72,8 +72,8 @@ fun BookmarkListScreen(accountViewModel: AccountViewModel, navController: NavCon
                         }
                     )
                 }
-                HorizontalPager(pageCount = 2, state = pagerState) {
-                    when (pagerState.currentPage) {
+                HorizontalPager(pageCount = 2, state = pagerState) { page ->
+                    when (page) {
                         0 -> FeedView(privateFeedViewModel, accountViewModel, navController, null)
                         1 -> FeedView(publicFeedViewModel, accountViewModel, navController, null)
                     }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ChatroomListScreen.kt

@@ -24,6 +24,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.mutableStateOf
@@ -44,6 +45,7 @@ import com.vitorpamplona.amethyst.service.NostrChatroomListDataSource
 import com.vitorpamplona.amethyst.ui.dal.ChatroomListKnownFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.ChatroomListNewFeedFilter
 import com.vitorpamplona.amethyst.ui.screen.ChatroomListFeedView
+import com.vitorpamplona.amethyst.ui.screen.FeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListKnownFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrChatroomListNewFeedViewModel
 import kotlinx.coroutines.launch
@@ -58,6 +60,48 @@ fun ChatroomListScreen(accountViewModel: AccountViewModel, navController: NavCon
     val markKnownAsRead = remember { mutableStateOf(false) }
     val markNewAsRead = remember { mutableStateOf(false) }
 
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
+
+    ChatroomListKnownFeedFilter.account = account
+    val knownFeedViewModel: NostrChatroomListKnownFeedViewModel = viewModel()
+
+    ChatroomListNewFeedFilter.account = account
+    val newFeedViewModel: NostrChatroomListNewFeedViewModel = viewModel()
+
+    LaunchedEffect(accountViewModel) {
+        NostrChatroomListDataSource.account = account
+        NostrChatroomListDataSource.start()
+        knownFeedViewModel.invalidateData()
+        newFeedViewModel.invalidateData()
+    }
+
+    val lifeCycleOwner = LocalLifecycleOwner.current
+    DisposableEffect(accountViewModel) {
+        val observer = LifecycleEventObserver { _, event ->
+            if (event == Lifecycle.Event.ON_RESUME) {
+                NostrChatroomListDataSource.account = account
+                NostrChatroomListDataSource.start()
+                knownFeedViewModel.invalidateData()
+                newFeedViewModel.invalidateData()
+            }
+        }
+
+        lifeCycleOwner.lifecycle.addObserver(observer)
+        onDispose {
+            lifeCycleOwner.lifecycle.removeObserver(observer)
+        }
+    }
+
+    val tabs by remember {
+        derivedStateOf {
+            listOf(
+                ChatroomListTabItem(R.string.known, knownFeedViewModel, markKnownAsRead),
+                ChatroomListTabItem(R.string.new_requests, newFeedViewModel, markNewAsRead)
+            )
+        }
+    }
+
     Box(Modifier.fillMaxSize()) {
         Column(Modifier.fillMaxHeight()) {
             Column(
@@ -68,21 +112,17 @@ fun ChatroomListScreen(accountViewModel: AccountViewModel, navController: NavCon
                         backgroundColor = MaterialTheme.colors.background,
                         selectedTabIndex = pagerState.currentPage
                     ) {
-                        Tab(
-                            selected = pagerState.currentPage == 0,
-                            onClick = { coroutineScope.launch { pagerState.animateScrollToPage(0) } },
-                            text = {
-                                Text(text = stringResource(R.string.known))
-                            }
-                        )
-
-                        Tab(
-                            selected = pagerState.currentPage == 1,
-                            onClick = { coroutineScope.launch { pagerState.animateScrollToPage(1) } },
-                            text = {
-                                Text(text = stringResource(R.string.new_requests))
-                            }
-                        )
+                        tabs.forEachIndexed { index, tab ->
+                            Tab(
+                                selected = pagerState.currentPage == index,
+                                text = {
+                                    Text(text = stringResource(tab.resource))
+                                },
+                                onClick = {
+                                    coroutineScope.launch { pagerState.animateScrollToPage(index) }
+                                }
+                            )
+                        }
                     }
 
                     IconButton(
@@ -107,102 +147,20 @@ fun ChatroomListScreen(accountViewModel: AccountViewModel, navController: NavCon
                     }
                 }
 
-                HorizontalPager(pageCount = 2, state = pagerState) {
-                    when (pagerState.currentPage) {
-                        0 -> TabKnown(accountViewModel, navController, markKnownAsRead)
-                        1 -> TabNew(accountViewModel, navController, markNewAsRead)
-                    }
+                HorizontalPager(pageCount = 2, state = pagerState) { page ->
+                    ChatroomListFeedView(
+                        viewModel = tabs[page].viewModel,
+                        accountViewModel = accountViewModel,
+                        navController = navController,
+                        markAsRead = tabs[page].markAsRead
+                    )
                 }
             }
         }
     }
 }
 
-@Composable
-fun TabKnown(
-    accountViewModel: AccountViewModel,
-    navController: NavController,
-    markAsRead: MutableState<Boolean>
-) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
-
-    ChatroomListKnownFeedFilter.account = account
-    val feedViewModel: NostrChatroomListKnownFeedViewModel = viewModel()
-
-    LaunchedEffect(accountViewModel) {
-        NostrChatroomListDataSource.account = account
-        NostrChatroomListDataSource.start()
-        feedViewModel.invalidateData()
-    }
-
-    val lifeCycleOwner = LocalLifecycleOwner.current
-    DisposableEffect(accountViewModel) {
-        val observer = LifecycleEventObserver { _, event ->
-            if (event == Lifecycle.Event.ON_RESUME) {
-                NostrChatroomListDataSource.account = account
-                NostrChatroomListDataSource.start()
-                feedViewModel.invalidateData()
-            }
-        }
-
-        lifeCycleOwner.lifecycle.addObserver(observer)
-        onDispose {
-            lifeCycleOwner.lifecycle.removeObserver(observer)
-        }
-    }
-
-    Column(Modifier.fillMaxHeight()) {
-        Column(
-            modifier = Modifier.padding(vertical = 0.dp)
-        ) {
-            ChatroomListFeedView(feedViewModel, accountViewModel, navController, markAsRead)
-        }
-    }
-}
-
-@Composable
-fun TabNew(
-    accountViewModel: AccountViewModel,
-    navController: NavController,
-    markAsRead: MutableState<Boolean>
-) {
-    val accountState by accountViewModel.accountLiveData.observeAsState()
-    val account = accountState?.account ?: return
-
-    ChatroomListNewFeedFilter.account = account
-    val feedViewModel: NostrChatroomListNewFeedViewModel = viewModel()
-
-    LaunchedEffect(accountViewModel) {
-        NostrChatroomListDataSource.account = account
-        NostrChatroomListDataSource.start()
-        feedViewModel.invalidateData()
-    }
-
-    val lifeCycleOwner = LocalLifecycleOwner.current
-    DisposableEffect(accountViewModel) {
-        val observer = LifecycleEventObserver { _, event ->
-            if (event == Lifecycle.Event.ON_RESUME) {
-                NostrChatroomListDataSource.account = account
-                NostrChatroomListDataSource.start()
-                feedViewModel.invalidateData()
-            }
-        }
-
-        lifeCycleOwner.lifecycle.addObserver(observer)
-        onDispose {
-            lifeCycleOwner.lifecycle.removeObserver(observer)
-        }
-    }
-
-    Column(Modifier.fillMaxHeight()) {
-        Column(
-            modifier = Modifier.padding(vertical = 0.dp)
-        ) {
-            ChatroomListFeedView(feedViewModel, accountViewModel, navController, markAsRead)
-        }
-    }
-}
+class ChatroomListTabItem(val resource: Int, val viewModel: FeedViewModel, val markAsRead: MutableState<Boolean>)
 
 @Composable
 fun ChatroomTabMenu(

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HiddenUsersScreen.kt

@@ -53,8 +53,8 @@ fun HiddenUsersScreen(accountViewModel: AccountViewModel, navController: NavCont
                         }
                     )
                 }
-                HorizontalPager(pageCount = 1, state = pagerState) {
-                    when (pagerState.currentPage) {
+                HorizontalPager(pageCount = 1, state = pagerState) { page ->
+                    when (page) {
                         0 -> UserFeedView(feedViewModel, accountViewModel, navController)
                     }
                 }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HomeScreen.kt

@@ -33,6 +33,7 @@ import com.vitorpamplona.amethyst.ui.dal.HomeNewThreadFeedFilter
 import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.note.UpdateZapAmountDialog
 import com.vitorpamplona.amethyst.ui.screen.FeedView
+import com.vitorpamplona.amethyst.ui.screen.FeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.NostrHomeRepliesFeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.ScrollStateKeys
@@ -50,12 +51,12 @@ fun HomeScreen(
     nip47: String? = null
 ) {
     val coroutineScope = rememberCoroutineScope()
-    val account = accountViewModel.accountLiveData.value?.account ?: return
     var wantsToAddNip47 by remember { mutableStateOf(nip47) }
 
-    val accountState = account.live.observeAsState()
+    val accountState by accountViewModel.accountLiveData.observeAsState()
+    val account = accountState?.account ?: return
 
-    LaunchedEffect(accountViewModel, accountState.value?.account?.defaultHomeFollowList) {
+    LaunchedEffect(accountViewModel, account.defaultHomeFollowList) {
         HomeNewThreadFeedFilter.account = account
         HomeConversationsFeedFilter.account = account
         NostrHomeDataSource.resetFilters()
@@ -85,6 +86,15 @@ fun HomeScreen(
         }
     }
 
+    val tabs by remember(homeFeedViewModel, repliesFeedViewModel) {
+        mutableStateOf(
+            listOf(
+                TabItem(R.string.new_threads, homeFeedViewModel, Route.Home.base + "Follows", ScrollStateKeys.HOME_FOLLOWS),
+                TabItem(R.string.conversations, repliesFeedViewModel, Route.Home.base + "FollowsReplies", ScrollStateKeys.HOME_REPLIES)
+            )
+        )
+    }
+
     Column(Modifier.fillMaxHeight()) {
         Column(
             modifier = Modifier.padding(vertical = 0.dp)
@@ -93,28 +103,31 @@ fun HomeScreen(
                 backgroundColor = MaterialTheme.colors.background,
                 selectedTabIndex = pagerState.currentPage
             ) {
-                Tab(
-                    selected = pagerState.currentPage == 0,
-                    onClick = { coroutineScope.launch { pagerState.animateScrollToPage(0) } },
-                    text = {
-                        Text(text = stringResource(R.string.new_threads))
-                    }
-                )
-
-                Tab(
-                    selected = pagerState.currentPage == 1,
-                    onClick = { coroutineScope.launch { pagerState.animateScrollToPage(1) } },
-                    text = {
-                        Text(text = stringResource(R.string.conversations))
-                    }
-                )
-            }
-            HorizontalPager(pageCount = 2, state = pagerState) {
-                when (pagerState.currentPage) {
-                    0 -> FeedView(homeFeedViewModel, accountViewModel, navController, Route.Home.base + "Follows", ScrollStateKeys.HOME_FOLLOWS, scrollToTop)
-                    1 -> FeedView(repliesFeedViewModel, accountViewModel, navController, Route.Home.base + "FollowsReplies", ScrollStateKeys.HOME_REPLIES, scrollToTop)
+                tabs.forEachIndexed { index, tab ->
+                    Tab(
+                        selected = pagerState.currentPage == index,
+                        text = {
+                            Text(text = stringResource(tab.resource))
+                        },
+                        onClick = {
+                            coroutineScope.launch { pagerState.animateScrollToPage(index) }
+                        }
+                    )
                 }
             }
+
+            HorizontalPager(pageCount = 2, state = pagerState) { page ->
+                FeedView(
+                    viewModel = tabs[page].viewModel,
+                    accountViewModel = accountViewModel,
+                    navController = navController,
+                    routeForLastRead = tabs[page].routeForLastRead,
+                    scrollStateKey = tabs[page].scrollStateKey,
+                    scrollToTop = scrollToTop
+                )
+            }
         }
     }
 }
+
+class TabItem(val resource: Int, val viewModel: FeedViewModel, val routeForLastRead: String, val scrollStateKey: String)

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/MainScreen.kt

@@ -41,7 +41,7 @@ import kotlinx.coroutines.launch
 @OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: AccountStateViewModel, startingPage: String? = null) {
-    val coroutineScope = rememberCoroutineScope()
+    val scope = rememberCoroutineScope()
     val navController = rememberNavController()
     val scaffoldState = rememberScaffoldState(rememberDrawerState(DrawerValue.Closed))
     val sheetState = rememberModalBottomSheetState(
@@ -69,7 +69,7 @@ fun MainScreen(accountViewModel: AccountViewModel, accountStateViewModel: Accoun
             drawerContent = {
                 DrawerContent(navController, scaffoldState, sheetState, accountViewModel)
                 BackHandler(enabled = scaffoldState.drawerState.isOpen) {
-                    coroutineScope.launch { scaffoldState.drawerState.close() }
+                    scope.launch { scaffoldState.drawerState.close() }
                 }
             },
             floatingActionButton = {

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/NotificationScreen.kt

@@ -14,6 +14,7 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.navigation.NavController
+import com.vitorpamplona.amethyst.service.NostrAccountDataSource
 import com.vitorpamplona.amethyst.ui.dal.NotificationFeedFilter
 import com.vitorpamplona.amethyst.ui.navigation.Route
 import com.vitorpamplona.amethyst.ui.screen.CardFeedView
@@ -34,9 +35,11 @@ fun NotificationScreen(
         notifFeedViewModel.clear()
     }
 
-    LaunchedEffect(accountViewModel) {
+    LaunchedEffect(account.userProfile().pubkeyHex, account.defaultNotificationFollowList) {
+        NostrAccountDataSource.resetFilters()
         NotificationFeedFilter.account = account
-        notifFeedViewModel.invalidateData()
+        notifFeedViewModel.clear()
+        notifFeedViewModel.refresh()
     }
 
     val lifeCycleOwner = LocalLifecycleOwner.current

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/ProfileScreen.kt

@@ -288,8 +288,8 @@ fun ProfileScreen(user: User, accountViewModel: AccountViewModel, navController:
                         modifier = with(LocalDensity.current) {
                             Modifier.height((columnSize.height - tabsSize.height).toDp())
                         }
-                    ) {
-                        when (pagerState.currentPage) {
+                    ) { page ->
+                        when (page) {
                             0 -> TabNotesNewThreads(accountViewModel, navController)
                             1 -> TabNotesConversations(accountViewModel, navController)
                             2 -> TabFollows(baseUser, accountViewModel, navController)