@capillarytech/react-native-hydra-lib 1.7.0-beta.7 → 1.7.0-beta.9

package/android/src/newarch/HydraLibModule.kt

@@ -129,6 +129,14 @@ class HydraLibModule(reactContext: ReactApplicationContext) :
     HydraCore.isGamificationSuppressed(promise)
   }
 
+  override fun setThemeMode(mode: String, promise: Promise?) {
+    HydraCore.setThemeMode(mode, promise)
+  }
+
+  override fun getThemeMode(promise: Promise?) {
+    HydraCore.getThemeMode(promise)
+  }
+
   override fun openExternalUrl(url: String, promise: Promise?) {
     HydraPushNotification.openExternalUrl(url, promise)
   }

package/android/src/oldarch/HydraLibModule.kt

@@ -151,6 +151,16 @@ class HydraLibModule internal constructor(context: ReactApplicationContext) :
     HydraCore.isGamificationSuppressed(promise)
   }
 
+  @ReactMethod(isBlockingSynchronousMethod = false)
+  fun setThemeMode(mode: String, promise: Promise?) {
+    HydraCore.setThemeMode(mode, promise)
+  }
+
+  @ReactMethod(isBlockingSynchronousMethod = false)
+  fun getThemeMode(promise: Promise?) {
+    HydraCore.getThemeMode(promise)
+  }
+
   @ReactMethod(isBlockingSynchronousMethod = false)
   fun openExternalUrl(url: String, promise: Promise?) {
     HydraPushNotification.openExternalUrl(url, promise)

package/ios/Delegates/HydraApplicationDelegate.swift

@@ -32,6 +32,14 @@ import HydraCore
   }
   
   fileprivate func setupNavigationController(_ application: UIApplication) {
+    // Wrapping the app's rootViewController in a UINavigationController is only
+    // needed to push the Hydra NotificationCenter (see HydraInboxUI). Apps that
+    // don't enable InboxUI keep their own root view controller untouched.
+    guard HydraSDKCore.isInboxUIEnabled() else {
+      Logger.info("HydraApplicationDelegate: setupNavigationController: enable_inbox_ui is false, skipping navigation controller setup")
+      return
+    }
+
     //Create and set NavigationController as rootController, will be required to show NotificationCenter
     let storyboard = UIStoryboard(name: Bundle.main.infoDictionary?["UILaunchStoryboardName"] as? String ?? "LaunchScreen", bundle: nil)
     let viewController = storyboard.instantiateInitialViewController()

package/ios/GamificationViews/GamificationBannerViewComponentView.mm

@@ -53,12 +53,37 @@ using namespace facebook::react;
 }
 
 - (void)gamificationDataReloaded {
+    // Always dispatch to main: the SDK may post this from a background queue,
+    // and createGamificationBannerView is a UIKit/MainActor call.
     dispatch_async(dispatch_get_main_queue(), ^{
+        // Fabric keeps unmounted component views alive in its recycle pool, and a pooled view is
+        // still a registered observer here. It must NOT rebuild: every successful
+        // createGamificationBannerView records an impression against the entry point's display count
+        // (conditions.showCount.count), so an off-screen pooled view would silently burn the cap and
+        // the banner would vanish for real users far sooner than configured. A mounted view always
+        // has a superview; a pooled one never does (Fabric asserts this when enqueueing).
+        if (self.superview == nil) {
+            return;
+        }
         self->_needsBannerView = YES;
         [self attachBannerViewIfPossible];
     });
 }
 
+// Fabric recycles component views. RCTViewComponentView's own prepareForRecycle resets the event
+// emitter and react subviews but NOT `contentView`, and setContentView: re-adds it to the container
+// view — so without this a recycled instance keeps the previous mount's banner view (a live
+// WKWebView showing an already-rendered campaign). updateProps would then see `contentView != nil`
+// with an unchanged bannerId and never ask the SDK again, bypassing the frequency-cap/visibility
+// check entirely and displaying stale content the SDK has decided to hide.
+- (void)prepareForRecycle {
+    self.contentView = nil;
+    _bannerId = nil;
+    _needsBannerView = NO;
+    _retryPending = NO;
+    [super prepareForRecycle];
+}
+
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps {
     const auto &newProps = *std::static_pointer_cast<const GamificationBannerViewProps>(props);
 
@@ -87,7 +112,11 @@ using namespace facebook::react;
     if (!_needsBannerView || _bannerId.length == 0) {
         return;
     }
-    if (CGRectIsEmpty(self.bounds)) {
+    // Only WIDTH has to be laid out: the SDK ignores our bounds entirely (it measures the window)
+    // and seeds the real height back through onHeight. Requiring a non-empty rect would wedge a
+    // surface that has legitimately collapsed to height 0 — it could never rebuild when fresh data
+    // arrives, because its own bounds would stay empty forever.
+    if (self.bounds.size.width <= 0) {
         return;
     }
 
@@ -99,7 +128,15 @@ using namespace facebook::react;
         _needsBannerView = NO;
         _retryPending = NO;
     } else {
-        NSLog(@"[GamificationBanner] SDK returned nil — scheduling long fallback");
+        NSLog(@"[GamificationBanner] SDK returned nil — collapsing and scheduling long fallback");
+        // nil means "do not render this banner now" — hidden, frequency-capped, or no resolved URL.
+        // Drop anything already attached so a previously loaded webview can't outlive that decision.
+        // The SDK has already pushed height 0 through onHeight, so the JS side collapses with us.
+        self.contentView = nil;
+        // Don't retry aggressively: the SDK may have entry points loaded but
+        // reward/program data not yet ready. The HydraGamificationDataReloaded
+        // notification fires when everything is ready and will call us again.
+        // This 5-second fallback only fires if that notification is missed.
         [self scheduleFallbackRetry];
     }
 }

package/ios/GamificationViews/GamificationEmbedViewComponentView.mm

@@ -56,11 +56,34 @@ using namespace facebook::react;
     // Always dispatch to main: the SDK may post this from a background queue,
     // and createGamificationEmbedView is a UIKit/MainActor call.
     dispatch_async(dispatch_get_main_queue(), ^{
+        // Fabric keeps unmounted component views alive in its recycle pool, and a pooled view is
+        // still a registered observer here. It must NOT rebuild: every successful
+        // createGamificationEmbedView records an impression against the entry point's display count
+        // (conditions.showCount.count), so an off-screen pooled view would silently burn the cap and
+        // the embed would vanish for real users far sooner than configured. A mounted view always
+        // has a superview; a pooled one never does (Fabric asserts this when enqueueing).
+        if (self.superview == nil) {
+            return;
+        }
         self->_needsEmbedView = YES;
         [self attachEmbedViewIfPossible];
     });
 }
 
+// Fabric recycles component views. RCTViewComponentView's own prepareForRecycle resets the event
+// emitter and react subviews but NOT `contentView`, and setContentView: re-adds it to the container
+// view — so without this a recycled instance keeps the previous mount's EmbedView (a live WKWebView
+// showing an already-rendered campaign). updateProps would then see `contentView != nil` with an
+// unchanged embedId and never ask the SDK again, bypassing the frequency-cap/visibility check
+// entirely and displaying stale content the SDK has decided to hide.
+- (void)prepareForRecycle {
+    self.contentView = nil;
+    _embedId = nil;
+    _needsEmbedView = NO;
+    _retryPending = NO;
+    [super prepareForRecycle];
+}
+
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps {
     const auto &newProps = *std::static_pointer_cast<const GamificationEmbedViewProps>(props);
 
@@ -89,7 +112,11 @@ using namespace facebook::react;
     if (!_needsEmbedView || _embedId.length == 0) {
         return;
     }
-    if (CGRectIsEmpty(self.bounds)) {
+    // Only WIDTH has to be laid out: the SDK ignores our bounds entirely (it measures the window)
+    // and seeds the real height back through onHeight. Requiring a non-empty rect would wedge a
+    // surface that has legitimately collapsed to height 0 — it could never rebuild when fresh data
+    // arrives, because its own bounds would stay empty forever.
+    if (self.bounds.size.width <= 0) {
         return;
     }
 
@@ -101,7 +128,11 @@ using namespace facebook::react;
         _needsEmbedView = NO;
         _retryPending = NO;
     } else {
-        NSLog(@"[GamificationEmbed] SDK returned nil — scheduling long fallback");
+        NSLog(@"[GamificationEmbed] SDK returned nil — collapsing and scheduling long fallback");
+        // nil means "do not render this embed now" — hidden, frequency-capped, or no resolved URL.
+        // Drop anything already attached so a previously loaded webview can't outlive that decision.
+        // The SDK has already pushed height 0 through onHeight, so the JS side collapses with us.
+        self.contentView = nil;
         // Don't retry aggressively: the SDK may have entry points loaded but
         // reward/program data not yet ready. The HydraGamificationDataReloaded
         // notification fires when everything is ready and will call us again.

package/ios/GamificationViews/GamificationLoyaltyViewComponentView.mm

@@ -53,12 +53,37 @@ using namespace facebook::react;
 }
 
 - (void)gamificationDataReloaded {
+    // Always dispatch to main: the SDK may post this from a background queue,
+    // and createGamificationLoyaltyView is a UIKit/MainActor call.
     dispatch_async(dispatch_get_main_queue(), ^{
+        // Fabric keeps unmounted component views alive in its recycle pool, and a pooled view is
+        // still a registered observer here. It must NOT rebuild: every successful
+        // createGamificationLoyaltyView records an impression against the entry point's display count
+        // (conditions.showCount.count), so an off-screen pooled view would silently burn the cap and
+        // the widget would vanish for real users far sooner than configured. A mounted view always
+        // has a superview; a pooled one never does (Fabric asserts this when enqueueing).
+        if (self.superview == nil) {
+            return;
+        }
         self->_needsLoyaltyView = YES;
         [self attachLoyaltyViewIfPossible];
     });
 }
 
+// Fabric recycles component views. RCTViewComponentView's own prepareForRecycle resets the event
+// emitter and react subviews but NOT `contentView`, and setContentView: re-adds it to the container
+// view — so without this a recycled instance keeps the previous mount's loyalty view (a live
+// WKWebView showing an already-rendered campaign). updateProps would then see `contentView != nil`
+// with an unchanged loyaltyId and never ask the SDK again, bypassing the frequency-cap/visibility
+// check entirely and displaying stale content the SDK has decided to hide.
+- (void)prepareForRecycle {
+    self.contentView = nil;
+    _loyaltyId = nil;
+    _needsLoyaltyView = NO;
+    _retryPending = NO;
+    [super prepareForRecycle];
+}
+
 - (void)updateProps:(const Props::Shared &)props oldProps:(const Props::Shared &)oldProps {
     const auto &newProps = *std::static_pointer_cast<const GamificationLoyaltyViewProps>(props);
 
@@ -85,16 +110,31 @@ using namespace facebook::react;
     if (!_needsLoyaltyView || _loyaltyId.length == 0) {
         return;
     }
-    if (CGRectIsEmpty(self.bounds)) {
+    // Only WIDTH has to be laid out: the SDK ignores our bounds entirely (it measures the window)
+    // and seeds the real height back through onHeight. Requiring a non-empty rect would wedge a
+    // surface that has legitimately collapsed to height 0 — it could never rebuild when fresh data
+    // arrives, because its own bounds would stay empty forever.
+    if (self.bounds.size.width <= 0) {
         return;
     }
 
+    NSLog(@"[GamificationLoyalty] trying createGamificationLoyaltyView(loyaltyId=%@)", _loyaltyId);
     UIView *loyaltyView = [[HydraSDKCore shared] createGamificationLoyaltyViewWithLoyaltyId:_loyaltyId];
     if (loyaltyView) {
+        NSLog(@"[GamificationLoyalty] loyalty view created OK");
         self.contentView = loyaltyView;
         _needsLoyaltyView = NO;
         _retryPending = NO;
     } else {
+        NSLog(@"[GamificationLoyalty] SDK returned nil — collapsing and scheduling long fallback");
+        // nil means "do not render this now" — hidden, frequency-capped, or no resolved URL.
+        // Drop anything already attached so a previously loaded webview can't outlive that decision.
+        // The SDK has already pushed height 0 through onHeight, so the JS side collapses with us.
+        self.contentView = nil;
+        // Don't retry aggressively: the SDK may have entry points loaded but
+        // reward/program data not yet ready. The HydraGamificationDataReloaded
+        // notification fires when everything is ready and will call us again.
+        // This 5-second fallback only fires if that notification is missed.
         [self scheduleFallbackRetry];
     }
 }

package/ios/HydraLib.mm

@@ -202,6 +202,14 @@ RCT_EXPORT_METHOD(reportMessageRating:(nonnull NSDictionary *)message rating:(do
   [[HydraSDKCore shared] isGamificationSuppressed:resolve reject:reject];
 }
 
+- (void)setThemeMode:(nonnull NSString *)mode resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+  [[HydraSDKCore shared] setThemeMode:mode resolve:resolve reject:reject];
+}
+
+- (void)getThemeMode:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+  [[HydraSDKCore shared] getThemeMode:resolve reject:reject];
+}
+
 
 
 #ifdef RCT_NEW_ARCH_ENABLED

package/ios/HydraSDK/HydraInAppMessages.swift

@@ -60,22 +60,49 @@ import React
 //    }
   }
   
+  // NOTE: these four methods do not yet call into a corresponding HydraCore/HydraInAppMessage
+  // report API (unlike the Android side, which calls HydraInAppUIHelper...reportInAppMessage*).
+  // The logging/resolve/reject below only makes failures visible and stops the RN promise
+  // from hanging forever — it does not report the click/dismiss/rating/feedback to the SDK.
+
   @objc public func reportMessageClicked(_ message: [String: Any]?, resolve : RCTPromiseResolveBlock?, reject : RCTPromiseRejectBlock?)  -> Void{
-    if let payload = message?["nativeJsonPayload"] as? [String: Any]{
-      Logger.debug("HydraInAppMessages.reportMessageClicked payload = \(payload)")
+    guard let payload = message?["nativeJsonPayload"] as? [String: Any] else {
+      Logger.error("HydraInAppMessages: reportMessageClicked: message is nil or missing nativeJsonPayload")
+      reject?("Error", "message is nil or missing nativeJsonPayload", nil)
+      return
     }
+    Logger.debug("HydraInAppMessages.reportMessageClicked payload = \(payload)")
+    resolve?(true)
   }
-  
+
   @objc public func reportMessageDismissed(_ message: [String: Any]?, resolve : RCTPromiseResolveBlock?, reject : RCTPromiseRejectBlock?)  -> Void{
-    
+    guard let payload = message?["nativeJsonPayload"] as? [String: Any] else {
+      Logger.error("HydraInAppMessages: reportMessageDismissed: message is nil or missing nativeJsonPayload")
+      reject?("Error", "message is nil or missing nativeJsonPayload", nil)
+      return
+    }
+    Logger.debug("HydraInAppMessages.reportMessageDismissed payload = \(payload)")
+    resolve?(true)
   }
-  
+
   @objc public func reportMessageRating(_ message: [String: Any]?, rating: Double, resolve : RCTPromiseResolveBlock?, reject : RCTPromiseRejectBlock?)  -> Void{
-    
+    guard let payload = message?["nativeJsonPayload"] as? [String: Any] else {
+      Logger.error("HydraInAppMessages: reportMessageRating: message is nil or missing nativeJsonPayload")
+      reject?("Error", "message is nil or missing nativeJsonPayload", nil)
+      return
+    }
+    Logger.debug("HydraInAppMessages.reportMessageRating payload = \(payload), rating = \(rating)")
+    resolve?(true)
   }
-  
+
   @objc public func reportMessageFeedback(_ message: [String: Any]?, feedback: String, feedbackOptions: [String], resolve : RCTPromiseResolveBlock?, reject : RCTPromiseRejectBlock?)  -> Void{
-    
+    guard let payload = message?["nativeJsonPayload"] as? [String: Any] else {
+      Logger.error("HydraInAppMessages: reportMessageFeedback: message is nil or missing nativeJsonPayload")
+      reject?("Error", "message is nil or missing nativeJsonPayload", nil)
+      return
+    }
+    Logger.debug("HydraInAppMessages.reportMessageFeedback payload = \(payload), feedback = \(feedback), feedbackOptions = \(feedbackOptions)")
+    resolve?(true)
   }
 }
 

package/ios/HydraSDK/HydraInbox.swift

@@ -32,13 +32,18 @@ import React
   }
   
   @objc public func getInboxMessages(_ resolve : RCTPromiseResolveBlock?, reject : RCTPromiseRejectBlock? ){
-    self.inboxCore?.getNotifications(){
+    guard let inboxCore = self.inboxCore else {
+      Logger.error("HydraInbox: getInboxMessages: inboxCore is nil, InboxCore not initialized")
+      reject?("Error", "InboxCore not initialized", nil)
+      return
+    }
+    inboxCore.getNotifications(){
       (rawNotifications) -> Void in
       let  notifications  = rawNotifications.map{$0.toDict()}
       resolve?(notifications)
       Logger.debug("HydraInbox: getInboxMessages: notifications = \(String(describing: notifications))")
     }
-    
+
   }
   
   fileprivate func updateBadgeCount() {
@@ -49,15 +54,25 @@ import React
   }
   
   @objc public func getUnreadInboxMessagesCount(_ resolve : RCTPromiseResolveBlock?, reject : RCTPromiseRejectBlock? ){
-    inboxCore?.getUnreadNotificationCount(){
+    guard let inboxCore = self.inboxCore else {
+      Logger.error("HydraInbox: getUnreadInboxMessagesCount: inboxCore is nil, InboxCore not initialized")
+      reject?("Error", "InboxCore not initialized", nil)
+      return
+    }
+    inboxCore.getUnreadNotificationCount(){
       (count) -> Void in
       resolve?(count)
       Logger.debug("HydraInbox: getUnreadInboxMessagesCount: count = \(count)")
     }
   }
-  
+
   @objc public func deleteAllInboxMessages(_ resolve : RCTPromiseResolveBlock?, reject : RCTPromiseRejectBlock? ){
-    inboxCore?.handleDeleteAllNotifications(){
+    guard let inboxCore = self.inboxCore else {
+      Logger.error("HydraInbox: deleteAllInboxMessages: inboxCore is nil, InboxCore not initialized")
+      reject?("Error", "InboxCore not initialized", nil)
+      return
+    }
+    inboxCore.handleDeleteAllNotifications(){
       (isDeleted) -> Void in
       if isDeleted {
         self.updateBadgeCount()
@@ -66,26 +81,38 @@ import React
       Logger.debug("HydraInbox: deleteAllInboxMessages: deleted = \(isDeleted)")
     }
   }
-  
+
   @objc public func deleteInboxMessage(_ inboxMessage: [String: Any] ,resolve : RCTPromiseResolveBlock?, reject : RCTPromiseRejectBlock? ){
+    guard let inboxCore = self.inboxCore else {
+      Logger.error("HydraInbox: deleteInboxMessage: inboxCore is nil, InboxCore not initialized")
+      reject?("Error", "InboxCore not initialized", nil)
+      return
+    }
     let payload = HydraNotificationPayload.generate(from: inboxMessage)
-    inboxCore?.handleNotification(notification: payload, action: .delete){
+    inboxCore.handleNotification(notification: payload, action: .delete){
       (isDeleted) -> Void in
       if isDeleted {
         self.updateBadgeCount()
       }
       resolve?(isDeleted)
+      Logger.debug("HydraInbox: deleteInboxMessage: deleted = \(isDeleted)")
     }
   }
-  
+
   @objc public func markInboxMessageAsRead(_ inboxMessage: [String: Any] ,resolve : RCTPromiseResolveBlock?, reject : RCTPromiseRejectBlock? ){
+    guard let inboxCore = self.inboxCore else {
+      Logger.error("HydraInbox: markInboxMessageAsRead: inboxCore is nil, InboxCore not initialized")
+      reject?("Error", "InboxCore not initialized", nil)
+      return
+    }
     let payload = HydraNotificationPayload.generate(from: inboxMessage)
-    inboxCore?.handleNotification(notification: payload, action: .read){
+    inboxCore.handleNotification(notification: payload, action: .read){
       (isRead) -> Void in
       if isRead {
         self.updateBadgeCount()
       }
       resolve?(isRead)
+      Logger.debug("HydraInbox: markInboxMessageAsRead: read = \(isRead)")
     }
   }
 }

package/ios/HydraSDK/HydraInboxUI.swift

@@ -72,13 +72,17 @@ import React
   @objc public func showNotificationCenter(_ resolve : RCTPromiseResolveBlock?, reject : RCTPromiseRejectBlock? ){
     if self.inboxUICore != nil{
       DispatchQueue.main.async{
-        guard let notificationCenter = self.inboxUICore?.getNotificationCenter() else { return}
+        guard let notificationCenter = self.inboxUICore?.getNotificationCenter() else {
+          Logger.error("HydraInboxUI: showNotificationCenter: getNotificationCenter() returned nil, cannot push notification center")
+          return
+        }
         self.navigationController?.pushViewController(notificationCenter, animated: true)
         self.hydraNotificationController = notificationCenter
       }
       resolve?(true)
       return
     }
+    Logger.error("HydraInboxUI: showNotificationCenter: inboxUICore is nil, InboxUI not initialized")
     resolve?(false)
   }
   

package/ios/HydraSDK/HydraPushNotification.swift

@@ -61,7 +61,7 @@ import HydraInAppMessage
   
   @objc public func getFCMToken(_ resolve : RCTPromiseResolveBlock?, reject : RCTPromiseRejectBlock? ){
     guard fcmToken != nil else{
-      Logger.debug("HydraPushNotification: getFCMToken: Did not receive the token yet")
+      Logger.error("HydraPushNotification: getFCMToken: Did not receive the token yet")
       reject?( "TOKEN_NOT_AVAILABLE", "Did not receive the token yet", nil)
       return
     }
@@ -234,7 +234,7 @@ import HydraInAppMessage
   }
   
   @objc public func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: any Error) {
-    Logger.debug("HydraPushNotification: application:didFailToRegisterForRemoteNotificationsWithError error = \(error.localizedDescription)")
+    Logger.error("HydraPushNotification: application:didFailToRegisterForRemoteNotificationsWithError error = \(error.localizedDescription)")
 //    if HydraSDKCore.shared.hydra == nil{
 //      DispatchQueue.main.asyncAfter(deadline: .now() + 0.3){
 //        self.application(application, didFailToRegisterForRemoteNotificationsWithError: error)