mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-11-10 20:06:37 +01:00
Merge
This commit is contained in:
@@ -413,7 +413,12 @@ fun observeUserIsFollowing(
|
||||
UserFinderFilterAssemblerSubscription(user1, accountViewModel)
|
||||
val isUserInFollowSets =
|
||||
remember(accountViewModel.account.followSetsState) {
|
||||
// Only check follow sets if user1 is the logged-in user
|
||||
if (user1 == accountViewModel.account.userProfile()) {
|
||||
accountViewModel.account.followSetsState.isUserInFollowSets(user2)
|
||||
} else {
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
// Subscribe in the LocalCache for changes that arrive in the device
|
||||
|
||||
@@ -35,7 +35,7 @@ class DecryptZapRequest {
|
||||
): Intent {
|
||||
val intent = Intent(Intent.ACTION_VIEW, "nostrsigner:${event.toJson()}".toUri())
|
||||
intent.`package` = packageName
|
||||
intent.putExtra("type", CommandType.NIP44_DECRYPT.code)
|
||||
intent.putExtra("type", CommandType.DECRYPT_ZAP_EVENT.code)
|
||||
intent.putExtra("current_user", loggedInUser)
|
||||
return intent
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user