react-native-firework-sdk 1.0.4 → 1.1.0

package/android/src/main/java/com/fireworksdk/bridge/models/FWLiveStreamMessageDetailsModel.kt

@@ -0,0 +1,11 @@
+package com.fireworksdk.bridge.models
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class FWLiveStreamMessageDetailsModel(
+  val messageId: String? = null,
+  val username: String? = null,
+  val text: String? = null,
+) : Parcelable

package/android/src/main/java/com/fireworksdk/bridge/models/FWVideoFeedConfigModel.kt

@@ -0,0 +1,28 @@
+package com.fireworksdk.bridge.models
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class FWVideoFeedConfigModel(
+  var backgroundColor: String? = null,
+  var cornerRadius: Int? = null,
+  var title: FWTitleModel? = null,
+  var titlePosition: String? = null,
+  var playIcon: FWPlayIconModel? = null,
+  var showAdBadge: Boolean? = null
+) : Parcelable {
+
+  @Parcelize
+  data class FWTitleModel(
+    var hidden: Boolean? = null,
+    var textColor: String? = null,
+    var fontSize: Int? = null,
+  ) : Parcelable
+
+  @Parcelize
+  data class FWPlayIconModel(
+    var hidden: Boolean? = null,
+    var iconWidth: Int? = null,
+  ) : Parcelable
+}

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge}/models/FWVideoFeedItemDetailsModel.kt

@@ -1,4 +1,4 @@
-package com.reactnativefireworksdk.models
+package com.fireworksdk.bridge.models
 
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize
@@ -8,4 +8,5 @@ data class FWVideoFeedItemDetailsModel(
   val index: Int?,
   val id: String?,
   val videoDuration: Int?,
+  val source: String?,
 ) : Parcelable

package/android/src/main/java/com/fireworksdk/bridge/models/FWVideoFeedModel.kt

@@ -0,0 +1,7 @@
+package com.fireworksdk.bridge.models
+
+enum class FWVideoFeedModel(val rawValue: String) {
+  Row("row"),
+  Column("column"),
+  Grid("grid"),
+}

package/android/src/main/java/com/fireworksdk/bridge/models/FWVideoFeedPropsModel.kt

@@ -0,0 +1,18 @@
+package com.fireworksdk.bridge.models
+
+import android.os.Parcelable
+import com.fireworksdk.bridge.models.FWVideoFeedConfigModel
+import com.fireworksdk.bridge.models.FWVideoPlayerConfigModel
+import kotlinx.android.parcel.Parcelize
+
+
+@Parcelize
+data class FWVideoFeedPropsModel(
+    var source: String? = null,
+    var channel: String? = null,
+    var playlist: String? = null,
+    var playlistGroup: String? = null,
+    var mode: String? = null,
+    var videoFeedConfiguration: FWVideoFeedConfigModel? = null,
+    var videoPlayerConfiguration: FWVideoPlayerConfigModel? = null,
+) : Parcelable

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge}/models/FWVideoFeedSource.kt

@@ -1,7 +1,8 @@
-package com.reactnativefireworksdk.models
+package com.fireworksdk.bridge.models
 
 enum class FWVideoFeedSource(val rawValue: String) {
   Discover("discover"),
   Channel("channel"),
   Playlist("playlist"),
+  PlaylistGroup("playlistGroup"),
 }

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge}/models/FWVideoFeedTitlePosition.kt

@@ -1,4 +1,4 @@
-package com.reactnativefireworksdk.models
+package com.fireworksdk.bridge.models
 
 enum class FWVideoFeedTitlePosition(val intValue: Int, val rawValue: String) {
   Nested(1, "nested"),

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge}/models/FWVideoPlaybackDetails.kt

@@ -1,4 +1,4 @@
-package com.reactnativefireworksdk.models
+package com.fireworksdk.bridge.models
 
 import android.os.Parcelable
 import com.fasterxml.jackson.annotation.JsonProperty

package/android/src/main/java/com/fireworksdk/bridge/models/FWVideoPlayerConfigModel.kt

@@ -0,0 +1,23 @@
+package com.fireworksdk.bridge.models
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class FWVideoPlayerConfigModel(
+  var playerStyle: String? = null,
+  var videoCompleteAction: String? = null,
+  var showShareButton: Boolean? = null,
+  var ctaButtonStyle: FWCtaButtonStyleModel? = null,
+  var showMuteButton: Boolean? = null,
+  var showPlaybackButton: Boolean? = null,
+  var launchBehavior: String? = null,
+) : Parcelable {
+
+  @Parcelize
+  data class FWCtaButtonStyleModel(
+    var backgroundColor: String? = null,
+    var fontSize: String? = null,
+    var textColor: String? = null,
+  ) : Parcelable
+}

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge}/models/FWVideoShoppingProduct.kt

@@ -1,4 +1,4 @@
-package com.reactnativefireworksdk.models
+package com.fireworksdk.bridge.models
 
 import android.os.Parcelable
 import kotlinx.android.parcel.Parcelize

package/android/src/main/java/com/fireworksdk/bridge/models/WeakProperty.kt

@@ -0,0 +1,19 @@
+package com.fireworksdk.bridge.models
+
+import java.lang.ref.WeakReference
+import kotlin.properties.ReadWriteProperty
+import kotlin.reflect.KProperty
+
+fun <V> weakProperty(defaultValue: V? = null) = WeakProperty(defaultValue)
+
+class WeakProperty<V>(defaultValue: V? = null) : ReadWriteProperty<Any?, V?> {
+    private var reference: WeakReference<V>? = WeakReference(defaultValue)
+
+    override fun getValue(thisRef: Any?, property: KProperty<*>): V? {
+        return reference?.get()
+    }
+
+    override fun setValue(thisRef: Any?, property: KProperty<*>, value: V?) {
+        reference = if (value != null) WeakReference(value) else null
+    }
+}

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge/reactnative}/FireworkSDKPackage.kt

@@ -1,17 +1,22 @@
-package com.reactnativefireworksdk
+package com.fireworksdk.bridge.reactnative
 
 import com.facebook.react.ReactPackage
 import com.facebook.react.bridge.NativeModule
 import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.uimanager.ViewManager
-import com.reactnativefireworksdk.manager.FWVideoFeedManager
-import com.reactnativefireworksdk.module.FWVideoShoppingModule
-import com.reactnativefireworksdk.module.FireworkSDKModule
+import com.fireworksdk.bridge.reactnative.manager.FWVideoFeedManager
+import com.fireworksdk.bridge.reactnative.module.FWLiveStreamModule
+import com.fireworksdk.bridge.reactnative.module.FWVideoShoppingModule
+import com.fireworksdk.bridge.reactnative.module.FireworkSDKModule
 
 
 class FireworkSDKPackage : ReactPackage {
     override fun createNativeModules(reactContext: ReactApplicationContext): List<NativeModule> {
-        return listOf(FireworkSDKModule(reactContext), FWVideoShoppingModule(reactContext))
+        return listOf(
+          FireworkSDKModule(reactContext),
+          FWVideoShoppingModule(reactContext),
+          FWLiveStreamModule(reactContext)
+        )
     }
 
     override fun createViewManagers(reactContext: ReactApplicationContext): List<ViewManager<*, *>> {

package/android/src/main/java/com/fireworksdk/bridge/reactnative/manager/FWVideoFeedManager.kt

@@ -0,0 +1,175 @@
+package com.fireworksdk.bridge.reactnative.manager
+
+import android.app.Activity
+import com.facebook.react.bridge.ReadableArray
+import com.facebook.react.bridge.ReadableMap
+import com.facebook.react.uimanager.SimpleViewManager
+import com.facebook.react.uimanager.ThemedReactContext
+
+import com.facebook.react.uimanager.annotations.ReactProp
+import com.fireworksdk.bridge.constants.FWCommandConstant
+import com.fireworksdk.bridge.models.FWVideoFeedConfigModel
+import com.fireworksdk.bridge.models.FWVideoPlayerConfigModel
+import com.fireworksdk.bridge.utils.FWJsonUtils
+import com.facebook.react.common.MapBuilder
+import com.fireworksdk.bridge.components.videofeed.FWVideoFeed
+import com.fireworksdk.bridge.models.FWFeedViewEventName
+import com.fireworksdk.bridge.models.FWVideoFeedItemDetailsModel
+import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
+import com.fireworksdk.bridge.utils.FWLogUtils
+import com.loopnow.fireworklibrary.models.OnPlaylistGroupItemClickedListener
+import com.loopnow.fireworklibrary.models.VideoContentStatus
+import com.loopnow.fireworklibrary.views.OnItemClickedListener
+import com.loopnow.fireworklibrary.views.OnVideoContentStatusListener
+
+
+class FWVideoFeedManager : SimpleViewManager<FWVideoFeed>() {
+
+  private lateinit var reactContext: ThemedReactContext
+  private lateinit var videoFeed: FWVideoFeed
+
+  override fun getName(): String {
+    return "FWVideoFeed"
+  }
+
+  override fun createViewInstance(reactContext: ThemedReactContext): FWVideoFeed {
+    this.reactContext = reactContext
+    videoFeed = FWVideoFeed(reactContext.currentActivity as Activity)
+    return videoFeed
+  }
+
+  private fun addVideoFeedListener(reactContext: ThemedReactContext, videoFeed: FWVideoFeed?) {
+    val videoFeedView = videoFeed?.videoFeedView
+    videoFeedView?.addOnItemClickedListener(object: OnItemClickedListener {
+      override fun onItemClicked(index: Int, title: String, id: String, videoDuration: Long) {
+        val fwVideoFeedItemDetailsModel = FWVideoFeedItemDetailsModel(
+          index, id, videoDuration.toInt(), videoFeed.videoFeedPropsModel.source
+        )
+        FWEventUtils.sendVideoFeedClickEvent(reactContext, fwVideoFeedItemDetailsModel)
+      }
+
+      override fun onItemClicked(index: Int) {
+        super.onItemClicked(index)
+      }
+
+      override fun onItemClicked(index: Int, feedId: Int): Boolean {
+        return super.onItemClicked(index, feedId)
+      }
+    })
+   videoFeedView?.addOnVideoContentStatusListener(object: OnVideoContentStatusListener {
+      override fun currentStatus(status: VideoContentStatus, extra: String) {
+        when (status) {
+          VideoContentStatus.LoadingContent -> {
+            FWLogUtils.d { "VideoContentStatus.LoadingContent" }
+          }
+          VideoContentStatus.LoadingContentFailed -> {
+            FWLogUtils.e { "VideoContentStatus.LoadingContentFailed" }
+            FWEventUtils.receiveVideoFeedLoadFinishedFailedEvent(reactContext, videoFeedView.id, VideoContentStatus.LoadingContentFailed.rawValue, extra)
+          }
+          VideoContentStatus.ContentLoaded -> {
+            FWLogUtils.d { "VideoContentStatus.ContentLoaded" }
+            FWEventUtils.receiveVideoFeedLoadFinishedSuccessEvent(reactContext, videoFeedView.id)
+          }
+        }
+      }
+    })
+  }
+
+  private fun addPlaylistGroupFeedListener(reactContext: ThemedReactContext, videoFeed: FWVideoFeed?) {
+    val playlistGroupFeedView = videoFeed?.playlistGroupFeedView
+    playlistGroupFeedView?.itemClickHandler = object : OnPlaylistGroupItemClickedListener {
+      override fun onItemClicked(index: Int, id: String?): Boolean {
+        val fwVideoFeedItemDetailsModel = FWVideoFeedItemDetailsModel(
+          index, id, 0, videoFeed?.videoFeedPropsModel?.source
+        )
+        FWEventUtils.sendVideoFeedClickEvent(reactContext, fwVideoFeedItemDetailsModel)
+        return false
+      }
+    }
+
+    playlistGroupFeedView?.addOnVideoContentStatusListener(object: OnVideoContentStatusListener {
+      override fun currentStatus(status: VideoContentStatus, extra: String) {
+        when (status) {
+          VideoContentStatus.LoadingContent -> {
+            FWLogUtils.d { "VideoContentStatus.LoadingContent" }
+          }
+          VideoContentStatus.LoadingContentFailed -> {
+            FWLogUtils.e { "VideoContentStatus.LoadingContentFailed" }
+            FWEventUtils.receiveVideoFeedLoadFinishedFailedEvent(reactContext, playlistGroupFeedView.id, VideoContentStatus.LoadingContentFailed.rawValue, extra)
+          }
+          VideoContentStatus.ContentLoaded -> {
+            FWLogUtils.d { "VideoContentStatus.ContentLoaded" }
+            FWEventUtils.receiveVideoFeedLoadFinishedSuccessEvent(reactContext, playlistGroupFeedView.id)
+          }
+        }
+      }
+    })
+  }
+
+  @ReactProp(name = "source")
+  fun setSource(view: FWVideoFeed, source: String?) {
+    view.setSourceProps(source)
+    addVideoFeedListener(reactContext, videoFeed)
+    addPlaylistGroupFeedListener(reactContext, videoFeed)
+  }
+
+  @ReactProp(name = "channel")
+  fun setChannel(view: FWVideoFeed, channel: String?) {
+    view.setChannelProps(channel)
+  }
+
+  @ReactProp(name = "playlist")
+  fun setPlaylist(view: FWVideoFeed, playlist: String?) {
+    view.setPlaylistProps(playlist)
+  }
+
+  @ReactProp(name = "playlistGroup")
+  fun setPlaylistGroup(view: FWVideoFeed, playlistGroup: String?) {
+    view.setPlaylistGroupProps(playlistGroup)
+  }
+
+  @ReactProp(name = "mode")
+  fun setMode(view: FWVideoFeed, mode: String?) {
+    view.setModeProps(mode)
+  }
+
+  @ReactProp(name = "videoFeedConfiguration")
+  fun setVideoFeedConfig(view: FWVideoFeed, config: ReadableMap?) {
+    val configMap = config?.toHashMap()
+    val videoFeedConfigModel = FWJsonUtils.fromMap(configMap, FWVideoFeedConfigModel::class.java)
+    view.setVideoFeedConfigProps(videoFeedConfigModel)
+  }
+
+  @ReactProp(name = "videoPlayerConfiguration")
+  fun setVideoPlayerConfig(view: FWVideoFeed, config: ReadableMap?) {
+    val configMap = config?.toHashMap()
+    val videoPlayerConfigModel = FWJsonUtils.fromMap(configMap, FWVideoPlayerConfigModel::class.java)
+    view.setVideoPlayerConfigProps(videoPlayerConfigModel)
+  }
+
+  override fun getCommandsMap(): MutableMap<String, Int> {
+    val map: MutableMap<String, Int> = HashMap()
+    map["refresh"] = FWCommandConstant.FW_COMMAND_VIDEO_FEED_REFRESH
+    return map
+  }
+
+  override fun receiveCommand(root: FWVideoFeed, commandId: Int, args: ReadableArray?) {
+    when (commandId) {
+        FWCommandConstant.FW_COMMAND_VIDEO_FEED_REFRESH -> {
+          root.refresh()
+        }
+    }
+  }
+
+  /**
+   * To map the "onVideoFeedLoadFinished" event name to the "onVideoFeedLoadFinished" callback prop in JavaScript
+   * first onVideoFeedLoadFinished is event name
+   * second onVideoFeedLoadFinished is callback prop in JavaScript
+   */
+  override fun getExportedCustomBubblingEventTypeConstants(): MutableMap<String, Any>? {
+    return MapBuilder.builder<String, Any>()
+      .put(FWFeedViewEventName.VideoFeedLoadFinished.rawValue, MapBuilder.of("phasedRegistrationNames", MapBuilder.of("bubbled", FWFeedViewEventName.VideoFeedLoadFinished.rawValue)))
+      .build()
+  }
+
+}

package/android/src/main/java/com/fireworksdk/bridge/reactnative/models/FWLiveStreamInterface.kt

@@ -0,0 +1,5 @@
+package com.fireworksdk.bridge.reactnative.models
+
+interface FWLiveStreamInterface {
+  fun init()
+}

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge/reactnative}/models/FWVideoShoppingInterface.kt

@@ -1,11 +1,12 @@
-package com.reactnativefireworksdk.models
+package com.fireworksdk.bridge.reactnative.models
 
+import com.facebook.react.bridge.ReadableArray
 import com.facebook.react.bridge.ReadableMap
 
 interface FWVideoShoppingInterface {
 
   fun init()
-  fun updateVideoProduct(productMap: ReadableMap?, callbackId: Int?)
+  fun updateVideoProducts(productArray: ReadableArray?, videoId: String?)
   fun updateProductViewConfig(config: ReadableMap?, callbackId: Int?)
   fun updateAddToCartStatus(res: String?, tip: String?, callbackId: Int?)
   fun jumpToCartPage(callbackId: Int?)

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge/reactnative}/models/FireworkSDKInterface.kt

@@ -1,12 +1,14 @@
-package com.reactnativefireworksdk.models
+package com.fireworksdk.bridge.reactnative.models
 
+import com.facebook.react.bridge.Promise
 import com.facebook.react.bridge.ReadableMap
 
 interface FireworkSDKInterface {
 
   fun init(userId: String?, adConfig: ReadableMap?)
   fun openVideoPlayer(url: String, config: ReadableMap?)
-  fun setShareBaseURL(url: String?)
+  fun setShareBaseURL(url: String?, promise: Promise)
+  fun setAdBadgeConfiguration(config: ReadableMap?, promise: Promise)
   fun setCustomCTAClickEnabled(value: Boolean?)
   fun setVideoPlaybackEventEnabled(value: Boolean?)
 }

package/android/src/main/java/com/fireworksdk/bridge/reactnative/module/FWLiveStreamModule.kt

@@ -0,0 +1,88 @@
+package com.fireworksdk.bridge.reactnative.module
+
+import com.facebook.react.bridge.ReactApplicationContext
+import com.facebook.react.bridge.ReactContextBaseJavaModule
+import com.facebook.react.bridge.ReactMethod
+import com.fireworksdk.bridge.models.FWLiveStreamMessageDetailsModel
+import com.fireworksdk.bridge.models.FWLiveStreamEventDetailsModel
+import com.fireworksdk.bridge.models.FWLiveStreamEventName
+import com.fireworksdk.bridge.reactnative.models.FWLiveStreamInterface
+import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
+import com.fireworksdk.bridge.utils.FWLogUtils
+import com.loopnow.fireworklibrary.FireworkLiveStream
+import com.loopnow.fireworklibrary.FireworkLiveStreamChatDetails
+import com.loopnow.fireworklibrary.FireworkLiveStreamEventDetails
+import com.loopnow.fireworklibrary.FireworkLiveStreamEventListener
+
+
+class FWLiveStreamModule(
+  reactContext: ReactApplicationContext
+) : ReactContextBaseJavaModule(reactContext), FWLiveStreamInterface {
+
+  @ReactMethod
+  override fun init() {
+    addFireworkLiveStreamEventListener()
+  }
+
+  private fun addFireworkLiveStreamEventListener() {
+    FireworkLiveStream.addFireworkLiveStreamEventListener(object : FireworkLiveStreamEventListener {
+      override fun userJoined(liveStreamDetails: FireworkLiveStreamEventDetails) {
+        super.userJoined(liveStreamDetails)
+        FWLogUtils.d { "userJoined: $liveStreamDetails" }
+        FWEventUtils.sendLiveStreamEvent(
+          reactApplicationContext,
+          FWLiveStreamEventName.UserJoin.rawValue,
+          FWLiveStreamEventDetailsModel(liveStreamDetails.id)
+        )
+      }
+
+      override fun userLeft(liveStreamDetails: FireworkLiveStreamEventDetails) {
+        super.userLeft(liveStreamDetails)
+        FWLogUtils.d { "userLeft: $liveStreamDetails" }
+        FWEventUtils.sendLiveStreamEvent(
+          reactApplicationContext,
+          FWLiveStreamEventName.UserLeave.rawValue,
+          FWLiveStreamEventDetailsModel(liveStreamDetails.id)
+        )
+      }
+
+      override fun userSentChat(chatDetails: FireworkLiveStreamChatDetails) {
+        super.userSentChat(chatDetails)
+        FWLogUtils.d { "userSentChat: $chatDetails" }
+        FWEventUtils.sendLiveStreamChatEvent(
+          reactApplicationContext,
+          FWLiveStreamEventName.UserSendChat.rawValue,
+          FWLiveStreamMessageDetailsModel(chatDetails.chatId, chatDetails.username, chatDetails.text),
+          FWLiveStreamEventDetailsModel(chatDetails.liveStreamDetails.id)
+        )
+      }
+
+      override fun userSentLike(liveStreamDetails: FireworkLiveStreamEventDetails) {
+        super.userSentLike(liveStreamDetails)
+        FWLogUtils.d { "userSentLike: $liveStreamDetails" }
+        FWEventUtils.sendLiveStreamEvent(
+          reactApplicationContext,
+          FWLiveStreamEventName.UserSendLike.rawValue,
+          FWLiveStreamEventDetailsModel(liveStreamDetails.id)
+        )
+      }
+    })
+  }
+
+  @ReactMethod
+  fun addListener(eventName: String?) {
+    // Set up any upstream listeners or background tasks as necessary
+    FWLogUtils.d { "addListener: $eventName" }
+  }
+
+  @ReactMethod
+  fun removeListeners(count: Int?) {
+    // Remove upstream listeners, stop unnecessary background tasks
+    FWLogUtils.d { "removeListeners: $count" }
+  }
+
+  override fun getName(): String {
+    return "LiveStreamModule"
+  }
+
+}

package/android/src/main/java/com/{reactnativefireworksdk → fireworksdk/bridge/reactnative}/module/FWVideoShoppingModule.kt

@@ -1,16 +1,19 @@
-package com.reactnativefireworksdk.module
+package com.fireworksdk.bridge.reactnative.module
 
 import android.app.Activity
 import com.facebook.react.bridge.*
+import com.fasterxml.jackson.core.type.TypeReference
 import com.loopnow.fireworklibrary.baya.Baya
 import com.loopnow.fireworklibrary.baya.UpdateCartStatus
-import com.loopnow.fireworklibrary.models.Product
-import com.reactnativefireworksdk.models.FWVideoShoppingInterface
-import com.reactnativefireworksdk.models.FWVideoShoppingProduct
-import com.reactnativefireworksdk.pages.FWVideoShoppingCartActivity
-import com.reactnativefireworksdk.utils.FWEventUtils
-import com.reactnativefireworksdk.utils.FWJsonUtils
-import com.reactnativefireworksdk.utils.FWLogUtils
+import com.fireworksdk.bridge.reactnative.models.FWVideoShoppingInterface
+import com.fireworksdk.bridge.models.FWVideoShoppingProduct
+import com.fireworksdk.bridge.reactnative.pages.FWVideoShoppingCartActivity
+import com.fireworksdk.bridge.reactnative.utils.FWEventUtils
+import com.fireworksdk.bridge.utils.FWJsonUtils
+import com.fireworksdk.bridge.utils.FWLogUtils
+import com.loopnow.fireworklibrary.data.Product
+import com.loopnow.fireworklibrary.utils.Util
+
 
 class FWVideoShoppingModule(
   reactContext: ReactApplicationContext
@@ -18,7 +21,7 @@ class FWVideoShoppingModule(
 
   private var addToCartHandler: Triple<Int, String, String>? = null
   private var cartClickHandler: Pair<Int, Activity>? = null
-  private val updateProductHandler: HashMap<String, Product> = HashMap()
+  private val updateProductHandler: HashMap<String, List<Product>> = HashMap()
 
   @ReactMethod
   override fun init() {
@@ -27,40 +30,52 @@ class FWVideoShoppingModule(
   }
 
   @ReactMethod
-  override fun updateVideoProduct(productMap: ReadableMap?, callbackId: Int?) {
-    FWLogUtils.d { "FWVideoShoppingModule updateVideoProduct: $callbackId, productMap: $productMap" }
-    if (callbackId == null) {
+  override fun updateVideoProducts(productArray: ReadableArray?, videoId: String?) {
+    FWLogUtils.d { "FWVideoShoppingModule updateVideoProduct: $videoId" }
+    if (videoId.isNullOrBlank()) {
       return
     }
 
-    val configMap = productMap?.toHashMap()
-    val videoShoppingProduct = FWJsonUtils.fromMap(configMap, FWVideoShoppingProduct::class.java)
-        ?: return
-    val productId = videoShoppingProduct.productId
-    if (productId.isNullOrBlank()) {
+    val configArrayList = productArray?.toArrayList()
+    val videoShoppingProducts = FWJsonUtils.fromJson(FWJsonUtils.toJson(configArrayList), object : TypeReference<List<FWVideoShoppingProduct>?>() {})
+    if (videoShoppingProducts.isNullOrEmpty()) {
       return
     }
 
-    val product = updateProductHandler[productId] ?: return
+    val products = updateProductHandler[videoId] ?: return
 
-    if (videoShoppingProduct.description != null) {
-      product.description = videoShoppingProduct.description
-    }
+    for (product in products) {
+      for (videoShoppingProduct in videoShoppingProducts) {
+        if (product.extId == videoShoppingProduct.productId) {
+
+          if (videoShoppingProduct.name != null) {
+            product.name = videoShoppingProduct.name
+          }
+
+          if (videoShoppingProduct.description != null) {
+            product.description = videoShoppingProduct.description
+          }
 
-    if (videoShoppingProduct.units != null) {
-      for (videoShoppingProductUnit in videoShoppingProduct.units) {
-        for (productUnit in product.units) {
-          if (videoShoppingProductUnit.unitId.equals(productUnit.externalId)) {
-            productUnit.name = videoShoppingProductUnit.name
-            productUnit.price?.amount = videoShoppingProductUnit.price?.amount
-            productUnit.price?.currencyCode = videoShoppingProductUnit.price?.currencyCode
+          if (videoShoppingProduct.units != null) {
+            for (videoShoppingProductUnit in videoShoppingProduct.units) {
+              for (productUnit in product.productUnits) {
+                if (videoShoppingProductUnit.unitId.equals(productUnit.extId)) {
+                  productUnit.name = videoShoppingProductUnit.name
+                  productUnit.price = videoShoppingProductUnit.price?.amount
+                  productUnit.currencyCode = videoShoppingProductUnit.price?.currencyCode
+                  productUnit.priceLiteral = Util.getPriceLocaleFormatter(productUnit.price, productUnit.currencyCode)
+                }
+              }
+            }
           }
+
         }
       }
     }
-
-    updateProductHandler.remove(productId)
-
+    UiThreadUtil.runOnUiThread {
+      Baya.updateProductsComplete(videoId)
+    }
+    updateProductHandler.remove(videoId)
   }
 
   @ReactMethod
@@ -110,9 +125,8 @@ class FWVideoShoppingModule(
 
   @ReactMethod
   override fun exitCartPage() {
-    val activity = reactApplicationContext.currentActivity
     UiThreadUtil.runOnUiThread {
-      activity?.finish()
+      currentActivity?.finish()
     }
   }
 
@@ -156,13 +170,13 @@ class FWVideoShoppingModule(
 
   private fun productListener() {
     Baya.productInterface = object: Baya.ProductInterface {
-      override fun hydrateProduct(id: String, product: Product) {
-        FWLogUtils.d { "FWVideoShoppingModule hydrateProduct, id: $id" }
-        val callbackId = generateCallbackId()
-        if (!id.isNullOrBlank()) {
-          updateProductHandler[id] = product
-          FWEventUtils.sendUpdateProductDetailsEvent(reactApplicationContext, id, callbackId)
+      override fun hydrateProducts(videoId: String, products: List<Product>) {
+        FWLogUtils.d { "FWVideoShoppingModule hydrateProducts, videoId: $videoId" }
+        if (videoId.isNullOrBlank() || products.isNullOrEmpty()) {
+          return
         }
+        updateProductHandler[videoId] = products
+        FWEventUtils.sendUpdateProductsDetailsEvent(reactApplicationContext, products, videoId)
       }
 
       override fun displayProductInfo(