react-native-firework-sdk 2.12.1 → 2.14.0

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

@@ -13,8 +13,10 @@ import com.firework.analyticsevents.player.PlayerLifecycleAnalyticsEvent
 import com.firework.analyticsevents.share.ShareButtonAnalyticsEvent
 import com.firework.bus.FwAnalyticCallable
 import com.firework.sdk.FireworkSdk
+import com.firework.sdk.FwTrackingLevel
 import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.models.enums.FWDataTrackingLevel
 import com.fireworksdk.bridge.models.enums.FWVideoPlaybackSubEventName
 import com.fireworksdk.bridge.reactnative.FWReactNativeSDK
 import com.fireworksdk.bridge.reactnative.models.FireworkSDKInterface
@@ -29,6 +31,30 @@ class FireworkSDKModule(
   reactContext: ReactApplicationContext
 ) : ReactContextBaseJavaModule(reactContext), FireworkSDKInterface {
 
+  init {
+    FWGlobalDataUtil.initCompletedListener =  {
+      initCallback()
+    }
+  }
+
+  private fun initCallback(): Boolean {
+    val sdkInitResultModel = FWGlobalDataUtil.sdkInitResultModel
+    return if (sdkInitResultModel != null) { // init in application
+      if (sdkInitResultModel.success == true) {
+        FWEventUtils.sendInitSuccessEvent(reactApplicationContext)
+      } else if (sdkInitResultModel.success == false) {
+        FWEventUtils.sendInitFailedEvent(reactApplicationContext, sdkInitResultModel.reason)
+      }
+
+      FireworkSdk.analytics.register(this)
+      true
+    } else {
+      false
+    }
+  }
+
+
+
   /**
    * Initializes FW SDK
    *
@@ -63,22 +89,7 @@ class FireworkSDKModule(
   override fun markInitCalled(promise: Promise) {
     FWColorUtil.useRgba = true
     FWGlobalDataUtil.pauseWhenNotVisible = true
-
-    val sdkInitResultModel = FWGlobalDataUtil.sdkInitResultModel
-    if (sdkInitResultModel != null) { // init in application
-      if (sdkInitResultModel.success == true) {
-        FWEventUtils.sendInitSuccessEvent(reactApplicationContext)
-      } else if (sdkInitResultModel.success == false) {
-        FWEventUtils.sendInitFailedEvent(reactApplicationContext, sdkInitResultModel.reason)
-      }
-
-      FireworkSdk.analytics.register(this)
-      promise.resolve(true)
-
-      return
-    }
-
-    promise.resolve(false)
+    promise.resolve(initCallback())
   }
 
   /**
@@ -186,7 +197,7 @@ class FireworkSDKModule(
     val videoPlaybackDetails = FWModelUtils.convertPlayerEvent2PlaybackDetails(event)
     when (event) {
       is PlayerLifecycleAnalyticsEvent.OnStarted -> {
-        if (event.videoInfo.isAd) {
+        if (event.videoInfo?.isAd == true) {
           FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.AdStart.rawValue, videoPlaybackDetails)
         } else {
           FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.Start.rawValue, videoPlaybackDetails)
@@ -199,7 +210,7 @@ class FireworkSDKModule(
       is PlayerLifecycleAnalyticsEvent.OnIdle -> {}
       is PlayerLifecycleAnalyticsEvent.OnRepeat -> {}
       is PlayerLifecycleAnalyticsEvent.OnEnded -> {
-        if (event.videoInfo.isAd) {
+        if (event.videoInfo?.isAd == true) {
           FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.AdEnd.rawValue, videoPlaybackDetails)
         } else {
           FWEventUtils.sendVideoPlaybackEvent(reactApplicationContext, FWVideoPlaybackSubEventName.Complete.rawValue, videoPlaybackDetails)
@@ -236,7 +247,7 @@ class FireworkSDKModule(
       return
     }
     UiThreadUtil.runOnUiThread {
-      val result = FWLanguageUtil.getInstance(activity).changeLanguage(language, activity)
+      val result = FWReactNativeSDK.changeLanguage(language, activity)
       promise.resolve(result)
     }
   }
@@ -299,6 +310,19 @@ class FireworkSDKModule(
     }
   }
 
+  @ReactMethod
+  override fun setDataTrackingLevel(level: String?, promise: Promise) {
+    val trackingLevel =
+      when (level) {
+        FWDataTrackingLevel.ALL.rawValue -> FwTrackingLevel.ALL
+        FWDataTrackingLevel.NONE.rawValue -> FwTrackingLevel.NONE
+        FWDataTrackingLevel.ESSENTIAL_ONLY.rawValue -> FwTrackingLevel.ESSENTIAL_ONLY
+        else -> FwTrackingLevel.ALL
+      }
+    FireworkSdk.setTrackingLevel(trackingLevel)
+    promise.resolve(true)
+  }
+
   @ReactMethod
   fun addListener(eventName: String?, promise: Promise) {
     // Set up any upstream listeners or background tasks as necessary

package/android/src/main/java/com/fireworksdk/bridge/reactnative/utils/FWEventUtils.kt

@@ -18,7 +18,7 @@ import java.util.*
 object FWEventUtils {
 
   fun sendInitSuccessEvent(reactContext: ReactContext) {
-    sendEvent(reactContext, FWEventName.SDKIni.rawValue, Arguments.createMap())
+    sendEvent(reactContext, FWEventName.SDKInit.rawValue, Arguments.createMap())
   }
 
   fun sendInitFailedEvent(reactContext: ReactContext, reason: String?) {
@@ -26,7 +26,7 @@ object FWEventUtils {
     val contentMap = Arguments.createMap()
     contentMap.putString(FWSDKInitSubEventName.InitFailed.rawValue, reason?:"unknown")
     eventMap.putMap("error", contentMap)
-    sendEvent(reactContext, FWEventName.SDKIni.rawValue, eventMap)
+    sendEvent(reactContext, FWEventName.SDKInit.rawValue, eventMap)
   }
 
   fun sendVideoFeedClickEvent(reactContext: ReactContext, info: FWVideoFeedItemDetailsModel) {
@@ -79,6 +79,17 @@ object FWEventUtils {
     sendEvent(reactContext, FWEventName.VideoPlayback.rawValue, eventMap)
   }
 
+  private fun convertLiveStreamDetails2Map(info: FWLiveStreamEventDetailsModel?): WritableMap {
+    val contentMap = Arguments.createMap()
+    if (!info?.id.isNullOrBlank()) {
+      contentMap.putString("id", info?.id)
+    }
+    if (!info?.feedId.isNullOrBlank()) {
+      contentMap.putString("feedId", info?.feedId)
+    }
+    return contentMap
+  }
+
   private fun convertVideoPlaybackDetails2Map(info: FWVideoPlaybackDetails?): WritableMap {
     val contentMap = Arguments.createMap()
     if (!info?.id.isNullOrBlank()) {
@@ -244,11 +255,7 @@ object FWEventUtils {
     val eventMap = Arguments.createMap()
     eventMap.putString("eventName", eventName)
 
-    val contentMap = Arguments.createMap()
-    if (!info?.id.isNullOrBlank()) {
-      contentMap.putString("id", info?.id)
-    }
-    eventMap.putMap("info", contentMap)
+    eventMap.putMap("info", convertLiveStreamDetails2Map(info))
     sendEvent(reactContext, FWEventName.LiveStream.rawValue, eventMap)
   }
 
@@ -267,14 +274,10 @@ object FWEventUtils {
     if (!message?.text.isNullOrBlank()) {
       chatMap.putString("text", message?.text)
     }
-    eventMap.putMap("chat", chatMap)
+    eventMap.putMap("message", chatMap)
 
     // live stream map
-    val liveStreamMap = Arguments.createMap()
-    if (!liveStream?.id.isNullOrBlank()) {
-      liveStreamMap.putString("id", liveStream?.id)
-    }
-    eventMap.putMap("liveStream", liveStreamMap)
+    eventMap.putMap("liveStream", convertLiveStreamDetails2Map(liveStream))
 
     sendEvent(reactContext, FWEventName.LiveStreamChat.rawValue, eventMap)
   }
@@ -289,6 +292,15 @@ object FWEventUtils {
     sendEvent(reactContext, FWVideoShoppingEventName.CustomProductCardTap.rawValue, eventMap)
   }
 
+  fun sendProductClickEvent(reactContext: ReactContext, url: String?, productId: String?, unitId: String?, info: FWVideoPlaybackDetails?) {
+    val eventMap = Arguments.createMap()
+    eventMap.putString("url", url?:"")
+    eventMap.putString("productId", productId)
+    eventMap.putString("unitId", unitId)
+    eventMap.putMap("video", convertVideoPlaybackDetails2Map(info))
+    sendEvent(reactContext, FWVideoShoppingEventName.ProductClick.rawValue, eventMap)
+  }
+
   fun sendCustomLinkButtonClickEvent(reactContext: ReactContext, url: String?, productId: String?, unitId: String?, info: FWVideoPlaybackDetails?, callbackId: Int?) {
     val eventMap = Arguments.createMap()
     eventMap.putString("url", url ?: "")

package/android/src/main/java/com/fireworksdk/bridge/utils/FWConfigUtil.kt

@@ -5,6 +5,7 @@ import android.content.Context
 import android.graphics.Typeface
 import android.graphics.drawable.GradientDrawable
 import com.firework.common.PlayerMode
+import com.firework.common.Theme
 import com.firework.common.ad.AdBadgeOption
 import com.firework.common.ad.AdBadgeTextType
 import com.firework.common.ad.AdOption
@@ -14,6 +15,7 @@ import com.firework.common.feed.FeedLayout
 import com.firework.common.feed.FeedResource
 import com.firework.common.feed.FeedTitlePosition
 import com.firework.common.player.CloseButtonOption
+import com.firework.common.player.LivestreamCountDownOption
 import com.firework.common.player.MuteButtonOption
 import com.firework.common.player.PlaybackButtonOption
 import com.firework.common.player.PlayerUiOption
@@ -22,6 +24,7 @@ import com.firework.common.widget.WidgetImage
 import com.firework.viewoptions.*
 import com.fireworksdk.bridge.FWInitializationProvider
 import com.fireworksdk.bridge.models.*
+import com.fireworksdk.bridge.models.enums.FWAppearanceMode
 import com.fireworksdk.bridge.models.enums.FWBadgeTextType
 import com.fireworksdk.bridge.models.enums.FWCtaDelayType
 import com.fireworksdk.bridge.models.enums.FWGradientDrawableOrientation
@@ -52,6 +55,7 @@ object FWConfigUtil {
     val adBadgeOptionBuilder = getDefaultAdBadgeOptionBuilder()
     val ctaOptionBuilder = getDefaultCtaOptionBuilder()
     val adOptionBuilder = getDefaultAdOptionBuilder()
+    val countDownOptionBuilder = getDefaultPlayerCountdownTimerOptionBuilder()
 
     when (videoFeedPropsModel.source) {
       FWVideoFeedSource.Discover -> {
@@ -133,6 +137,7 @@ object FWConfigUtil {
       val titleHidden = title.hidden
       val titleTextColor = title.textColor
       val titleFontSize = title.fontSize
+      val titleNumberOfLines = title.numberOfLines
       val titleBackgroundColor = title.backgroundColor
       val titleGradientDrawable = title.gradientDrawable
       val typeface = getTypeface(context, title.fontInfo)
@@ -145,6 +150,9 @@ object FWConfigUtil {
       if (titleFontSize != null && titleFontSize > 0) {
         titleOptionBuilder.feedTitleTextSize(FWCommonUtil.spToPx(titleFontSize.toFloat(), context))
       }
+      if (titleNumberOfLines != null && titleNumberOfLines > 0 && titleNumberOfLines < 6) {
+        titleOptionBuilder.feedTitleTextNumberOfLines(titleNumberOfLines.toInt())
+      }
       typeface?.let {
         titleOptionBuilder.feedTitleTextTypeface(it)
       }
@@ -397,16 +405,27 @@ object FWConfigUtil {
 
     val logoConfigOption = videoFeedPropsModel.videoPlayerConfiguration?.videoPlayerLogoConfiguration?.option
     val logoConfigChannelId = videoFeedPropsModel.videoPlayerConfiguration?.videoPlayerLogoConfiguration?.encodedId
+    val isLogoClickable = videoFeedPropsModel.videoPlayerConfiguration?.videoPlayerLogoConfiguration?.isClickable ?: true
     when {
       logoConfigOption == FWVideoPlayerLogoOption.Creator && !logoConfigChannelId.isNullOrBlank() -> {
-        playerOptionBuilder.logoConfig(LogoConfig.Logo.CreatorLogo(logoConfigChannelId))
+        playerOptionBuilder.logoConfig(LogoConfig.Logo.CreatorLogo(logoConfigChannelId, isLogoClickable))
       }
       logoConfigOption == FWVideoPlayerLogoOption.ChannelAggregator && !logoConfigChannelId.isNullOrBlank() -> {
-        playerOptionBuilder.logoConfig(LogoConfig.Logo.AggregatorLogo(logoConfigChannelId))
+        playerOptionBuilder.logoConfig(LogoConfig.Logo.AggregatorLogo(logoConfigChannelId, isLogoClickable))
       }
       else -> {}
     }
 
+    val countdownTimerAppearance = videoFeedPropsModel.videoPlayerConfiguration?.countdownTimerConfiguration?.appearance
+    val isCountdownTimerHidden = videoFeedPropsModel.videoPlayerConfiguration?.countdownTimerConfiguration?.isHidden ?: true
+    countDownOptionBuilder.isHidden(isCountdownTimerHidden)
+    when (countdownTimerAppearance) {
+      FWAppearanceMode.Light -> countDownOptionBuilder.theme(Theme.LIGHT)
+      FWAppearanceMode.Dark -> countDownOptionBuilder.theme(Theme.DARK)
+      else -> {}
+    }
+    playerOptionBuilder.livestreamCountDownOption(countDownOptionBuilder.build())
+
     return ViewOptions.Builder()
       .layoutOption(layoutOptionBuilder.build())
       .titleOption(titleOptionBuilder.build())
@@ -437,6 +456,10 @@ object FWConfigUtil {
     return PlayerUiOption.Builder()
   }
 
+  private fun getDefaultPlayerCountdownTimerOptionBuilder(): LivestreamCountDownOption.Builder {
+    return LivestreamCountDownOption.Builder()
+  }
+
   private fun getDefaultVideoDetailsOptionBuilder(): VideoDetailsOption.Builder {
     return VideoDetailsOption.Builder()
   }

package/android/src/main/java/com/fireworksdk/bridge/utils/FWGlobalDataUtil.kt

@@ -2,6 +2,7 @@ package com.fireworksdk.bridge.utils
 
 import com.fireworksdk.bridge.models.FWAdBadgeConfigModel
 import com.fireworksdk.bridge.models.FWSdkInitResultModel
+import com.fireworksdk.bridge.models.enums.FWSwitchLanguageBehavior
 
 object FWGlobalDataUtil {
 
@@ -18,4 +19,8 @@ object FWGlobalDataUtil {
   var shareBaseUrl: String? = null
 
   var pauseWhenNotVisible: Boolean = false
+
+  var switchLanguageBehavior = FWSwitchLanguageBehavior.RestartingActivity
+
+  var initCompletedListener: (() -> Unit)? = null
 }

package/android/src/main/java/com/fireworksdk/bridge/utils/FWLanguageUtil.kt

@@ -4,6 +4,7 @@ import android.app.Activity
 import android.content.Context
 import androidx.fragment.app.FragmentActivity
 import com.fireworksdk.bridge.components.base.FWBaseFragment
+
 import java.util.Locale
 
 class FWLanguageUtil private constructor(context: Context) {
@@ -14,12 +15,38 @@ class FWLanguageUtil private constructor(context: Context) {
 
   private val initAppLocale: Locale = Locale.getDefault()
 
+  /**
+   * local string, e.g. ar, ar-AE, pt-BR
+   */
   private var localeString: String? = null
 
   init {
     localeString = sharedPreferences.getString(LOCALE_KEY, null)
   }
 
+  fun getCurrentSettingLocale(): Locale {
+    val localeLanguage = localeString
+    if (localeLanguage.isNullOrBlank()) {
+      return Locale(initAppLocale.language, initAppLocale.country)
+    } else {
+      if (localeLanguage.contains("-")) {
+        val locales = localeLanguage.split("-")
+        if (locales.size > 1) {
+          return Locale(locales[0], locales[1])
+        }
+      }
+      return Locale(localeLanguage)
+    }
+  }
+
+  fun shouldOverrideLanguage(language: String): Boolean {
+    if (localeString.isNullOrBlank()) {
+      // not update language in local string
+      return false
+    }
+    return !localeString.equals(language, true)
+  }
+
   fun updateBaseContextLocale(baseContext: Context): Context {
     val currentLocaleString = localeString
 
@@ -28,29 +55,45 @@ class FWLanguageUtil private constructor(context: Context) {
       return updateResourcesLocale(baseContext, initAppLocale)
     }
 
-    val localeStrings = currentLocaleString.split("-")
-    val locale = if (localeStrings.size > 1) {
-      Locale(localeStrings[0], localeStrings[1])
-    } else {
-      Locale(currentLocaleString)
-    }
+    val locale = getLocaleByLanguage(currentLocaleString)
+
     Locale.setDefault(locale)
     return updateResourcesLocale(baseContext, locale)
   }
 
+  private fun getLocaleByLanguage(language: String): Locale {
+    if (language.contains("-")) {
+      val locales = language.split("-")
+      if (locales.size > 1) {
+        return Locale(locales[0], locales[1])
+      }
+    }
+    return Locale(language)
+  }
+
   private fun updateResourcesLocale(context: Context, locale: Locale): Context {
     val resources = context.resources
     val configuration = resources.configuration
     configuration.setLocale(locale)
     configuration.setLayoutDirection(locale)
-    return context.createConfigurationContext(configuration)
+    val newContext = context.createConfigurationContext(configuration)
+    context.resources.updateConfiguration(configuration, context.resources.displayMetrics)
+    return newContext
   }
 
-  fun changeLanguage(inputLocaleString: String?, activity: Activity?): Boolean {
-    // no change
-    if ((inputLocaleString.isNullOrBlank() && localeString.isNullOrBlank())
+  /**
+   * return
+   * true: need to execute change language.
+   * false: don't need to execute change language.
+   */
+  fun isSameLanguageWithCache(inputLocaleString: String?): Boolean {
+    return (inputLocaleString.isNullOrBlank() && localeString.isNullOrBlank())
       || localeString == inputLocaleString
-    ) {
+  }
+
+  fun changeLanguage(inputLocaleString: String?): Boolean {
+    // no change
+    if (isSameLanguageWithCache(inputLocaleString)) {
       return true
     }
 
@@ -58,7 +101,6 @@ class FWLanguageUtil private constructor(context: Context) {
     if (inputLocaleString.isNullOrBlank()) {
       localeString = null
       updateSpLanguage(inputLocaleString)
-      restartActivity(activity)
       return true
     }
 
@@ -70,7 +112,6 @@ class FWLanguageUtil private constructor(context: Context) {
     // update locale
     localeString = inputLocaleString
     updateSpLanguage(inputLocaleString)
-    restartActivity(activity)
     return true
   }
 
@@ -86,7 +127,7 @@ class FWLanguageUtil private constructor(context: Context) {
     }
   }
 
-  private fun restartActivity(activity: Activity?) {
+  fun restartActivity(activity: Activity?) {
     if (activity is FragmentActivity) {
       val fragments = activity.supportFragmentManager.fragments
       for (f in fragments) {
@@ -98,7 +139,7 @@ class FWLanguageUtil private constructor(context: Context) {
     activity?.recreate()
   }
 
-  private fun isValidLocale(locale: String?) : Boolean {
+  private fun isValidLocale(locale: String?): Boolean {
     locale ?: return false
     val list = Locale.getAvailableLocales()
     if (locale.contains("-")) {
@@ -114,4 +155,5 @@ class FWLanguageUtil private constructor(context: Context) {
     private const val LOCALE_SP = "fw_locale_sp"
     private const val LOCALE_KEY = "fw_locale_key"
   }
+
 }

package/android/src/main/java/com/fireworksdk/bridge/utils/FWModelUtils.kt

@@ -4,6 +4,7 @@ import com.firework.analyticsevents.VideoInfo
 import com.firework.analyticsevents.cta.CtaButtonClickAnalyticsEvent
 import com.firework.analyticsevents.player.PlayerLifecycleAnalyticsEvent
 import com.firework.analyticsevents.share.ShareButtonAnalyticsEvent
+import com.fireworksdk.bridge.models.FWLiveStreamEventDetailsModel
 import com.fireworksdk.bridge.models.FWVideoPlaybackDetails
 
 object FWModelUtils {
@@ -20,6 +21,13 @@ object FWModelUtils {
     )
   }
 
+  fun convertVideoInfo2LivestreamDetails(videoInfo: VideoInfo): FWLiveStreamEventDetailsModel {
+    return FWLiveStreamEventDetailsModel(
+      id = videoInfo.id,
+      feedId = videoInfo.feedId,
+    )
+  }
+
   fun convertCtaEvent2PlaybackDetails(event: CtaButtonClickAnalyticsEvent): FWVideoPlaybackDetails {
     return FWVideoPlaybackDetails(
       badge = event.videoInfo.badge,
@@ -36,15 +44,15 @@ object FWModelUtils {
 
   fun convertPlayerEvent2PlaybackDetails(event: PlayerLifecycleAnalyticsEvent): FWVideoPlaybackDetails {
     return FWVideoPlaybackDetails(
-      badge = event.videoInfo.badge,
-      caption = event.videoInfo.caption,
-      duration = event.videoInfo.duration,
-      hasCta = event.videoInfo.hasCta,
-      playerHeight = event.videoInfo.playerHeight,
-      playerWidth = event.videoInfo.playerWidth,
-      id = event.videoInfo.id,
+      badge = event.videoInfo?.badge,
+      caption = event.videoInfo?.caption,
+      duration = event.videoInfo?.duration,
+      hasCta = event.videoInfo?.hasCta,
+      playerHeight = event.videoInfo?.playerHeight,
+      playerWidth = event.videoInfo?.playerWidth,
+      id = event.videoInfo?.id,
       progress = event.progress,
-      feedId = event.videoInfo.feedId,
+      feedId = event.videoInfo?.feedId,
     )
   }
 

package/ios/Components/StoryBlock.swift

@@ -123,7 +123,7 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
         self.storyBlockVC = storyBlockVC
         updateStoryBlockVCConfiguration()
 
-        storyBlockVC.isPictureInPictureEnabled = storyBlockConfiguration?.enablePictureInPicture ?? true
+        storyBlockVC.isPictureInPictureEnabled = storyBlockConfiguration?.enablePictureInPicture ?? false
         storyBlockVC.pictureInPictureDelegate = self
         storyBlockVC.delegate = self
 
@@ -243,10 +243,10 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
             }
         }
 
-//        if let showPlaybackButton = config.showPlaybackButton {
-//            resultConfig.fullScreenPlayerView.playbackButton.isHidden = !showPlaybackButton
-//        }
-//
+        if let showPlaybackButton = config.showPlaybackButton {
+            resultConfig.fullScreenPlayerView.playbackButton.isHidden = !showPlaybackButton
+        }
+
 //        if let showMuteButton = config.showMuteButton {
 //            resultConfig.fullScreenPlayerView.muteButton.isHidden = !showMuteButton
 //        }
@@ -356,9 +356,6 @@ public class StoryBlock: UIView, StoryBlockViewControllerDelegate, PictureInPict
         if let replayBadgeConfiguration = config.replayBadgeConfiguration {
             resultConfig.replayBadge.isHidden = replayBadgeConfiguration.isHidden
             resultConfig.fullScreenPlayerView.replayBadge.isHidden = replayBadgeConfiguration.isHidden
-        } else {
-            resultConfig.replayBadge.isHidden = false
-            resultConfig.fullScreenPlayerView.replayBadge.isHidden = false
         }
 
         if let countdownTimerConfiguration = config.countdownTimerConfiguration {

package/ios/Components/VideoFeed.swift

@@ -208,7 +208,7 @@ public class VideoFeed: UIView, VideoFeedViewControllerDelegate, PictureInPictur
             feedVC.viewConfiguration = viewConfiguration
         }
 
-        feedVC.isPictureInPictureEnabled = playerViewConfig?.enablePictureInPicture ?? true
+        feedVC.isPictureInPictureEnabled = playerViewConfig?.enablePictureInPicture ?? false
 
         feedVC.delegate = self
         feedVC.pictureInPictureDelegate = self
@@ -537,8 +537,6 @@ extension VideoFeed {
 
         if let replayBadgeConfiguration = config.replayBadgeConfiguration {
             vpcConfig.replayBadge.isHidden = replayBadgeConfiguration.isHidden
-        } else {
-            vpcConfig.replayBadge.isHidden = false
         }
 
         if let countdownTimerConfiguration = config.countdownTimerConfiguration {
@@ -570,8 +568,6 @@ extension VideoFeed {
 
         if let replayBadge = feedViewConfig?.replayBadge {
             videoConfig.replayBadge.isHidden = replayBadge.isHidden
-        } else {
-            videoConfig.replayBadge.isHidden = false
         }
 
         return videoConfig

package/ios/FireworkSdk.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		890B6B402BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 890B6B3F2BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift */; };
 		891F4AF62A67E12800A9E8DA /* FWRNContainerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891F4AF52A67E12800A9E8DA /* FWRNContainerViewController.swift */; };
 		891F4AF82A68DEDF00A9E8DA /* PushRNContainerParams.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891F4AF72A68DEDF00A9E8DA /* PushRNContainerParams.swift */; };
 		891F4AFA2A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = 891F4AF92A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift */; };
@@ -98,6 +99,7 @@
 
 /* Begin PBXFileReference section */
 		1F6F718A2771B48100224AF3 /* FireworkSdk-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "FireworkSdk-Bridging-Header.h"; sourceTree = "<group>"; };
+		890B6B3F2BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NumberFormatter+AppLanguage.swift"; sourceTree = "<group>"; };
 		891F4AF52A67E12800A9E8DA /* FWRNContainerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FWRNContainerViewController.swift; sourceTree = "<group>"; };
 		891F4AF72A68DEDF00A9E8DA /* PushRNContainerParams.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PushRNContainerParams.swift; sourceTree = "<group>"; };
 		891F4AF92A68DF2B00A9E8DA /* RCTConvert+FWNavigatorModule.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "RCTConvert+FWNavigatorModule.swift"; sourceTree = "<group>"; };
@@ -183,6 +185,7 @@
 		898873122A0A8E7E0089CD1C /* Extensions */ = {
 			isa = PBXGroup;
 			children = (
+				890B6B3F2BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift */,
 				89C105642BAD2C1D00E47CDD /* UIWindowScene+Swizzle.swift */,
 				898873132A0A8E7E0089CD1C /* UIViewController+AttachChild.swift */,
 				898873142A0A8E7E0089CD1C /* UIView+Constraints.swift */,
@@ -424,6 +427,7 @@
 				8988735B2A0A8E7E0089CD1C /* FireworkSDKModule.m in Sources */,
 				8988736A2A0A8E7E0089CD1C /* VideoFeedConfiguration.swift in Sources */,
 				8975238D2817DEF80070EBB6 /* (null) in Sources */,
+				890B6B402BF5F9B4007E5762 /* NumberFormatter+AppLanguage.swift in Sources */,
 				8975238C2817DEF80070EBB6 /* (null) in Sources */,
 				8988736B2A0A8E7E0089CD1C /* VideoFeed.swift in Sources */,
 				891F4AF62A67E12800A9E8DA /* FWRNContainerViewController.swift in Sources */,

package/ios/Models/NativeToRN/FireworkEventName.swift

@@ -45,6 +45,7 @@ enum ShoppingEventName: String, CaseIterable {
     case logMessage = "fw:log-message"
     case customLinkButtonClick = "fw:shopping:custom-link-button-click"
     case customProductCardTap = "fw:shopping:custom-product-card-tap"
+    case productClick = "fw:shopping:product-click"
 }
 
 /// Live stream event

package/ios/Models/NativeToRN/FireworkSDK+Json.swift

@@ -72,7 +72,8 @@ extension FeedEventDetails {
         var result: [String: Any] = [
             "index": index,
             "id": id,
-            "duration": duration
+            "duration": duration,
+            "feedId": feedId
         ]
         if let title = caption {
             result["title"] = title
@@ -112,7 +113,10 @@ extension FeedEventDetails {
 
 extension LiveStreamEventDetails {
     var jsObject: [String: Any] {
-        return ["id": id]
+        return [
+            "id": videoID,
+            "feedId": feedID
+        ]
     }
 }
 

package/ios/Models/RNToNative/RCTConvert+FireworkSDKModule.swift

@@ -113,4 +113,17 @@ extension RCTConvert {
 
         return result
     }
+
+    static func dataTrackingLevel(_ level: String) -> FireworkVideo.DataTrackingLevel? {
+        switch level {
+        case "all":
+            return FireworkVideo.DataTrackingLevel.all
+        case "essentialOnly":
+            return FireworkVideo.DataTrackingLevel.essentialOnly
+        case "none":
+            return FireworkVideo.DataTrackingLevel.none
+        default:
+            return nil
+        }
+    }
 }

package/ios/Modules/FireworkSDKModule/FireworkSDKModule+CTA.swift

@@ -8,27 +8,19 @@
 import FireworkVideo
 import Foundation
 
-var gVideoDetailsForTappingCTAButton: VideoDetails?
-
 extension FireworkSDKModule: FireworkVideoCTADelegate {
-    func handleCustomCTAClick(_ viewController: PlayerViewController, url: URL) -> Bool {
+    func handleCustomCTAClick(_ viewController: PlayerViewController, url: URL, for video: VideoDetails) -> Bool {
         let callbackId = UUID().uuidString
         playerMap.setObject(viewController, forKey: callbackId as NSString)
 
-        DispatchQueue.main.async { [weak self] in
-            var body: [String: Any?] = [
-                "url": url.absoluteString,
-                "callbackId": callbackId
-            ]
-
-            if let video = gVideoDetailsForTappingCTAButton {
-                body["video"] = video.jsObject
-                gVideoDetailsForTappingCTAButton = nil
-            }
+        let body: [String: Any?] = [
+            "url": url.absoluteString,
+            "callbackId": callbackId,
+            "video": video.jsObject
+        ]
 
-            self?.sendEvent(withName: FWEventName.customCTAClick.rawValue,
-                      body: body)
-        }
+        self.sendEvent(withName: FWEventName.customCTAClick.rawValue,
+                  body: body)
 
         return customCTAClickEnabled
     }