Merge pull request #87 from channel-io/develop

0.7.4

Author: zoyi-jin

CHANGELOG.md

@@ -1,8 +1,13 @@
+# 0.7.4
+
+## Update
+* iOS - Fixed an issue where changed to false when unsubscribeText / unsubscribeEmail is empty
+
+
 # 0.7.3
 
 ## Update
 * support android channel-io 10.0.3
-* iOS - Fixed an issue where changed to false when unsubscribeText / unsubscribeEmail is empty
 
 # 0.7.2
 

ios/RCTConvert+ChannelIO.m

@@ -66,10 +66,16 @@ + (BootConfig *)bootConfig:(id)json {
     ? [RCTConvert BOOL:json[KEY_HIDE_POPUP]] : [RCTConvert BOOL:json[KEY_HIDE_DEFAULT_IN_APP_PUSH]];
   config.trackDefaultEvent = json[KEY_TRACK_DEFAULT_EVENT] != nil
     ? [RCTConvert BOOL:json[KEY_TRACK_DEFAULT_EVENT]] : [RCTConvert BOOL:json[KEY_ENABLED_TRACK_DEFAULT_EVENT]];
-  config.unsubscribeEmail = [RCTConvert BOOL:json[KEY_UNSUBSCRIBE_EMAIL]];
-  config.unsubscribeTexting = [RCTConvert BOOL:json[KEY_UNSUBSCRIBE_TEXTING]];
   config.bubbleOption = [RCTConvert bubbleOption:json[KEY_BUBBLE_OPTION]];
 
+  if (json[KEY_UNSUBSCRIBE_EMAIL] != nil) {
+    [config setWithUnsubscribeEmail: [RCTConvert BOOL:json[KEY_UNSUBSCRIBE_EMAIL]]];
+  }
+
+  if (json[KEY_UNSUBSCRIBE_TEXTING] != nil) {
+    [config setWithUnsubscribeTexting: [RCTConvert BOOL:json[KEY_UNSUBSCRIBE_TEXTING]]];
+  }
+
   if (json[KEY_LAUNCHER_CONFIG] == nil && json[KEY_CHANNEL_BUTTON_OPTION] != nil) {
     config.channelButtonOption = [RCTConvert channelButtonOption:json[KEY_CHANNEL_BUTTON_OPTION]];
   } else if (json[KEY_LAUNCHER_CONFIG] != nil && json[KEY_CHANNEL_BUTTON_OPTION] == nil) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-channel-plugin",
-  "version": "0.7.3",
+  "version": "0.7.4",
   "description": "react native module for channel io",
   "main": "index.js",
   "scripts": {