react-native-netmera 2.0.0-beta01 → 2.0.0-beta03

package/README.md

@@ -173,8 +173,8 @@ RNNetmera.initNetmera()
 
    ```
    // For receiving Media Push, you must add Netmera pods to top of your Podfile.
-   pod 'NetmeraNotificationServiceExtension', "4.18.0"
-   pod "NetmeraNotificationContentExtension", "4.18.0"
+   pod 'NetmeraNotificationServiceExtension', "4.19.0"
+   pod "NetmeraNotificationContentExtension", "4.19.0"
    ```
 
 7. In order to use the widget URL callback, add these lines into `AppDelegate.swift` file.

package/RNNetmera.podspec

@@ -19,7 +19,7 @@ NETMERA is a Mobile Application Engagement Platform. We offer a series of develo
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.public_header_files = "ios/RNNetmera.h"
 
-  netmera_version = '4.18.0'
+  netmera_version = '4.19.0'
 
   s.dependency "NetmeraAnalytic", netmera_version
   s.dependency "NetmeraAnalyticAutotracking", netmera_version

package/android/build.gradle

@@ -75,7 +75,7 @@ repositories {
   google()
 }
 
-def netmeraAndroidVersion = '4.14.4'
+def netmeraAndroidVersion = '4.15.1'
 
 def kotlin_version = getExtOrDefault("kotlinVersion")
 

package/android/src/main/java/com/netmera/reactnativesdk/RNNetmeraPushActionCallbacks.kt

@@ -7,7 +7,6 @@ import android.os.Bundle
 import android.util.Log
 import com.facebook.react.HeadlessJsTaskService
 import com.facebook.react.bridge.Arguments
-import com.facebook.react.bridge.ReadableMap
 import com.facebook.react.bridge.WritableMap
 import com.netmera.NetmeraCarouselObject
 import com.netmera.NetmeraPushObject
@@ -28,26 +27,31 @@ class RNNetmeraPushActionCallbacks : NMPushActionCallbacks {
 
   override fun onPushRegister(context: Context, gcmSenderId: String, pushToken: String) {
     val bundle = Bundle().apply {
-      putString("gcmSenderId", gcmSenderId)
       putString("pushToken", pushToken)
     }
     sendEvent(context, ON_PUSH_REGISTER, Arguments.fromBundle(bundle))
   }
 
   override fun onPushReceive(context: Context, bundle: Bundle?, netmeraPushObject: NetmeraPushObject) {
-    sendEvent(context, ON_PUSH_RECEIVE, mergeMap(bundle, netmeraPushObject))
+    sendEvent(context, ON_PUSH_RECEIVE, RNNetmeraUtil.mapPushObject(netmeraPushObject))
   }
 
   override fun onPushOpen(context: Context, bundle: Bundle?, netmeraPushObject: NetmeraPushObject) {
-    sendEvent(context, ON_PUSH_OPEN, mergeMap(bundle, netmeraPushObject))
+    sendEvent(context, ON_PUSH_OPEN, RNNetmeraUtil.mapPushObject(netmeraPushObject))
   }
 
   override fun onPushDismiss(context: Context, bundle: Bundle?, netmeraPushObject: NetmeraPushObject) {
-    sendEvent(context, ON_PUSH_DISMISS, mergeMap(bundle, netmeraPushObject))
+    sendEvent(context, ON_PUSH_DISMISS, RNNetmeraUtil.mapPushObject(netmeraPushObject))
   }
 
   override fun onPushButtonClicked(context: Context, bundle: Bundle?, netmeraPushObject: NetmeraPushObject) {
-    sendEvent(context, ON_PUSH_BUTTON_CLICKED, mergeMap(bundle, netmeraPushObject))
+    val map = RNNetmeraUtil.mapPushObject(netmeraPushObject)
+    val clickedIndex = bundle?.getInt("key.clicked.button.index", -1) ?: -1
+    val actions = netmeraPushObject.interactiveActions
+    if (clickedIndex >= 0 && actions != null && clickedIndex < actions.size) {
+      map.putMap("clickedAction", RNNetmeraUtil.mapInteractiveAction(actions[clickedIndex]))
+    }
+    sendEvent(context, ON_PUSH_BUTTON_CLICKED, map)
   }
 
   override fun onCarouselObjectSelected(
@@ -57,10 +61,9 @@ class RNNetmeraPushActionCallbacks : NMPushActionCallbacks {
     selectedIndex: Int,
     netmeraCarouselObject: NetmeraCarouselObject
   ) {
-    val newBundle = bundle ?: Bundle()
-    newBundle.putInt("selectedIndex", selectedIndex)
-    val map = RNNetmeraUtil.mapCarouselObject(netmeraCarouselObject)
-    map.merge(mergeMap(newBundle, netmeraPushObject))
+    val map = RNNetmeraUtil.mapPushObject(netmeraPushObject)
+    val carouselMap = RNNetmeraUtil.mapCarouselObject(netmeraCarouselObject)
+    map.putMap("carouselItem", carouselMap)
     sendEvent(context, ON_CAROUSEL_OBJECT_SELECTED, map)
   }
 
@@ -79,11 +82,4 @@ class RNNetmeraPushActionCallbacks : NMPushActionCallbacks {
     }
   }
 
-  private fun mergeMap(bundle: Bundle?, netmeraPushObject: NetmeraPushObject): WritableMap {
-    val mapPushObject = RNNetmeraUtil.mapPushObject(netmeraPushObject)
-    val mapBundle: ReadableMap? = bundle?.let { Arguments.fromBundle(it) }
-    mapBundle?.let { mapPushObject.merge(it) }
-    return mapPushObject
-  }
-
 }

package/android/src/main/java/com/netmera/reactnativesdk/RNNetmeraUtil.kt

@@ -2,8 +2,9 @@ package com.netmera.reactnativesdk
 
 import android.text.format.DateFormat
 import com.facebook.react.bridge.*
-import com.google.gson.Gson
+import com.google.gson.JsonObject
 import com.netmera.NetmeraCarouselObject
+import com.netmera.NetmeraInteractiveAction
 import com.netmera.NetmeraPushObject
 import com.netmera.data.NMCategoryPreference
 import com.netmera.data.NMCouponDetail
@@ -149,8 +150,12 @@ object RNNetmeraUtil {
       map.putString("expireTime", DateFormat.format("yyyy-MM-dd HH:mm:ss", it).toString())
     }
 
-    pushObject.interactiveActions?.let {
-      if (it.isNotEmpty()) map.putString("interactiveActions", Gson().toJson(it))
+    pushObject.interactiveActions?.let { actions ->
+      if (actions.isNotEmpty()) {
+        val actionsArray = Arguments.createArray()
+        actions.forEach { action -> actionsArray.pushMap(mapInteractiveAction(action)) }
+        map.putArray("interactiveActions", actionsArray)
+      }
     }
 
     pushObject.pushStyle?.let { style ->
@@ -158,7 +163,11 @@ object RNNetmeraUtil {
       style.subText?.let { map.putString("subtitle", it) }
       style.contentText?.let { map.putString("body", it) }
       style.bigPicturePath?.let { map.putString("mediaAttachmentURL", it) }
-      style.retrieveCarouselObjects()?.let { map.putString("carousel", Gson().toJson(it)) }
+      style.carouselObjects?.let { carouselObjects ->
+        val carouselArray = Arguments.createArray()
+        carouselObjects.forEach { item -> carouselArray.pushMap(mapCarouselObject(item)) }
+        map.putArray("carousel", carouselArray)
+      }
     }
 
     pushObject.sendDate?.let {
@@ -166,8 +175,8 @@ object RNNetmeraUtil {
         "sendDate", DateFormat.format("yyyy-MM-dd HH:mm:ss", it).toString()
       )
     }
-    pushObject.pushAction?.let {
-      map.putString("pushAction", Gson().toJson(it))
+    pushObject.pushAction?.let { pushAction ->
+      map.putMap("pushAction", mapPushAction(pushAction))
       pushObject.webPageUrl?.let { url -> map.putString("webPage", url) }
     }
 
@@ -177,8 +186,30 @@ object RNNetmeraUtil {
   fun mapCarouselObject(carouselObject: NetmeraCarouselObject): WritableMap {
     val map: WritableMap = Arguments.createMap()
     map.putString("id", carouselObject.id)
-    map.putString("action", Gson().toJson(carouselObject.action))
-    map.putString("picturePath", carouselObject.picturePath)
+    carouselObject.picturePath?.let { map.putString("picturePath", it) }
+    carouselObject.action?.let { map.putMap("action", mapPushAction(it)) }
+    return map
+  }
+
+  fun mapInteractiveAction(action: NetmeraInteractiveAction): WritableMap {
+    val map: WritableMap = Arguments.createMap()
+    map.putString("id", action.id)
+    action.actionTitle?.let { map.putString("title", it) }
+    action.action?.let { map.putMap("act", mapPushAction(it)) }
+    action.customJson?.let {
+      try {
+        map.putMap("prms", jsonToWritableMap(JSONObject(it.toString())))
+      } catch (_: Throwable) {
+      }
+    }
+    return map
+  }
+
+private fun mapPushAction(pushAction: JsonObject): WritableMap {
+    val map: WritableMap = Arguments.createMap()
+    pushAction.get("at")?.asInt?.let { map.putInt("at", it) }
+    val url = pushAction.get("uri")?.asString ?: pushAction.get("url")?.asString
+    url?.let { map.putString("url", it) }
     return map
   }
 

package/ios/RNNetmera.swift

@@ -212,23 +212,22 @@ public class RNNetmera: NSObject {
   func sendEvent(_ eventDictionary: [String: Any]) {
     var dict = eventDictionary.compactMapValues { $0 is NSNull ? nil : $0 }
     
-    if let eventKey = dict["code"] as? String,
-       let event = RNNetmeraEvent(eventKey: eventKey) {
-      
-      dict.removeValue(forKey: "code")
-      
-      if let revenue = dict["revenue"] as? Double {
-        event.revenue = revenue
-        dict.removeValue(forKey: "revenue")
-      }
-      
-      let converted: [String: AnyCodable] = dict.reduce(into: [:]) { result, pair in
-        result[pair.key] = AnyCodable(pair.value)
-      }
-      
-      event.eventParameters = converted
-      Netmera.send(event)
+    guard let eventKey = dict["code"] as? String,
+          let event = RNNetmeraEvent(eventKey: eventKey) else { return }
+
+    dict.removeValue(forKey: "code")
+
+    if let revenue = dict["revenue"] as? Double {
+      event.revenue = revenue
+      dict.removeValue(forKey: "revenue")
     }
+
+    let converted: [String: AnyCodable] = dict.reduce(into: [:]) { result, pair in
+      result[pair.key] = AnyCodable(pair.value)
+    }
+
+    event.eventParameters = converted
+    Netmera.send(event)
   }
   
   @objc(sendGenericEvent:attributes:)
@@ -467,9 +466,7 @@ public class RNNetmera: NSObject {
     manager.inbox { result in
       switch result {
       case .success:
-        let array: [[String: Any]] = manager.objects.map {
-          RNNetmeraPushObject.getPushObjectMap($0)
-        }
+        let array = RNNetmeraPushObject.mapPushObjects(manager.objects)
         resolver(array)
         self.netmeraInbox = manager
         break
@@ -533,7 +530,9 @@ public class RNNetmera: NSObject {
     }
 
     let length = toIndex - fromIndex
-    guard length > 0, fromIndex >= 0, toIndex <= inbox.objects.count else {
+    guard length > 0,
+          fromIndex >= 0,
+          toIndex <= inbox.objects.count else {
       rejecter(ERROR_CODE_UPDATE_STATUS,
                ERROR_MESSAGE_UPDATE_STATUS,
                nil)
@@ -584,26 +583,26 @@ public class RNNetmera: NSObject {
     manager.inboxCategory { result in
       switch result {
       case .success(let isSuccess):
-        if isSuccess {
-          self.categoryManager = manager
-          resolver(manager.categories.map { categoryObject in
-              var data: [String: Any] = [:]
-              data["categoryName"] = categoryObject.categoryName
-              data["readCount"] = categoryObject.statusCounts[.read] ?? 0
-              data["unreadCount"] = categoryObject.statusCounts[.unread] ?? 0
-              data["deletedCount"] = categoryObject.statusCounts[.deleted] ?? 0
-              if let lastMessage = categoryObject.lastMessage {
-                  let lastMsg = RNNetmeraPushObject.getPushObjectMap(lastMessage)
-                  if let jsonData = try? JSONSerialization.data(withJSONObject: lastMsg, options: []),
-                     let jsonStr = String(data: jsonData, encoding: .utf8) {
-                      data["lastMessage"] = jsonStr
-                  }
-              }
-              return data
-          })
-        } else {
+        guard isSuccess else {
           rejecter(ERROR_CODE_NULL_CATEGORY, ERROR_MESSAGE_NULL_CATEGORY, nil)
+          return
         }
+        self.categoryManager = manager
+        resolver(manager.categories.map { categoryObject in
+            var data: [String: Any] = [:]
+            data["categoryName"] = categoryObject.categoryName
+            data["readCount"] = categoryObject.statusCounts[.read] ?? 0
+            data["unreadCount"] = categoryObject.statusCounts[.unread] ?? 0
+            data["deletedCount"] = categoryObject.statusCounts[.deleted] ?? 0
+            if let lastMessage = categoryObject.lastMessage {
+                let lastMsg = RNNetmeraPushObject.mapPushObject(lastMessage)
+                if let jsonData = try? JSONSerialization.data(withJSONObject: lastMsg, options: []),
+                   let jsonStr = String(data: jsonData, encoding: .utf8) {
+                    data["lastMessage"] = jsonStr
+                }
+            }
+            return data
+        })
       case .failure(let error):
         rejecter(
           ERROR_CODE_NULL_CATEGORY,
@@ -625,25 +624,25 @@ public class RNNetmera: NSObject {
     category.nextPage { status in
       switch status {
       case .success(let isSuccess):
-        if isSuccess {
-          resolve(category.categories.map { categoryObject in
-              var data: [String: Any] = [:]
-              data["categoryName"] = categoryObject.categoryName
-              data["readCount"] = categoryObject.statusCounts[.read] ?? 0
-              data["unreadCount"] = categoryObject.statusCounts[.unread] ?? 0
-              data["deletedCount"] = categoryObject.statusCounts[.deleted] ?? 0
-              if let lastMessage = categoryObject.lastMessage {
-                  let lastMsg = RNNetmeraPushObject.getPushObjectMap(lastMessage)
-                  if let jsonData = try? JSONSerialization.data(withJSONObject: lastMsg, options: []),
-                     let jsonStr = String(data: jsonData, encoding: .utf8) {
-                      data["lastMessage"] = jsonStr
-                  }
-              }
-              return data
-          })
-        } else {
+        guard isSuccess else {
           reject(ERROR_CODE_NULL_CATEGORY, ERROR_MESSAGE_NULL_CATEGORY, nil)
+          return
         }
+        resolve(category.categories.map { categoryObject in
+            var data: [String: Any] = [:]
+            data["categoryName"] = categoryObject.categoryName
+            data["readCount"] = categoryObject.statusCounts[.read] ?? 0
+            data["unreadCount"] = categoryObject.statusCounts[.unread] ?? 0
+            data["deletedCount"] = categoryObject.statusCounts[.deleted] ?? 0
+            if let lastMessage = categoryObject.lastMessage {
+                let lastMsg = RNNetmeraPushObject.mapPushObject(lastMessage)
+                if let jsonData = try? JSONSerialization.data(withJSONObject: lastMsg, options: []),
+                   let jsonStr = String(data: jsonData, encoding: .utf8) {
+                    data["lastMessage"] = jsonStr
+                }
+            }
+            return data
+        })
       case .failure(let error):
         reject(ERROR_CODE_NULL_CATEGORY,
                "There was a problem fetching next category page: \(error.localizedDescription)",

package/ios/RNNetmeraPushLifecycleDelegate.swift

@@ -14,40 +14,36 @@ final class RNNetmeraPushLifecycleDelegate: NetmeraPushLifecycleDelegate {
   }
 
   func didReceive(_ push: NetmeraBasePush) {
-    guard let payload = RNNetmeraPushObject.getBasePushObjectMap(push) else { return }
-    RNNetmeraRCTEventEmitter.onPushReceive(["payload": payload])
+    RNNetmeraRCTEventEmitter.onPushReceive(RNNetmeraPushObject.getPushObjectMap(push))
   }
 
   func didOpen(_ push: NetmeraBasePush) {
     if let deeplink = push.deeplinkURL {
       RNNetmeraRCTEventEmitter.onDeeplinkTriggered(deeplink)
     }
-    guard let payload = RNNetmeraPushObject.getBasePushObjectMap(push) else { return }
-    RNNetmeraRCTEventEmitter.onPushOpen(["payload": payload])
+    RNNetmeraRCTEventEmitter.onPushOpen(RNNetmeraPushObject.getPushObjectMap(push))
   }
   
   func didTakeAction(_ action: NetmeraBaseAction?, from source: NetmeraActionSource, for push: NetmeraBasePush) {
     if let deeplink = action?.deeplinkURL {
-        RNNetmeraRCTEventEmitter.onDeeplinkTriggered(deeplink)
-    }
-    
-    guard let payload = RNNetmeraPushObject.getBasePushObjectMap(push),
-          let actionMap = RNNetmeraPushObject.getActionMap(action) else {
-        return
+      RNNetmeraRCTEventEmitter.onDeeplinkTriggered(deeplink)
     }
-    
-    let eventData: [String: Any] = [
-        "payload": payload,
-        "action": actionMap
-    ]
+
+    var eventData = RNNetmeraPushObject.getPushObjectMap(push)
     
     switch source {
     case .interactiveButton:
-        RNNetmeraRCTEventEmitter.onPushButtonClicked(eventData)
+      if let actionMap = RNNetmeraPushObject.getInteractiveActionMap(action) {
+        eventData["clickedAction"] = actionMap
+      }
+      RNNetmeraRCTEventEmitter.onPushButtonClicked(eventData)
     case .carouselItem:
-        RNNetmeraRCTEventEmitter.onCarouselItemClicked(eventData)
+      if let content = action as? NetmeraContentPushItem {
+        eventData["carouselItem"] = RNNetmeraPushObject.getCarouselItemMap(content)
+      }
+      RNNetmeraRCTEventEmitter.onCarouselItemClicked(eventData)
     @unknown default:
-        break
+      break
     }
   }
 }

package/ios/RNNetmeraPushObject.swift

@@ -16,114 +16,103 @@ import NetmeraNotificationCore
 class RNNetmeraPushObject {
 
   static func mapPushObjects(_ pushObjects: [NetmeraInboxPush]) -> [[String: Any]] {
-    return pushObjects.map { getPushObjectMap($0) }
+    return pushObjects.map { mapPushObject($0) }
+  }
+  
+  static func mapPushObject(_ push: NetmeraInboxPush) -> [String: Any] {
+    guard let payload = push.payload else { return [:] }
+    
+    var data = getPushObjectMap(payload)
+    if let status = push.status { data["inboxStatus"] = status.rawValue }
+    
+    return data
   }
 
-  static func getPushObjectMap(_ pushObject: NetmeraInboxPush) -> [String: Any] {
+  static func getPushObjectMap(_ push: NetmeraBasePush?) -> [String: Any] {
     var data: [String: Any] = [:]
-
-    let push = pushObject.payload
-    data["pushType"] = push?.pushType.rawValue ?? 0
-    data["pushId"] = push?.pushId ?? ""
-    data["pushInstanceId"] = push?.pushInstanceId ?? ""
-    data["inboxStatus"] = pushObject.status?.rawValue
-    data["category"] = push?.category ?? ""
-    data["customJson"] = push?.params ?? [:]
-    data["mediaAttachmentURL"] = push?.mediaAttachmentURL ?? ""
-    data["externalId"] = push?.externalId ?? ""
-
-    if let carousel = push?.carousel {
-      data["carousel"] = carousel.map { item in
-        var itemMap: [String: Any?] = [:]
-        itemMap["id"] = item.id
-        itemMap["bpp"] = item.url?.absoluteString
-        itemMap["ctitle"] = item.title
-        itemMap["ctext"] = item.subtitle
-
-        if let action = item.action {
-          itemMap["action"] = mapAction(action)
-        }
-
-        return itemMap
+    guard let push else { return data }
+
+    // MARK: NetmeraBasePush fields
+    data["pushType"] = push.pushType.rawValue
+    if let pushId = push.pushId { data["pushId"] = pushId }
+    if let pushInstanceId = push.pushInstanceId { data["pushInstanceId"] = pushInstanceId }
+    if let category = push.category { data["category"] = category }
+    if let customJson = push.params { data["customJson"] = customJson }
+    if let externalId = push.externalId { data["externalId"] = externalId }
+    if let categories = push.categoryIds { data["categories"] = categories }
+    if let sd = push.sendDate { data["sendDate"] = formatDate(sd) }
+    if let ed = push.expirationDate { data["expireTime"] = formatDate(ed) }
+    
+    if let action = push.action {
+      data["pushAction"] = mapPushAction(action)
+      if let dl = (action as? NetmeraDeeplinkAction)?.deeplinkURL {
+        data["deepLink"] = dl
+      } else if let url = (action as? NetmeraWebViewAction)?.url {
+        data["webPage"] = url
       }
     }
-
-    if let categories = push?.categoryIds {
-      data["categories"] = categories
-    }
-
-    let alert = pushObject.alert
-    data["title"] = alert?.title ?? ""
-    data["subtitle"] = alert?.subtitle ?? ""
-    data["body"] = alert?.body ?? ""
-
-    if let expireDate = push?.expirationDate {
-      data["expireTime"] = formatDate(expireDate)
+    
+    // MARK: NetmeraStandartPush fields
+    if let standartPush = push as? NetmeraStandartPush,
+       let alert = standartPush.aps?.alert {
+      if let title = alert.title { data["title"] = title }
+      if let subtitle = alert.subtitle { data["subtitle"] = subtitle }
+      if let body = alert.body { data["body"] = body }
     }
-
-    if let action = push?.action {
-      let mappedAction = mapAction(action)
-      data["pushAction"] = mappedAction
-
-      if (action.actionType == .openDeeplink) {
-        if let a = action as? NetmeraDeeplinkAction {
-          data["action_deeplink_url"] = a.deeplinkURL
-        }
-      } else if (action.actionType == .showWebView) {
-        if let a = action as? NetmeraWebViewAction {
-          data["action_webpage_url"] = a.url
+    
+    // MARK: NetmeraInboxPush.Payload fields
+    if let inboxPush = push as? NetmeraInboxPush.Payload {
+      if let url = inboxPush.mediaAttachmentURL { data["mediaAttachmentURL"] = url }
+      
+      if let carousel = inboxPush.carousel {
+        data["carousel"] = carousel.map { item -> [String: Any] in
+          var itemMap: [String: Any] = [:]
+          itemMap["id"] = item.id
+          itemMap["picturePath"] = item.url?.absoluteString
+          if let action = item.action { itemMap["action"] = mapPushAction(action) }
+          return itemMap
         }
       }
-    }
-
-    if let actions = push?.interactiveAction {
-      let mapped = actions.map { actionItem -> [String: Any] in
-        var dict: [String: Any] = [:]
-        dict["id"] = actionItem.id ?? ""
-        dict["text"] = actionItem.title ?? ""
-        if let act = actionItem.action {
-          dict["act"] = mapAction(act)
+      
+      if let ia = inboxPush.interactiveAction {
+        let mapped = ia.map { actionItem -> [String: Any] in
+          var dict: [String: Any] = [:]
+          if let id = actionItem.id { dict["id"] = id }
+          if let title = actionItem.title { dict["title"] = title }
+          if let act = actionItem.action { dict["act"] = mapPushAction(act) }
+          dict["prms"] = actionItem.params ?? [:]
+          return dict
+        }
+        if let jsonData = try? JSONSerialization.data(withJSONObject: mapped, options: []) {
+          data["interactiveActions"] = String(data: jsonData, encoding: .utf8)
         }
-        dict["prms"] = actionItem.params ?? [:]
-        return dict
-      }
-
-      if let jsonData = try? JSONSerialization.data(withJSONObject: mapped, options: []) {
-        data["interactiveActions"] = String(data: jsonData, encoding: .utf8)
       }
     }
 
-    if let sendDate = push?.sendDate {
-      data["sendDate"] = formatDate(sendDate)
-    }
-
     return data
   }
 
-  static func getBasePushObjectMap(_ push: NetmeraBasePush) -> [String: Any]? {
-    guard
-      let data = try? JSONEncoder().encode(push),
-      let dict = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
-    else {
-      return nil
-    }
-
+  static func getCarouselItemMap(_ item: NetmeraContentPushItem) -> [String: Any] {
+    var dict: [String: Any] = [:]
+    if let id = item.id { dict["id"] = id }
+    if let url = item.url { dict["picturePath"] = url.absoluteString }
+    if let action = item.action { dict["action"] = mapPushAction(action) }
     return dict
   }
-  
-  static func getActionMap(_ action: NetmeraBaseAction?) -> [String: Any]? {
-    guard
-      let action,
-      let data = try? JSONEncoder().encode(action),
-      let dict = try? JSONSerialization.jsonObject(with: data) as? [String: Any]
-    else {
-      return nil
-    }
 
+  static func getInteractiveActionMap(_ action: NetmeraBaseAction?) -> [String: Any]? {
+    guard let action else { return nil }
+    var dict: [String: Any] = [:]
+    if let id = action.id { dict["id"] = id }
+    if let prms = action.params { dict["prms"] = prms }
+    if let pushAction = action.action { dict["act"] = mapPushAction(pushAction) }
+    if let ia = action as? NetmeraPushInteractiveAction, let title = ia.title {
+      dict["title"] = title
+    }
     return dict
   }
 
-  private static func mapAction(_ action: NetmeraPushAction) -> [String: Any] {
+  static func mapPushAction(_ action: NetmeraPushAction) -> [String: Any] {
     var dict: [String: Any] = [:]
     dict["at"] = action.actionType?.rawValue
 
@@ -144,7 +133,7 @@ class RNNetmeraPushObject {
     @unknown default:
       break
     }
-    return dict.filter { !($0.value is NSNull) }
+    return dict.compactMapValues { $0 }
   }
 
   private static func formatDate(_ date: Date) -> String {