Fix delegate events from Compose paywalls

Author: AndroidPoet

superwall-compose/src/main/java/com/superwall/sdk/compose/PaywallComposable.kt

@@ -92,9 +92,6 @@ fun PaywallComposable(
     when {
         viewState.value != null -> {
             viewState.value?.let { viewToRender ->
-                LaunchedEffect(viewToRender) {
-                    viewToRender.onViewCreated()
-                }
                 val themeChanged = rememberThemeChanged()
                 AndroidView(
                     modifier = modifier,
@@ -103,7 +100,8 @@ fun PaywallComposable(
                             it.onThemeChanged()
                         }
                     },
-                    factory = { context ->
+                    factory = {
+                        viewToRender.onViewCreated()
                         viewToRender
                     },
                     onRelease = {

superwall/src/main/java/com/superwall/sdk/analytics/internal/TrackingLogic.kt

@@ -141,7 +141,7 @@ sealed class TrackingLogic {
             input?.let { value ->
                 when (value) {
                     is List<*> -> null
-                    is Map<*, *> -> value
+                    is Map<*, *> -> cleanMap(value)
                     is String -> value
                     is Int, is Float, is Double, is Long, is Boolean -> value
                     is JsonElement -> value.convertFromJsonElement()
@@ -161,6 +161,27 @@ sealed class TrackingLogic {
                 }
             }
 
+        private fun cleanNested(input: Any?): Any? =
+            input?.let { value ->
+                when (value) {
+                    is List<*> -> cleanList(value)
+                    is Map<*, *> -> cleanMap(value)
+                    else -> clean(value)
+                }
+            }
+
+        private fun cleanMap(value: Map<*, *>): Map<String, Any> =
+            value
+                .mapNotNull { (key, nestedValue) ->
+                    val cleanedValue = cleanNested(nestedValue) ?: return@mapNotNull null
+                    key?.toString()?.let { it to cleanedValue }
+                }.toMap()
+
+        private fun cleanList(value: List<*>): List<Any>? {
+            val cleanedValues = value.mapNotNull { cleanNested(it) }
+            return cleanedValues.ifEmpty { null }
+        }
+
         @Throws(Exception::class)
         fun checkNotSuperwallEvent(event: String) {
             // Try to create a SuperwallEvents event from the event string

superwall/src/test/java/com/superwall/sdk/analytics/internal/TrackingLogicTest.kt

@@ -76,6 +76,43 @@ class TrackingLogicTest {
             assertEquals("https://example.com", parameters.delegateParams["uri_value"])
         }
 
+    @Test
+    fun processParameters_recursivelyCleansNestedMaps() =
+        runBlocking {
+            val trackable =
+                TrackableTestUtils.fakeTrackable(
+                    rawName = "event_a",
+                    superwallParams =
+                        mapOf(
+                            "customer_info" to
+                                mapOf(
+                                    "userId" to "user-123",
+                                    "subscriptions" to
+                                        listOf(
+                                            mapOf(
+                                                "productId" to "pro_monthly",
+                                                "unsupported" to Any(),
+                                                "nullValue" to null,
+                                            ),
+                                        ),
+                                    "unsupported" to Any(),
+                                ),
+                        ),
+                    canImplicitlyTrigger = false,
+                )
+
+            val parameters = TrackingLogic.processParameters(trackable, appSessionId = "session-123")
+
+            val customerInfo = parameters.delegateParams["customer_info"] as Map<*, *>
+            val subscriptions = customerInfo["subscriptions"] as List<*>
+            val subscription = subscriptions.first() as Map<*, *>
+            assertEquals("user-123", customerInfo["userId"])
+            assertEquals("pro_monthly", subscription["productId"])
+            assertFalse(subscription.containsKey("unsupported"))
+            assertFalse(subscription.containsKey("nullValue"))
+            assertFalse(customerInfo.containsKey("unsupported"))
+        }
+
     @Test
     fun isNotDisabledVerboseEvent_handlesVariousEventTypes() {
         val paywallInfo = PaywallInfo.empty()