react-native-firework-sdk 2.0.0 → 2.2.0-beta.1

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

@@ -5,13 +5,26 @@ import kotlinx.android.parcel.Parcelize
 
 @Parcelize
 data class FWProductInfoViewConfiguration(
-  var addToCartButton: AddToCartButtonStyle? = null,
+  val ctaButton: CtaButtonConfiguration? = null,
+  val linkButton: LinkButtonConfiguration? = null,
 ) : Parcelable {
 
   @Parcelize
-  data class AddToCartButtonStyle(
-    var backgroundColor: String? = null,
-    var textColor: String? = null,
-    var fontSize: Int? = null,
+  data class CtaButtonConfiguration(
+    val text: TextValue? = null,
+    val backgroundColor: String? = null,
+    val textColor: String? = null,
+    val fontSize: Int? = null,
+  ) : Parcelable {
+
+    enum class TextValue(val rawValue: String) {
+      AddToCart("addToCart"),
+      ShopNow("shopNow"),
+    }
+  }
+
+  @Parcelize
+  data class LinkButtonConfiguration(
+    val isHidden: Boolean? = null,
   ) : Parcelable
 }

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

@@ -4,32 +4,60 @@ import org.json.JSONObject
 
 object FWProductInfoViewConfigurationDeserializer {
 
-  private const val ADD_TO_CART_BUTTON_STYLE = "addToCartButton"
+  private const val CTA_BUTTON = "ctaButton"
+  private const val LINK_BUTTON = "linkButton"
 
+  private const val TEXT_KEY = "text"
   private const val BACKGROUND_COLOR_KEY = "backgroundColor"
   private const val TEXT_COLOR_KEY = "textColor"
   private const val FONT_SIZE_KEY = "fontSize"
 
+  private const val IS_HIDDEN_KEY = "isHidden"
+
   fun deserialize(responseJson: JSONObject?): FWProductInfoViewConfiguration? {
     responseJson ?: return null
 
-    val addToCartButton = deserializeAddToCartButtonStyle(responseJson.optJSONObject(ADD_TO_CART_BUTTON_STYLE))
+    val ctaButtonConfiguration = deserializeCtaButtonConfiguration(responseJson.optJSONObject(CTA_BUTTON))
+    val linkButtonConfiguration = deserializeLinkButtonConfiguration(responseJson.optJSONObject(LINK_BUTTON))
 
     return FWProductInfoViewConfiguration(
-      addToCartButton = addToCartButton
+      ctaButton = ctaButtonConfiguration,
+      linkButton = linkButtonConfiguration,
     )
   }
 
-  private fun deserializeAddToCartButtonStyle(addToCartButtonStyleJson: JSONObject?): FWProductInfoViewConfiguration.AddToCartButtonStyle {
-    val backgroundColor = addToCartButtonStyleJson?.optString(BACKGROUND_COLOR_KEY)
-    val textColor = addToCartButtonStyleJson?.optString(TEXT_COLOR_KEY)
-    val fontSize = addToCartButtonStyleJson?.optInt(FONT_SIZE_KEY)
+  private fun deserializeCtaButtonConfiguration(ctaButtonConfiguration: JSONObject?): FWProductInfoViewConfiguration.CtaButtonConfiguration {
+    ctaButtonConfiguration ?: return FWProductInfoViewConfiguration.CtaButtonConfiguration()
+
+    val textString = if (ctaButtonConfiguration.has(TEXT_KEY)) ctaButtonConfiguration.optString(TEXT_KEY) else null
+    val backgroundColor = if (ctaButtonConfiguration.has(BACKGROUND_COLOR_KEY)) ctaButtonConfiguration.optString(BACKGROUND_COLOR_KEY) else null
+    val textColor = if (ctaButtonConfiguration.has(TEXT_COLOR_KEY)) ctaButtonConfiguration.optString(TEXT_COLOR_KEY) else null
+    val fontSize = if (ctaButtonConfiguration.has(FONT_SIZE_KEY)) ctaButtonConfiguration.optInt(FONT_SIZE_KEY) else null
 
-    return FWProductInfoViewConfiguration.AddToCartButtonStyle(
+    var text = FWProductInfoViewConfiguration.CtaButtonConfiguration.TextValue.AddToCart
+    when (textString) {
+      FWProductInfoViewConfiguration.CtaButtonConfiguration.TextValue.ShopNow.rawValue -> {
+        text = FWProductInfoViewConfiguration.CtaButtonConfiguration.TextValue.ShopNow
+      }
+      else -> {}
+    }
+
+    return FWProductInfoViewConfiguration.CtaButtonConfiguration(
+      text = text,
       backgroundColor = backgroundColor,
       textColor = textColor,
       fontSize = fontSize,
     )
   }
 
+  private fun deserializeLinkButtonConfiguration(linkButtonConfigJson: JSONObject?): FWProductInfoViewConfiguration.LinkButtonConfiguration {
+    linkButtonConfigJson ?: return FWProductInfoViewConfiguration.LinkButtonConfiguration()
+
+    val isHidden = if (linkButtonConfigJson.has(IS_HIDDEN_KEY)) linkButtonConfigJson.optBoolean(IS_HIDDEN_KEY) else null
+
+    return FWProductInfoViewConfiguration.LinkButtonConfiguration(
+      isHidden = isHidden,
+    )
+  }
+
 }

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

@@ -11,9 +11,9 @@ object FWSDKInitOptionsModelDeserializer {
   fun deserialize(responseJson: JSONObject?): FWSDKInitOptionsModel? {
     responseJson?: return null
 
-    val userId = responseJson.optString(USER_ID_KEY)
-    val shareBaseURL = responseJson.optString(SHARE_BASE_URL_KEY)
-    val videoLaunchBehavior = responseJson.optString(VIDEO_LAUNCH_BEHAVIOR_KEY)
+    val userId = if (responseJson.has(USER_ID_KEY)) responseJson.optString(USER_ID_KEY) else null
+    val shareBaseURL = if (responseJson.has(SHARE_BASE_URL_KEY)) responseJson.optString(SHARE_BASE_URL_KEY) else null
+    val videoLaunchBehavior = if (responseJson.has(VIDEO_LAUNCH_BEHAVIOR_KEY)) responseJson.optString(VIDEO_LAUNCH_BEHAVIOR_KEY) else null
 
     return FWSDKInitOptionsModel(
       userId = userId,

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

@@ -0,0 +1,17 @@
+package com.fireworksdk.bridge.models
+
+import android.os.Parcelable
+import kotlinx.android.parcel.Parcelize
+
+@Parcelize
+data class FWShoppingCtaResult(
+  val res: Res? = null,
+  val tips: String? = null,
+) : Parcelable {
+
+  enum class Res(val rawValue: String) {
+    Success("success"),
+    Fail("fail"),
+    Loading("loading"),
+  }
+}

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

@@ -0,0 +1,33 @@
+package com.fireworksdk.bridge.models
+
+import org.json.JSONObject
+
+object FWShoppingCtaResultDeserializer {
+
+  private const val RES_KEY = "res"
+  private const val TIPS_KEY = "tips"
+
+
+  fun deserialize(responseJson: JSONObject?): FWShoppingCtaResult? {
+    responseJson?: return null
+
+    val resString = if (responseJson.has(RES_KEY)) responseJson.optString(RES_KEY) else null
+    val tips = if (responseJson.has(TIPS_KEY)) responseJson.optString(TIPS_KEY) else null
+
+    var res = FWShoppingCtaResult.Res.Success
+    when (resString) {
+      FWShoppingCtaResult.Res.Fail.rawValue -> {
+        res = FWShoppingCtaResult.Res.Fail
+      }
+      FWShoppingCtaResult.Res.Loading.rawValue -> {
+        res = FWShoppingCtaResult.Res.Loading
+      }
+      else -> {}
+    }
+
+    return FWShoppingCtaResult(
+      res = res,
+      tips = tips,
+    )
+  }
+}

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

@@ -23,14 +23,14 @@ object FWVideoFeedConfigModelDeserializer {
   fun deserialize(responseJson: JSONObject?): FWVideoFeedConfigModel? {
     responseJson?: return null
 
-    val backgroundColor = responseJson.optString(BACKGROUND_COLOR_KEY)
-    val cornerRadius = responseJson.optInt(CORNER_RADIUS_KEY)
-    val title = deserializeTitle(responseJson.optJSONObject(TITLE_KEY))
-    val titlePosition = responseJson.optString(TITLE_POSITION_KEY)
-    val playIcon = deserializePlayIcon(responseJson.optJSONObject(PLAY_ICON_KEY))
-    val showAdBadge = responseJson.optBoolean(SHOW_AD_BADGE_KEY)
-    val enableAutoplay = responseJson.optBoolean(ENABLE_AUTOPLAY_KEY)
-    val gridColumns = responseJson.optInt(GRID_COLUMNS_KEY)
+    val backgroundColor = if (responseJson.has(BACKGROUND_COLOR_KEY)) responseJson.optString(BACKGROUND_COLOR_KEY) else null
+    val cornerRadius = if (responseJson.has(CORNER_RADIUS_KEY)) responseJson.optInt(CORNER_RADIUS_KEY) else null
+    val title = if (responseJson.has(TITLE_KEY)) deserializeTitle(responseJson.optJSONObject(TITLE_KEY)) else null
+    val titlePosition = if (responseJson.has(TITLE_POSITION_KEY)) responseJson.optString(TITLE_POSITION_KEY) else null
+    val playIcon = if (responseJson.has(PLAY_ICON_KEY)) deserializePlayIcon(responseJson.optJSONObject(PLAY_ICON_KEY)) else null
+    val showAdBadge = if (responseJson.has(SHOW_AD_BADGE_KEY)) responseJson.optBoolean(SHOW_AD_BADGE_KEY) else null
+    val enableAutoplay = if (responseJson.has(ENABLE_AUTOPLAY_KEY)) responseJson.optBoolean(ENABLE_AUTOPLAY_KEY) else null
+    val gridColumns = if (responseJson.has(GRID_COLUMNS_KEY)) responseJson.optInt(GRID_COLUMNS_KEY) else null
 
     return FWVideoFeedConfigModel(
       backgroundColor = backgroundColor,
@@ -45,10 +45,12 @@ object FWVideoFeedConfigModelDeserializer {
   }
 
   private fun deserializeTitle(titleJson: JSONObject?): FWVideoFeedConfigModel.FWTitleModel {
-    val hidden = titleJson?.optBoolean(HIDDEN_KEY)
-    val textColor = titleJson?.optString(TEXT_COLOR_KEY)
-    val fontSize = titleJson?.optInt(FONT_SIZE_KEY)
-    val fontInfo = FWFontInfoModelDeserializer.deserialize(titleJson?.optJSONObject(FONT_INFO_KEY))
+    titleJson ?: return FWVideoFeedConfigModel.FWTitleModel()
+
+    val hidden = if (titleJson.has(HIDDEN_KEY)) titleJson.optBoolean(HIDDEN_KEY) else null
+    val textColor = if (titleJson.has(TEXT_COLOR_KEY)) titleJson.optString(TEXT_COLOR_KEY) else null
+    val fontSize = if (titleJson.has(FONT_SIZE_KEY)) titleJson.optInt(FONT_SIZE_KEY) else null
+    val fontInfo = FWFontInfoModelDeserializer.deserialize(titleJson.optJSONObject(FONT_INFO_KEY))
 
     return FWVideoFeedConfigModel.FWTitleModel(
       hidden = hidden,

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

@@ -10,6 +10,7 @@ data class FWVideoFeedPropsModel(
     val channel: String? = null,
     val playlist: String? = null,
     val playlistGroup: String? = null,
+    val hashtagFilterExpression: String? = null,
     val mode: String? = null,
     val enablePictureInPicture: Boolean? = null,
     val videoFeedConfiguration: FWVideoFeedConfigModel? = null,

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

@@ -8,6 +8,7 @@ object FWVideoFeedPropsModelDeserializer {
   private const val CHANNEL_KEY = "channel"
   private const val PLAYLIST_KEY = "playlist"
   private const val PLAYLIST_GROUP_KEY = "playlistGroup"
+  private const val HASHTAG_FILTER_EXPRESSION_KEY = "hashtagFilterExpression"
   private const val MODE_KEY = "mode"
   private const val ENABLE_PIP_KEY = "enablePictureInPicture"
 
@@ -18,12 +19,14 @@ object FWVideoFeedPropsModelDeserializer {
   fun deserialize(responseJson: JSONObject?): FWVideoFeedPropsModel? {
     responseJson ?: return null
 
-    val source = responseJson.optString(SOURCE_KEY)
-    val channel = responseJson.optString(CHANNEL_KEY)
-    val playlist = responseJson.optString(PLAYLIST_KEY)
-    val playlistGroup = responseJson.optString(PLAYLIST_GROUP_KEY)
-    val mode = responseJson.optString(MODE_KEY)
-    val enablePictureInPicture = responseJson.optBoolean(ENABLE_PIP_KEY)
+    val source = if (responseJson.has(SOURCE_KEY)) responseJson.optString(SOURCE_KEY) else null
+    val channel = if (responseJson.has(CHANNEL_KEY)) responseJson.optString(CHANNEL_KEY) else null
+    val playlist = if (responseJson.has(PLAYLIST_KEY)) responseJson.optString(PLAYLIST_KEY) else null
+    val playlistGroup = if (responseJson.has(PLAYLIST_GROUP_KEY)) responseJson.optString(PLAYLIST_GROUP_KEY) else null
+    val hashtagFilterExpression = if (responseJson.has(HASHTAG_FILTER_EXPRESSION_KEY)) responseJson.optString(
+      HASHTAG_FILTER_EXPRESSION_KEY) else null
+    val mode = if (responseJson.has(MODE_KEY)) responseJson.optString(MODE_KEY) else null
+    val enablePictureInPicture = if (responseJson.has(ENABLE_PIP_KEY)) responseJson.optBoolean(ENABLE_PIP_KEY) else null
 
     val videoFeedConfiguration = FWVideoFeedConfigModelDeserializer.deserialize(
       responseJson.optJSONObject(VIDEO_FEED_CONFIGURATION_KEY)
@@ -31,7 +34,7 @@ object FWVideoFeedPropsModelDeserializer {
     val videoPlayerConfiguration = FWVideoPlayerConfigModelDeserializer.deserialize(
       responseJson.optJSONObject(VIDEO_PLAYER_CONFIGURATION_KEY)
     )
-    val dynamicContentParametersObject = responseJson.optJSONObject(DYNAMIC_CONTENT_PARAMETERS_KEY)
+    val dynamicContentParametersObject = if (responseJson.has(DYNAMIC_CONTENT_PARAMETERS_KEY)) responseJson.optJSONObject(DYNAMIC_CONTENT_PARAMETERS_KEY) else null
     var dynamicContentParameters: Map<String, List<String>>? = null
 
     val keys = dynamicContentParametersObject?.keys()
@@ -57,6 +60,7 @@ object FWVideoFeedPropsModelDeserializer {
       channel = channel,
       playlist = playlist,
       playlistGroup = playlistGroup,
+      hashtagFilterExpression = hashtagFilterExpression,
       mode = mode,
       enablePictureInPicture= enablePictureInPicture,
       videoFeedConfiguration = videoFeedConfiguration,

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

@@ -6,4 +6,5 @@ enum class FWVideoFeedSource(val rawValue: String) {
   Playlist("playlist"),
   DynamicContent("dynamicContent"),
   PlaylistGroup("playlistGroup"),
+  HashtagPlaylist("hashtagPlaylist"),
 }

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

@@ -5,12 +5,12 @@ import kotlinx.android.parcel.Parcelize
 
 @Parcelize
 data class FWVideoPlaybackDetails(
-  val autoplay: Boolean?,
-  val badge: String?,
-  val caption: String?,
-  val duration: Long?,
-  val hasCta: Boolean?,
-  val height: Int?,
-  val width: Int?,
-  val videoId: String?
+  val badge: String? = null,
+  val caption: String? = null,
+  val duration: Double? = null,
+  val hasCta: Boolean? = null,
+  val height: Int? = null,
+  val width: Int? = null,
+  val videoId: String? = null,
+  val progress: Double? = null,
 ) : Parcelable

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

@@ -15,6 +15,7 @@ data class FWVideoPlayerConfigModel(
   val showBranding: Boolean? = null,
   val ctaDelay: FWCtaDelayModel? = null,
   val ctaHighlightDelay: FWCtaDelayModel? = null,
+  val shareBaseUrl: String? = null,
 ) : Parcelable {
 
   @Parcelize

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

@@ -14,6 +14,7 @@ object FWVideoPlayerConfigModelDeserializer {
   private const val SHOW_BRANDING_KEY = "showBranding"
   private const val CTA_DELAY_KEY = "ctaDelay"
   private const val CTA_HIGHLIGHT_DELAY_KEY = "ctaHighlightDelay"
+  private const val SHARE_BASE_URL_KEY = "shareBaseURL"
 
   private const val BACKGROUND_COLOR_KEY = "backgroundColor"
   private const val FONT_SIZE_KEY = "fontSize"
@@ -25,16 +26,17 @@ object FWVideoPlayerConfigModelDeserializer {
   fun deserialize(responseJson: JSONObject?): FWVideoPlayerConfigModel? {
     responseJson ?: return null
 
-    val playerStyle = responseJson.optString(PLAYER_STYLE_KEY)
-    val videoCompleteAction = responseJson.optString(VIDEO_COMPLETE_ACTION_KEY)
-    val showShareButton = responseJson.optBoolean(SHOW_SHARE_BUTTON_KEY)
+    val playerStyle = if (responseJson.has(PLAYER_STYLE_KEY)) responseJson.optString(PLAYER_STYLE_KEY) else null
+    val videoCompleteAction = if (responseJson.has(VIDEO_COMPLETE_ACTION_KEY)) responseJson.optString(VIDEO_COMPLETE_ACTION_KEY) else null
+    val showShareButton = if (responseJson.has(SHOW_SHARE_BUTTON_KEY)) responseJson.optBoolean(SHOW_SHARE_BUTTON_KEY) else null
     val ctaButtonStyle = deserializeCtaButtonStyle(responseJson.optJSONObject(CTA_BUTTON_STYLE_KEY))
-    val showMuteButton = responseJson.optBoolean(SHOW_MUTE_BUTTON_KEY)
-    val showPlaybackButton = responseJson.optBoolean(SHOW_PLAYBACK_BUTTON_KEY)
-    val launchBehavior = responseJson.optString(LAUNCH_BEHAVIOR_KEY)
-    val showBranding = responseJson.optBoolean(SHOW_BRANDING_KEY)
+    val showMuteButton = if (responseJson.has(SHOW_MUTE_BUTTON_KEY)) responseJson.optBoolean(SHOW_MUTE_BUTTON_KEY) else null
+    val showPlaybackButton = if (responseJson.has(SHOW_PLAYBACK_BUTTON_KEY)) responseJson.optBoolean(SHOW_PLAYBACK_BUTTON_KEY) else null
+    val launchBehavior = if (responseJson.has(LAUNCH_BEHAVIOR_KEY)) responseJson.optString(LAUNCH_BEHAVIOR_KEY) else null
+    val showBranding = if (responseJson.has(SHOW_BRANDING_KEY)) responseJson.optBoolean(SHOW_BRANDING_KEY) else null
     val ctaDelay = deserializeCtaDelay(responseJson.optJSONObject(CTA_DELAY_KEY))
     val ctaHighlightDelay = deserializeCtaDelay(responseJson.optJSONObject(CTA_HIGHLIGHT_DELAY_KEY))
+    val shareBaseUrl = if (responseJson.has(SHARE_BASE_URL_KEY)) responseJson.optString(SHARE_BASE_URL_KEY) else null
 
     return FWVideoPlayerConfigModel(
       playerStyle = playerStyle,
@@ -47,13 +49,16 @@ object FWVideoPlayerConfigModelDeserializer {
       showBranding = showBranding,
       ctaDelay = ctaDelay,
       ctaHighlightDelay = ctaHighlightDelay,
+      shareBaseUrl = shareBaseUrl,
     )
   }
 
   private fun deserializeCtaButtonStyle(ctaButtonStyleJson: JSONObject?): FWVideoPlayerConfigModel.FWCtaButtonStyleModel {
-    val backgroundColor = ctaButtonStyleJson?.optString(BACKGROUND_COLOR_KEY)
-    val fontSize = ctaButtonStyleJson?.optInt(FONT_SIZE_KEY)
-    val textColor = ctaButtonStyleJson?.optString(TEXT_COLOR_KEY)
+    ctaButtonStyleJson ?: return FWVideoPlayerConfigModel.FWCtaButtonStyleModel()
+
+    val backgroundColor = if (ctaButtonStyleJson.has(BACKGROUND_COLOR_KEY)) ctaButtonStyleJson.optString(BACKGROUND_COLOR_KEY) else null
+    val fontSize = if (ctaButtonStyleJson.has(FONT_SIZE_KEY)) ctaButtonStyleJson.optInt(FONT_SIZE_KEY) else null
+    val textColor = if (ctaButtonStyleJson.has(TEXT_COLOR_KEY)) ctaButtonStyleJson.optString(TEXT_COLOR_KEY) else null
 
     return FWVideoPlayerConfigModel.FWCtaButtonStyleModel(
       backgroundColor = backgroundColor,
@@ -63,8 +68,10 @@ object FWVideoPlayerConfigModelDeserializer {
   }
 
   private fun deserializeCtaDelay(ctaDelayJson: JSONObject?): FWVideoPlayerConfigModel.FWCtaDelayModel {
-    val type = ctaDelayJson?.optString(TYPE_KEY)
-    val value = ctaDelayJson?.optDouble(VALUE_KEY)
+    ctaDelayJson ?: return FWVideoPlayerConfigModel.FWCtaDelayModel()
+
+    val type = if (ctaDelayJson.has(TYPE_KEY)) ctaDelayJson.optString(TYPE_KEY) else null
+    val value = if (ctaDelayJson.has(VALUE_KEY)) ctaDelayJson.optDouble(VALUE_KEY) else null
 
     return FWVideoPlayerConfigModel.FWCtaDelayModel(
       type = type,

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

@@ -35,9 +35,9 @@ object FWVideoShoppingProductDeserializer {
 
   fun deserialize(responseJson: JSONObject?): FWVideoShoppingProduct? {
     responseJson ?: return null
-    val productId = responseJson.optString(PRODUCT_ID_KEY)
-    val name = responseJson.optString(NAME_KEY)
-    val description = responseJson.optString(DESCRIPTION_KEY)
+    val productId = if (responseJson.has(PRODUCT_ID_KEY)) responseJson.optString(PRODUCT_ID_KEY) else null
+    val name = if (responseJson.has(NAME_KEY)) responseJson.optString(NAME_KEY) else null
+    val description = if (responseJson.has(DESCRIPTION_KEY)) responseJson.optString(DESCRIPTION_KEY) else null
     val units = deserializeUnits(responseJson.optJSONArray(UNITS_KEY))
     val isAvailable = responseJson.optBoolean(IS_AVAILABLE_KEY, true)
 
@@ -63,11 +63,11 @@ object FWVideoShoppingProductDeserializer {
 
   private fun deserializeUnit(unitsJsonObject: JSONObject?): FWVideoShoppingProduct.FWVideoProductUnit? {
     unitsJsonObject ?: return null
-    val unitId = unitsJsonObject.optString(UNIT_ID_KEY)
-    val name = unitsJsonObject.optString(NAME_KEY)
+    val unitId = if (unitsJsonObject.has(UNIT_ID_KEY)) unitsJsonObject.optString(UNIT_ID_KEY) else null
+    val name = if (unitsJsonObject.has(NAME_KEY)) unitsJsonObject.optString(NAME_KEY) else null
     val price = deserializePrice(unitsJsonObject.optJSONObject(PRICE_KEY))
-    val url = unitsJsonObject.optString(URL_KEY)
-    val imageUrl = unitsJsonObject.optString(IMAGE_URL_KEY)
+    val url = if (unitsJsonObject.has(URL_KEY)) unitsJsonObject.optString(URL_KEY) else null
+    val imageUrl = if (unitsJsonObject.has(IMAGE_URL_KEY)) unitsJsonObject.optString(IMAGE_URL_KEY) else null
     val options = deserializeOptions(unitsJsonObject.optJSONArray(OPTIONS_KEY))
     val isAvailable = unitsJsonObject.optBoolean(IS_AVAILABLE_KEY, true)
 
@@ -85,8 +85,8 @@ object FWVideoShoppingProductDeserializer {
 
   private fun deserializePrice(priceJsonObject: JSONObject?): FWVideoShoppingProduct.FWVideoProductPrice? {
     priceJsonObject ?: return null
-    val amount = priceJsonObject.optDouble(AMOUNT_KEY)
-    val currencyCode = priceJsonObject.optString(CURRENCY_CODE_KEY)
+    val amount = if (priceJsonObject.has(AMOUNT_KEY)) priceJsonObject.optDouble(AMOUNT_KEY) else null
+    val currencyCode = if (priceJsonObject.has(CURRENCY_CODE_KEY)) priceJsonObject.optString(CURRENCY_CODE_KEY) else null
 
     return FWVideoShoppingProduct.FWVideoProductPrice(
       amount = amount,
@@ -108,8 +108,8 @@ object FWVideoShoppingProductDeserializer {
 
   private fun deserializeOption(optionJsonObject: JSONObject?): FWVideoShoppingProduct.FWVideoProductOption? {
     optionJsonObject ?: return null
-    val name = optionJsonObject.optString(NAME_KEY)
-    val value = optionJsonObject.optString(VALUE_KEY)
+    val name = if (optionJsonObject.has(NAME_KEY)) optionJsonObject.optString(NAME_KEY) else null
+    val value = if (optionJsonObject.has(VALUE_KEY)) optionJsonObject.optString(VALUE_KEY) else null
 
     return FWVideoShoppingProduct.FWVideoProductOption(
       name = name,