@trycourier/courier-react-native 2.0.0-beta1 → 2.0.0-beta3

package/ios/CourierReactNative-Bridging-Header.h

@@ -1,2 +1,3 @@
+#import <React/RCTBridgeModule.h>
 #import <React/RCTViewManager.h>
 #import <React/RCTEventEmitter.h>

package/ios/CourierReactNative.xcodeproj/project.pbxproj

@@ -7,8 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		5E555C0D2413F4C50049A1A2 /* CourierReactNative.mm in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* CourierReactNative.mm */; };
-		F4FF95D7245B92E800C19C63 /*  CourierReactNative.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FF95D6245B92E800C19C63 /*  CourierReactNative.swift */; };
+		F4FF95D7245B92E800C19C63 /* CourierReactNative.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4FF95D6245B92E800C19C63 /* CourierReactNative.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXCopyFilesBuildPhase section */
@@ -25,6 +24,8 @@
 
 /* Begin PBXFileReference section */
 		134814201AA4EA6300B7C361 /* libCourierReactNative.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libCourierReactNative.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		27960AF02A9E722F0076CE04 /* CourierReactNativeDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CourierReactNativeDelegate.h; sourceTree = "<group>"; };
+		27960AF12A9E722F0076CE04 /* CourierReactNativeDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CourierReactNativeDelegate.m; sourceTree = "<group>"; };
 		B3E7B5891CC2AC0600A0062D /* CourierReactNative.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CourierReactNative.mm; sourceTree = "<group>"; };
 		F4FF95D5245B92E700C19C63 /* CourierReactNative-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CourierReactNative-Bridging-Header.h"; sourceTree = "<group>"; };
 		F4FF95D6245B92E800C19C63 /* CourierReactNative.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CourierReactNative.swift; sourceTree = "<group>"; };
@@ -52,6 +53,8 @@
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
+				27960AF02A9E722F0076CE04 /* CourierReactNativeDelegate.h */,
+				27960AF12A9E722F0076CE04 /* CourierReactNativeDelegate.m */,
 				F4FF95D6245B92E800C19C63 /* CourierReactNative.swift */,
 				B3E7B5891CC2AC0600A0062D /* CourierReactNative.mm */,
 				F4FF95D5245B92E700C19C63 /* CourierReactNative-Bridging-Header.h */,
@@ -117,7 +120,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				F4FF95D7245B92E800C19C63 /* CourierReactNative.swift in Sources */,
-				B3E7B58A1CC2AC0600A0062D /* CourierReactNative.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

package/ios/CourierReactNative.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>

package/ios/CourierReactNative.xcodeproj/xcuserdata/mike.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>CourierReactNative.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

package/ios/CourierReactNativeDelegate.h

@@ -0,0 +1,18 @@
+//
+//  CourierReactNativeDelegate.h
+//  courier-react-native
+//
+//  Created by Michael Miller on 8/29/23.
+//
+
+#import "RCTAppDelegate.h"
+#import <UIKit/UIKit.h>
+#import <UserNotifications/UserNotifications.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface CourierReactNativeDelegate : RCTAppDelegate<UNUserNotificationCenterDelegate>
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/CourierReactNativeDelegate.m

@@ -0,0 +1,125 @@
+//
+//  CourierReactNativeDelegate.m
+//  courier-react-native
+//
+//  Created by Michael Miller on 10/7/22.
+//
+
+@import Courier_iOS;
+#import "CourierReactNativeDelegate.h"
+#pragma GCC diagnostic ignored "-Wprotocol"
+#pragma clang diagnostic ignored "-Wprotocol"
+
+@implementation CourierReactNativeDelegate
+
+NSString *iosForegroundNotificationPresentationOptions = @"iosForegroundNotificationPresentationOptions";
+NSUInteger notificationPresentationOptions = UNNotificationPresentationOptionNone;
+
+- (id) init {
+    
+    self = [super init];
+    
+    if (self) {
+        
+        // Register for remote notifications
+        UIApplication *app = [UIApplication sharedApplication];
+        [app registerForRemoteNotifications];
+        
+        // Register notification center changes
+        UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+        center.delegate = self;
+        
+        [[NSNotificationCenter defaultCenter]
+            addObserver:self
+            selector:@selector(notificationPresentationOptionsUpdate:)
+            name:iosForegroundNotificationPresentationOptions
+            object:nil
+        ];
+        
+    }
+    
+    return(self);
+    
+}
+
+- (void) notificationPresentationOptionsUpdate:(NSNotification *) notification
+{
+    if ([[notification name] isEqualToString:iosForegroundNotificationPresentationOptions])
+    {
+        NSDictionary *userInfo = notification.userInfo;
+        notificationPresentationOptions = ((NSNumber *) [userInfo objectForKey:@"options"]).unsignedIntegerValue;
+    }
+}
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center willPresentNotification:(UNNotification *)notification withCompletionHandler:(void (^)(UNNotificationPresentationOptions))completionHandler
+{
+    
+    UNNotificationContent *content = notification.request.content;
+    NSDictionary *message = content.userInfo;
+    
+    [[Courier shared] trackNotificationWithMessage:message event:CourierPushEventDelivered completionHandler:^(NSError *error)
+    {
+        if (error != nil) {
+            [self log:error];
+        }
+    }
+    ];
+    
+    NSDictionary *pushNotification = [Courier formatPushNotificationWithContent:content];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationDelivered" object:nil userInfo:pushNotification];
+    
+    completionHandler(notificationPresentationOptions);
+    
+}
+
+- (void)userNotificationCenter:(UNUserNotificationCenter *)center didReceiveNotificationResponse:(UNNotificationResponse *)response withCompletionHandler:(void (^)(void))completionHandler
+{
+    
+    UNNotificationContent *content = response.notification.request.content;
+    NSDictionary *message = content.userInfo;
+    
+    [[Courier shared] trackNotificationWithMessage:message event:CourierPushEventClicked completionHandler:^(NSError *error)
+    {
+        if (error != nil) {
+            [self log:error];
+        }
+    }
+    ];
+    
+    NSDictionary *pushNotification = [Courier formatPushNotificationWithContent:content];
+    [[NSNotificationCenter defaultCenter] postNotificationName:@"pushNotificationClicked" object:nil userInfo:pushNotification];
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        completionHandler();
+    });
+    
+}
+
+- (void)application:(UIApplication *)application didFailToRegisterForRemoteNotificationsWithError:(NSError *)error
+{
+    [self log:error];
+}
+
+- (void)application:(UIApplication *)application didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken
+{
+    
+    [[Courier shared]
+    setAPNSToken:deviceToken
+    onSuccess:^()
+    {
+        // Empty
+    }
+    onFailure:^(NSError *error)
+    {
+        [self log:error];
+    }
+    ];
+    
+}
+
+- (void)log: (NSError*)error {
+    NSString *err = [NSString stringWithFormat:@"%@", error];
+    [Courier log:err];
+}
+
+@end

package/ios/CourierReactNativeModule.m

@@ -2,6 +2,14 @@
 
 @interface RCT_EXTERN_MODULE(CourierReactNativeModule, NSObject)
 
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+  setDebugMode: (BOOL)isDebugging
+)
+
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+  iOSForegroundPresentationOptions: (NSDictionary*)params
+)
+
 RCT_EXTERN_METHOD(
   signIn: (NSString*)accessToken
   withClientKey: (NSString*)clientKey
@@ -15,8 +23,39 @@ RCT_EXTERN_METHOD(
   withRejecter: (RCTPromiseRejectBlock)reject
 )
 
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+  getUserId
+)
+
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+  addAuthenticationListener
+)
+
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+  removeAuthenticationListener: (NSString*)listenerId
+)
+
+RCT_EXTERN_METHOD(
+  getNotificationPermissionStatus: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN_METHOD(
+  requestNotificationPermission: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+  getApnsToken
+)
+
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+  getFcmToken
+)
+
 RCT_EXTERN_METHOD(
-  getUserId: (RCTPromiseResolveBlock)resolve
+  setFcmToken: (NSString*)token
+  withResolver: (RCTPromiseResolveBlock)resolve
   withRejecter: (RCTPromiseRejectBlock)reject
 )
 
@@ -38,7 +77,7 @@ RCT_EXTERN_METHOD(
 )
 
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
-  addInboxListener: (NSString*)listenerId
+  addInboxListener
 )
 
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
@@ -50,4 +89,17 @@ RCT_EXTERN_METHOD(
   withRejecter: (RCTPromiseRejectBlock)reject
 )
 
+RCT_EXTERN_METHOD(
+  fetchNextPageOfMessages: (RCTPromiseResolveBlock)resolve
+  withRejecter: (RCTPromiseRejectBlock)reject
+)
+
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+  setInboxPaginationLimit: (double)limit
+)
+
+RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
+  registerPushNotificationClickedOnKilledState
+)
+
 @end

package/ios/CourierReactNativeModule.swift

@@ -4,9 +4,19 @@ import Courier_iOS
 class CourierReactNativeModule: RCTEventEmitter {
 
     private static let COURIER_ERROR_TAG = "Courier iOS SDK Error"
-    internal static let COURIER_PUSH_NOTIFICATION_CLICKED_EVENT = "pushNotificationClicked"
-    internal static let COURIER_PUSH_NOTIFICATION_DELIVERED_EVENT = "pushNotificationDelivered"
-    private static let COURIER_PUSH_NOTIFICATION_DEBUG_LOG_EVENT = "courierDebugEvent"
+    
+    class LogEvents {
+        internal static let DEBUG_LOG_EVENT = "courierDebugEvent"
+    }
+    
+    class AuthEvents {
+        internal static let USER_CHANGED = "courierAuthUserChanged"
+    }
+    
+    class PushEvents {
+        internal static let CLICKED_EVENT = "pushNotificationClicked"
+        internal static let DELIVERED_EVENT = "pushNotificationDelivered"
+    }
     
     class InboxEvents {
         internal static let INITIAL_LOADING = "inboxInitialLoad"
@@ -14,6 +24,7 @@ class CourierReactNativeModule: RCTEventEmitter {
         internal static let MESSAGES_CHANGED = "inboxMessagesChanged"
     }
     
+    private var authListeners = [String: CourierAuthenticationListener]()
     private var inboxListeners = [String: CourierInboxListener]()
     
     private var hasListeners = false
@@ -44,7 +55,7 @@ class CourierReactNativeModule: RCTEventEmitter {
         // setup listeners
         Courier.shared.logListener = { log in
             self.sendEvent(
-                withName: CourierReactNativeModule.COURIER_PUSH_NOTIFICATION_DEBUG_LOG_EVENT,
+                withName: CourierReactNativeModule.LogEvents.DEBUG_LOG_EVENT,
                 body: log
             )
         }
@@ -63,19 +74,25 @@ class CourierReactNativeModule: RCTEventEmitter {
         notificationCenter.addObserver(
             self,
             selector: #selector(pushNotificationClicked),
-            name: Notification.Name(rawValue: CourierReactNativeModule.COURIER_PUSH_NOTIFICATION_CLICKED_EVENT),
+            name: Notification.Name(rawValue: CourierReactNativeModule.PushEvents.CLICKED_EVENT),
             object: nil
         )
         
         notificationCenter.addObserver(
             self,
             selector: #selector(pushNotificationDelivered),
-            name: Notification.Name(rawValue: CourierReactNativeModule.COURIER_PUSH_NOTIFICATION_DELIVERED_EVENT),
+            name: Notification.Name(rawValue: CourierReactNativeModule.PushEvents.DELIVERED_EVENT),
             object: nil
         )
         
     }
     
+    @objc(setDebugMode:)
+    func setDebugMode(isDebugging: Bool) -> String {
+        Courier.shared.isDebugging = isDebugging
+        return String(describing: Courier.shared.isDebugging)
+    }
+    
     private func sendMessage(name: String, message: [AnyHashable: Any]?) {
         
         guard let message = message else {
@@ -97,7 +114,7 @@ class CourierReactNativeModule: RCTEventEmitter {
         
         lastClickedMessage = notification.userInfo
         sendMessage(
-            name: CourierReactNativeModule.COURIER_PUSH_NOTIFICATION_CLICKED_EVENT,
+            name: CourierReactNativeModule.PushEvents.CLICKED_EVENT,
             message: lastClickedMessage
         )
         
@@ -106,19 +123,23 @@ class CourierReactNativeModule: RCTEventEmitter {
     @objc private func pushNotificationDelivered(notification: Notification) {
         
         sendMessage(
-            name: CourierReactNativeModule.COURIER_PUSH_NOTIFICATION_DELIVERED_EVENT,
+            name: CourierReactNativeModule.PushEvents.DELIVERED_EVENT,
             message: notification.userInfo
         )
         
     }
     
-    @objc func registerPushNotificationClickedOnKilledState() {
+    @objc func registerPushNotificationClickedOnKilledState() -> String {
+        
+        let event = CourierReactNativeModule.PushEvents.CLICKED_EVENT
         
         sendMessage(
-            name: CourierReactNativeModule.COURIER_PUSH_NOTIFICATION_CLICKED_EVENT,
+            name: event,
             message: lastClickedMessage
         )
         
+        return event
+        
     }
     
     @objc(getNotificationPermissionStatus: withRejecter:)
@@ -170,19 +191,42 @@ class CourierReactNativeModule: RCTEventEmitter {
         
     }
 
-    @objc(getUserId: withRejecter:)
-    func getUserId(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+    @objc func getUserId() -> String? {
+        return Courier.shared.userId
+    }
+
+    @objc func addAuthenticationListener() -> String {
+        
+        let listener = Courier.shared.addAuthenticationListener { [weak self] userId in
+            
+            self?.sendEvent(
+                withName: CourierReactNativeModule.AuthEvents.USER_CHANGED,
+                body: userId
+            )
+            
+        }
+        
+        // Create an id and add the listener to the dictionary
+        let id = UUID().uuidString
+        authListeners[id] = listener
         
-        let userId = Courier.shared.userId
-        resolve(userId)
+        return id
         
     }
-
-    @objc(getFcmToken: withRejecter:)
-    func getFcmToken(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+    
+    @objc(removeAuthenticationListener:)
+    func removeAuthenticationListener(listenerId: NSString) -> String {
+        
+        let id = listenerId as String
+        
+        // Remove the listener
+        let listener = authListeners[id]
+        listener?.remove()
         
-        let token = Courier.shared.fcmToken
-        resolve(token)
+        // Remove from dictionary
+        authListeners.removeValue(forKey: id)
+        
+        return id
         
     }
 
@@ -200,41 +244,17 @@ class CourierReactNativeModule: RCTEventEmitter {
         )
     
     }
-
-    @objc(getApnsToken: withRejecter:)
-    func getApnsToken(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-        
-        let token = Courier.shared.apnsToken
-        resolve(token)
-        
+    
+    @objc func getFcmToken() -> String? {
+        return Courier.shared.fcmToken
     }
 
-    @objc(sendPush: withUserId: withTitle: withBody: withProviders: withResolver: withRejecter:)
-    func sendPush(authKey: NSString, userId: NSString, title: NSString, body: NSString, providers: NSArray, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-        
-        guard let courierProviders = providers as? [String] else {
-            reject("No provider supported", CourierReactNativeModule.COURIER_ERROR_TAG, nil)
-            return
-        }
-
-//        Courier.shared.sendPush(
-//            authKey: authKey as String,
-//            userId: userId as String,
-//            title: title as String,
-//            message: body as String,
-//            providers: courierProviders,
-//            onSuccess: { requestId in
-//                resolve(requestId)
-//            },
-//            onFailure: { error in
-//                reject(String(describing: error), CourierReactNative.COURIER_ERROR_TAG, nil)
-//            }
-//        )
-        
+    @objc func getApnsToken() -> String? {
+        return Courier.shared.apnsToken
     }
 
     @objc(iOSForegroundPresentationOptions:)
-    func iOSForegroundPresentationOptions(params: NSDictionary) {
+    func iOSForegroundPresentationOptions(params: NSDictionary) -> String {
         
         let rawValue = params.toPresentationOptions().rawValue
         NotificationCenter.default.post(
@@ -243,13 +263,7 @@ class CourierReactNativeModule: RCTEventEmitter {
             userInfo: ["options": rawValue]
         )
         
-    }
-    
-    @objc(setDebugMode: withResolver: withRejecter:)
-    func setDebugMode(isDebugging: Bool, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) {
-
-        Courier.shared.isDebugging = isDebugging
-        resolve(Courier.shared.isDebugging)
+        return String(describing: rawValue)
         
     }
     
@@ -297,8 +311,7 @@ class CourierReactNativeModule: RCTEventEmitter {
         
     }
     
-    @objc(addInboxListener:)
-    func addInboxListener(listenerId: NSString?) -> String {
+    @objc func addInboxListener() -> String {
         
         let listener = Courier.shared.addInboxListener(
             onInitialLoad: { [weak self] in
@@ -342,15 +355,6 @@ class CourierReactNativeModule: RCTEventEmitter {
         
     }
     
-    @objc(refreshInbox: withRejecter:)
-    func refreshInbox(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-        
-        Courier.shared.refreshInbox {
-            resolve(nil)
-        }
-        
-    }
-    
     @objc(removeInboxListener:)
     func removeInboxListener(listenerId: NSString) -> String {
         
@@ -366,12 +370,42 @@ class CourierReactNativeModule: RCTEventEmitter {
         return id
         
     }
+    
+    @objc(refreshInbox: withRejecter:)
+    func refreshInbox(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        
+        Courier.shared.refreshInbox {
+            resolve(nil)
+        }
+        
+    }
+    
+    @objc(fetchNextPageOfMessages: withRejecter:)
+    func fetchNextPageOfMessages(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+        
+        Courier.shared.fetchNextPageOfMessages(
+            onSuccess: { messages in
+                resolve(messages.map { $0.toDictionary() })
+            },
+            onFailure: { error in
+                reject(String(describing: error), CourierReactNativeModule.COURIER_ERROR_TAG, nil)
+            }
+        )
+        
+    }
+    
+    @objc(setInboxPaginationLimit:)
+    func setInboxPaginationLimit(limit: Double) -> String {
+        Courier.shared.inboxPaginationLimit = Int(limit)
+        return String(describing: Courier.shared.inboxPaginationLimit)
+    }
 
     override func supportedEvents() -> [String]! {
         return [
-            CourierReactNativeModule.COURIER_PUSH_NOTIFICATION_CLICKED_EVENT,
-            CourierReactNativeModule.COURIER_PUSH_NOTIFICATION_DELIVERED_EVENT,
-            CourierReactNativeModule.COURIER_PUSH_NOTIFICATION_DEBUG_LOG_EVENT,
+            CourierReactNativeModule.LogEvents.DEBUG_LOG_EVENT,
+            CourierReactNativeModule.AuthEvents.USER_CHANGED,
+            CourierReactNativeModule.PushEvents.CLICKED_EVENT,
+            CourierReactNativeModule.PushEvents.DELIVERED_EVENT,
             CourierReactNativeModule.InboxEvents.INITIAL_LOADING,
             CourierReactNativeModule.InboxEvents.ERROR,
             CourierReactNativeModule.InboxEvents.MESSAGES_CHANGED

package/ios/CourierReactNativeViewManager.m

@@ -2,9 +2,7 @@
 
 @interface RCT_EXTERN_MODULE(CourierReactNativeViewManager, RCTViewManager)
 
-RCT_EXPORT_VIEW_PROPERTY(lightTheme, NSDictionary)
-
-RCT_EXPORT_VIEW_PROPERTY(darkTheme, NSDictionary)
+RCT_EXPORT_VIEW_PROPERTY(theme, NSDictionary)
 
 RCT_EXPORT_VIEW_PROPERTY(onClickInboxMessageAtIndex, RCTBubblingEventBlock)
 

package/ios/CourierReactNativeViewManager.swift

@@ -15,13 +15,7 @@ class CourierReactNativeViewManager: RCTViewManager {
 
 class CourierReactNativeView : UIView {
     
-    @objc var lightTheme: NSDictionary? = [:] {
-        didSet {
-            refreshInbox()
-        }
-    }
-    
-    @objc var darkTheme: NSDictionary? = [:] {
+    @objc var theme: NSDictionary? = [:] {
         didSet {
             refreshInbox()
         }
@@ -33,19 +27,18 @@ class CourierReactNativeView : UIView {
     
     @objc var onScrollInbox: RCTBubblingEventBlock? = nil
     
-    override init(frame: CGRect) {
-        super.init(frame: frame)
-        refreshInbox()
-    }
-    
-    required init?(coder: NSCoder) {
-        super.init(coder: coder)
-        refreshInbox()
-    }
-    
     private func refreshInbox() {
         
-        subviews.forEach { $0.removeFromSuperview() }
+        // Disable animations
+        UIView.setAnimationsEnabled(false)
+        
+        // Remove all previous views
+        subviews.forEach {
+            $0.removeFromSuperview()
+        }
+        
+        let lightTheme = theme?["light"] as? NSDictionary
+        let darkTheme = theme?["dark"] as? NSDictionary
         
         // Create the view
         let courierInbox = CourierInbox(
@@ -86,6 +79,9 @@ class CourierReactNativeView : UIView {
             courierInbox.trailingAnchor.constraint(equalTo: trailingAnchor),
         ])
         
+        // Enable animations
+        UIView.setAnimationsEnabled(true)
+        
     }
     
     func dictionaryToTheme(dictionary: NSDictionary?) -> CourierInboxTheme? {