diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/relays/JsonFilter.kt b/app/src/main/java/com/greenart7c3/nostrsigner/relays/JsonFilter.kt
index f1e6b3f1..435e5945 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/relays/JsonFilter.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/relays/JsonFilter.kt
@@ -20,6 +20,7 @@
  */
 package com.greenart7c3.nostrsigner.relays
 
+import com.fasterxml.jackson.databind.JsonNode
 import com.vitorpamplona.quartz.events.Event
 
 class JsonFilter(
@@ -37,26 +38,26 @@ class JsonFilter(
         val filter =
             factory.objectNode().apply {
                 ids?.run {
-                    put(
+                    set<JsonNode>(
                         "ids",
                         factory.arrayNode(ids.size).apply { ids.forEach { add(it) } },
                     )
                 }
                 authors?.run {
-                    put(
+                    set<JsonNode>(
                         "authors",
                         factory.arrayNode(authors.size).apply { authors.forEach { add(it) } },
                     )
                 }
                 kinds?.run {
-                    put(
+                    set<JsonNode>(
                         "kinds",
                         factory.arrayNode(kinds.size).apply { kinds.forEach { add(it) } },
                     )
                 }
                 tags?.run {
                     entries.forEach { kv ->
-                        put(
+                        set<JsonNode>(
                             "#${kv.key}",
                             factory.arrayNode(kv.value.size).apply { kv.value.forEach { add(it) } },
                         )
@@ -74,7 +75,7 @@ class JsonFilter(
                             entries.forEach { sincePairs ->
                                 jsonObjectSince.put(sincePairs.key, "${sincePairs.value}")
                             }
-                            put("since", jsonObjectSince)
+                            set<JsonNode>("since", jsonObjectSince)
                         }
                     }
                 }
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/relays/Subscription.kt b/app/src/main/java/com/greenart7c3/nostrsigner/relays/Subscription.kt
index 94960997..5a6fe61a 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/relays/Subscription.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/relays/Subscription.kt
@@ -47,7 +47,7 @@ data class Subscription(
         return factory.objectNode().apply {
             put("id", id)
             typedFilters?.also { filters ->
-                put(
+                set<JsonNode>(
                     "typedFilters",
                     factory.arrayNode(filters.size).apply {
                         filters.forEach { filter -> add(filter.toJsonObject()) }
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt
index ec6e8af6..402760f8 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/EventNotificationConsumer.kt
@@ -48,7 +48,6 @@ import com.vitorpamplona.quartz.events.GiftWrapEvent
 import com.vitorpamplona.quartz.events.SealedGossipEvent
 
 class EventNotificationConsumer(private val applicationContext: Context) {
-    private val groupKey = "com.greenart7c3.nostrsigner.DM_NOTIFICATION"
 
     fun consume(event: Event) {
         if (!notificationManager().areNotificationsEnabled()) return
@@ -251,7 +250,6 @@ class EventNotificationConsumer(private val applicationContext: Context) {
                             "Bunker",
                             "nostrsigner:",
                             "BunkerID",
-                            groupKey,
                             applicationContext,
                             bunkerRequest,
                         )
@@ -285,7 +283,6 @@ class EventNotificationConsumer(private val applicationContext: Context) {
                                 "Bunker",
                                 "nostrsigner:",
                                 "BunkerID",
-                                groupKey,
                                 applicationContext,
                                 bunkerRequest,
                             )
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationUtils.kt b/app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationUtils.kt
index f760d3a0..c07d6e19 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationUtils.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/service/NotificationUtils.kt
@@ -66,7 +66,6 @@ object NotificationUtils {
         messageTitle: String,
         uri: String,
         channelId: String,
-        notificationGroupKey: String,
         applicationContext: Context,
         bunkerRequest: BunkerRequest,
     ) {
@@ -77,7 +76,6 @@ object NotificationUtils {
             picture = null,
             uri = uri,
             channelId,
-            notificationGroupKey,
             applicationContext = applicationContext,
             bunkerRequest,
         )
@@ -90,7 +88,6 @@ object NotificationUtils {
         picture: BitmapDrawable?,
         uri: String,
         channelId: String,
-        notificationGroupKey: String,
         applicationContext: Context,
         bunkerRequest: BunkerRequest,
     ) {
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountStateViewModel.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountStateViewModel.kt
index 9d631697..869310bc 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountStateViewModel.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/AccountStateViewModel.kt
@@ -22,7 +22,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 
 @Immutable
-open class ToastMsg()
+open class ToastMsg
 
 @Immutable
 class StringToastMsg(val title: String, val msg: String) : ToastMsg()
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/ConnectOrbotDialog.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/ConnectOrbotDialog.kt
index 78d64374..3e2bdfbb 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/ConnectOrbotDialog.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/actions/ConnectOrbotDialog.kt
@@ -161,9 +161,9 @@ fun ConnectOrbotDialog(
 
 @Composable
 fun UseOrbotButton(
+    modifier: Modifier = Modifier,
     onPost: () -> Unit = {},
     isActive: Boolean,
-    modifier: Modifier = Modifier,
 ) {
     Button(
         modifier = modifier,
diff --git a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/TextSpinner.kt b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/TextSpinner.kt
index 0766e0be..c29c5d8b 100644
--- a/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/TextSpinner.kt
+++ b/app/src/main/java/com/greenart7c3/nostrsigner/ui/components/TextSpinner.kt
@@ -69,13 +69,13 @@ fun TextSpinner(
         options,
         onSelect,
         modifier,
-    ) { currentOption, modifier ->
+    ) { currentOption, mainModifier ->
         OutlinedTextField(
             value = currentOption,
             onValueChange = {},
             readOnly = true,
             label = { label?.let { Text(it) } },
-            modifier = modifier,
+            modifier = mainModifier,
         )
     }
 }
diff --git a/app/src/offline/java/com/greenart7c3/nostrsigner/service/PushNotificationUtils.kt b/app/src/offline/java/com/greenart7c3/nostrsigner/service/PushNotificationUtils.kt
index 1f07ef63..ca5144c9 100644
--- a/app/src/offline/java/com/greenart7c3/nostrsigner/service/PushNotificationUtils.kt
+++ b/app/src/offline/java/com/greenart7c3/nostrsigner/service/PushNotificationUtils.kt
@@ -26,7 +26,7 @@ import kotlinx.coroutines.Dispatchers
 object PushNotificationUtils {
     var hasInit: Boolean = false
 
-    suspend fun init(accounts: List<AccountInfo>) =
+    suspend fun init(@Suppress("UNUSED_PARAMETER") accounts: List<AccountInfo>) =
         with(Dispatchers.IO) {
             return@with
         }
diff --git a/app/src/play/java/com/greenart7c3/nostrsigner/service/Notifications.kt b/app/src/play/java/com/greenart7c3/nostrsigner/service/Notifications.kt
index e0d625a8..81504cdb 100644
--- a/app/src/play/java/com/greenart7c3/nostrsigner/service/Notifications.kt
+++ b/app/src/play/java/com/greenart7c3/nostrsigner/service/Notifications.kt
@@ -31,7 +31,7 @@ class Notifications : FirebaseMessagingService() {
 
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
         scope.launch(Dispatchers.IO) {
-            val (value, elapsed) =
+            val (_, elapsed) =
                 measureTimedValue { parseMessage(remoteMessage.data)?.let { receiveIfNew(it) } }
             Log.d("Time", "Notification processed in $elapsed")
         }