@trycourier/courier-react-native 4.1.0 → 5.0.0

package/ios/CourierInboxReactNativeManager.swift

@@ -14,6 +14,12 @@ class CourierInboxViewManager: RCTViewManager {
 }
 
 class CourierInboxView : UIView {
+  
+    @objc var canSwipePages: Bool = false {
+        didSet {
+            refresh()
+        }
+    }
     
     @objc var theme: NSDictionary? = [:] {
         didSet {
@@ -39,6 +45,7 @@ class CourierInboxView : UIView {
         let darkTheme = theme?["dark"] as? NSDictionary
         
         let courierInbox = CourierInbox(
+            canSwipePages: self.canSwipePages,
             lightTheme: lightTheme?.toInboxTheme() ?? .defaultLight,
             darkTheme: darkTheme?.toInboxTheme() ?? .defaultDark,
             didClickInboxMessageAtIndex: { [weak self] message, index in
@@ -85,10 +92,160 @@ class CourierInboxView : UIView {
         UIView.setAnimationsEnabled(true)
         
     }
+  
+    internal static func defaultTabStyle() -> CourierStyles.Inbox.TabStyle {
+        return CourierStyles.Inbox.TabStyle(
+            selected: CourierStyles.Inbox.TabItemStyle(
+                font: CourierStyles.Font(
+                    font: UIFont.boldSystemFont(ofSize: UIFont.labelFontSize),
+                    color: .label
+                ),
+                indicator: CourierStyles.Inbox.TabIndicatorStyle(
+                    font: CourierStyles.Font(
+                        font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize),
+                        color: .white
+                    ),
+                    color: .systemBlue
+                )
+            ),
+            unselected: CourierStyles.Inbox.TabItemStyle(
+                font: CourierStyles.Font(
+                    font: UIFont.boldSystemFont(ofSize: UIFont.labelFontSize),
+                    color: .secondaryLabel
+                ),
+                indicator: CourierStyles.Inbox.TabIndicatorStyle(
+                    font: CourierStyles.Font(
+                        font: UIFont.boldSystemFont(ofSize: UIFont.systemFontSize),
+                        color: .label
+                    ),
+                    color: .lightGray
+                )
+            )
+        )
+    }
+  
+    internal static func defaultReadingStyle() -> CourierStyles.Inbox.ReadingSwipeActionStyle {
+      return CourierStyles.Inbox.ReadingSwipeActionStyle(
+        read: CourierStyles.Inbox.SwipeActionStyle(
+            icon: UIImage(systemName: "envelope.fill"),
+            color: .systemGray
+        ),
+        unread: CourierStyles.Inbox.SwipeActionStyle(
+            icon: UIImage(systemName: "envelope.open.fill"),
+            color: .systemBlue
+        )
+      )
+    }
+    
+    internal static func defaultArchivingStyle() -> CourierStyles.Inbox.ArchivingSwipeActionStyle {
+      return CourierStyles.Inbox.ArchivingSwipeActionStyle(
+        archive: CourierStyles.Inbox.SwipeActionStyle(
+            icon: UIImage(systemName: "archivebox.fill"),
+            color: .systemRed
+        )
+      )
+    }
     
 }
 
 internal extension NSDictionary {
+  
+    func toTabStyle() -> CourierStyles.Inbox.TabStyle? {
+      
+        guard let selectedDict = self["selected"] as? NSDictionary, let unselectedDict = self["unselected"] as? NSDictionary else {
+            return nil
+        }
+        
+        guard let selected = selectedDict.toTabItemStyle(), let unselected = unselectedDict.toTabItemStyle() else {
+          return nil
+        }
+        
+        return CourierStyles.Inbox.TabStyle(
+          selected: selected,
+          unselected: unselected
+        )
+      
+    }
+  
+    func toTabItemStyle() -> CourierStyles.Inbox.TabItemStyle? {
+    
+        guard let fontDict = self["font"] as? NSDictionary, let indicatorDict = self["indicator"] as? NSDictionary else {
+            return nil
+        }
+        
+        let font = fontDict.toFont()
+        guard let indicator = indicatorDict.toTabIndicatorStyle() else {
+            return nil
+        }
+        
+        return CourierStyles.Inbox.TabItemStyle(font: font, indicator: indicator)
+      
+    }
+  
+    func toTabIndicatorStyle() -> CourierStyles.Inbox.TabIndicatorStyle? {
+      
+        guard let fontDict = self["font"] as? NSDictionary, let colorString = self["color"] as? String else {
+            return nil
+        }
+      
+        let font = fontDict.toFont()
+        guard let color = colorString.toColor() else {
+          return nil
+        }
+        
+        return CourierStyles.Inbox.TabIndicatorStyle(
+          font: font,
+          color: color
+        )
+      
+    }
+  
+    func toReadingSwipeActionStyle() -> CourierStyles.Inbox.ReadingSwipeActionStyle? {
+      
+        guard let readDict = self["read"] as? NSDictionary, let unreadDict = self["unread"] as? NSDictionary else {
+            return nil
+        }
+        
+        guard let read = readDict.toSwipeActionStyle(), let unread = unreadDict.toSwipeActionStyle() else {
+            return nil
+        }
+        
+        return CourierStyles.Inbox.ReadingSwipeActionStyle(
+            read: read,
+            unread: unread
+        )
+      
+    }
+  
+    func toArchivingSwipeActionStyle() -> CourierStyles.Inbox.ArchivingSwipeActionStyle? {
+      
+        // TODO: Icon
+      
+        guard let archiveDict = self["archive"] as? NSDictionary else {
+            return nil
+        }
+        
+        guard let archive = archiveDict.toSwipeActionStyle() else {
+            return nil
+        }
+        
+        return CourierStyles.Inbox.ArchivingSwipeActionStyle(archive: archive)
+      
+    }
+  
+    func toSwipeActionStyle() -> CourierStyles.Inbox.SwipeActionStyle? {
+      
+        // TODO: Icon
+      
+        guard let colorString = self["color"] as? String else {
+            return nil
+        }
+        
+        let color = colorString.toColor() ?? .systemBlue
+        
+        return CourierStyles.Inbox.SwipeActionStyle(icon: nil, color: color)
+      
+    }
     
     func toUnreadIndicatorStyle() -> CourierStyles.Inbox.UnreadIndicatorStyle {
         
@@ -137,6 +294,10 @@ internal extension NSDictionary {
         let defaultTheme = CourierInboxTheme()
         
         let brandId = self["brandId"] as? String
+        let tabIndicatorColor = self["tabIndicatorColor"] as? String
+        let tabStyle = self["tabStyle"] as? NSDictionary
+        let readingSwipeActionStyle = self["readingSwipeActionStyle"] as? NSDictionary
+        let archivingSwipeActionStyle = self["archivingSwipeActionStyle"] as? NSDictionary
         let unreadIndicatorStyle = self["unreadIndicatorStyle"] as? NSDictionary
         let loadingIndicatorColor = self["loadingIndicatorColor"] as? String
         let titleStyle = self["titleStyle"] as? NSDictionary
@@ -151,6 +312,10 @@ internal extension NSDictionary {
         
         return CourierInboxTheme(
             brandId: brandId,
+            tabIndicatorColor: tabIndicatorColor?.toColor(),
+            tabStyle: tabStyle?.toTabStyle() ?? CourierInboxView.defaultTabStyle(),
+            readingSwipeActionStyle: readingSwipeActionStyle?.toReadingSwipeActionStyle() ?? CourierInboxView.defaultReadingStyle(),
+            archivingSwipeActionStyle: archivingSwipeActionStyle?.toArchivingSwipeActionStyle() ?? CourierInboxView.defaultArchivingStyle(),
             messageAnimationStyle: messageAnimationStyle?.toRowAnimation() ?? .left,
             loadingIndicatorColor: loadingIndicatorColor?.toColor(),
             unreadIndicatorStyle: unreadIndicatorStyle?.toUnreadIndicatorStyle() ?? defaultTheme.unreadIndicatorStyle,

package/ios/CourierReactNativeDelegate.m

@@ -22,7 +22,7 @@ NSUInteger notificationPresentationOptions = UNNotificationPresentationOptionNon
     if (self) {
         
         // Set the user agent
-        Courier.agent = [CourierAgent reactNativeIOS:@"4.1.0"];
+        Courier.agent = [CourierAgent reactNativeIOS:@"5.0.0"];
         
         // Register for remote notifications
         UIApplication *app = [UIApplication sharedApplication];

package/ios/CourierReactNativeEventEmitter.swift

@@ -14,7 +14,7 @@ internal class CourierReactNativeEventEmitter: RCTEventEmitter {
         
         // Set the user agent
         // Used to know the platform performing requests
-        Courier.agent = CourierAgent.reactNativeIOS("4.1.0")
+        Courier.agent = CourierAgent.reactNativeIOS("5.0.0")
         
     }
     

package/ios/CourierReactNativeModule.m

@@ -109,7 +109,13 @@ RCT_EXTERN_METHOD(
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
   addInboxListener: (NSString*)loadingId
   withErrorId: (NSString*)errorId
-  withMessagesId: (NSString*)messagesId
+  withUnreadCountId: (NSString*)unreadCountId
+  withFeedId: (NSString*)feedId
+  withArchiveId: (NSString*)archiveId
+  withPageAddedId: (NSString*)pageAddedId
+  withMessageChangedId: (NSString*)messageChangedId
+  withMessageAddedId: (NSString*)messageAddedId
+  withMessageRemovedId: (NSString*)messageRemovedId
 )
 
 RCT_EXTERN__BLOCKING_SYNCHRONOUS_METHOD(
@@ -126,7 +132,8 @@ RCT_EXTERN_METHOD(
 )
 
 RCT_EXTERN_METHOD(
-  fetchNextPageOfMessages: (RCTPromiseResolveBlock)resolve
+  fetchNextPageOfMessages: (NSString*)inboxMessageFeed
+  withResolver: (RCTPromiseResolveBlock)resolve
   withRejecter: (RCTPromiseRejectBlock)reject
 )
 

package/ios/CourierSharedModule.swift

@@ -298,49 +298,123 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
         
     }
     
-    @objc(addInboxListener: withErrorId: withMessagesId:)
-    func addInboxListener(loadingId: String, errorId: String, messagesId: String) -> String {
+    @objc(addInboxListener:withErrorId:withUnreadCountId:withFeedId:withArchiveId:withPageAddedId:withMessageChangedId:withMessageAddedId:withMessageRemovedId:)
+    func addInboxListener(loadingId: String, errorId: String, unreadCountId: String, feedId: String, archiveId: String, pageAddedId: String, messageChangedId: String, messageAddedId: String, messageRemovedId: String) -> String {
         
         // Add the events
-        nativeEmitters.append(contentsOf: [loadingId, errorId, messagesId])
+        nativeEmitters.append(contentsOf: [loadingId, errorId, unreadCountId, feedId, archiveId, pageAddedId, messageChangedId, messageAddedId, messageRemovedId])
         
         // Create the new listener
         let listener = Courier.shared.addInboxListener(
-            onInitialLoad: { [weak self] in
-                self?.broadcast(
-                    name: loadingId,
-                    body: nil
-                )
-            },
-            onError: { [weak self] error in
-                self?.broadcast(
-                    name: errorId,
-                    body: String(describing: error)
-                )
-            },
-            onMessagesChanged: { [weak self] messages, unreadMessageCount, totalMessageCount, canPaginate in
-                
-                do {
-                    
-                    let json: [String: Any] = [
-                        "messages": try messages.map { try $0.toJson() ?? "" },
-                        "unreadMessageCount": unreadMessageCount,
-                        "totalMessageCount": totalMessageCount,
-                        "canPaginate": canPaginate
-                    ]
-                    
-                    self?.broadcast(
-                        name: messagesId,
-                        body: json
-                    )
-                    
-                } catch {
-                    
-                    Courier.shared.client?.error(error.localizedDescription)
-                    
-                }
-                
+          onLoading: { [weak self] in
+            self?.broadcast(
+                name: loadingId,
+                body: nil
+            )
+          },
+          onError: { [weak self] error in
+              self?.broadcast(
+                  name: errorId,
+                  body: String(describing: error)
+              )
+          },
+          onUnreadCountChanged: { [weak self] unreadCount in
+            self?.broadcast(
+                name: unreadCountId,
+                body: unreadCount
+            )
+          },
+          onFeedChanged: { [weak self] set in
+            do {
+              let json: [String: Any] = [
+                "messages": try set.messages.map { try $0.toJson() ?? "" },
+                "totalMessageCount": set.totalCount,
+                "canPaginate": set.canPaginate
+              ]
+              self?.broadcast(
+                name: feedId,
+                body: json
+              )
+            } catch {
+              Courier.shared.client?.error(error.localizedDescription)
+            }
+          },
+          onArchiveChanged: { [weak self] set in
+            do {
+              let json: [String: Any] = [
+                "messages": try set.messages.map { try $0.toJson() ?? "" },
+                "totalMessageCount": set.totalCount,
+                "canPaginate": set.canPaginate
+              ]
+              self?.broadcast(
+                name: archiveId,
+                body: json
+              )
+            } catch {
+              Courier.shared.client?.error(error.localizedDescription)
+            }
+          },
+          onPageAdded: { [weak self] feed, set in
+            do {
+              let json: [String: Any] = [
+                "feed": feed == .archived ? "archived" : "feed",
+                "messages": try set.messages.map { try $0.toJson() ?? "" },
+                "totalMessageCount": set.totalCount,
+                "canPaginate": set.canPaginate
+              ]
+              self?.broadcast(
+                name: pageAddedId,
+                body: json
+              )
+            } catch {
+              Courier.shared.client?.error(error.localizedDescription)
+            }
+          },
+          onMessageChanged: { [weak self] feed, index, message in
+            do {
+              let json: [String: Any] = [
+                "feed": feed == .archived ? "archived" : "feed",
+                "index": index,
+                "message": try message.toJson() ?? "",
+              ]
+              self?.broadcast(
+                name: messageChangedId,
+                body: json
+              )
+            } catch {
+              Courier.shared.client?.error(error.localizedDescription)
             }
+          },
+          onMessageAdded: { [weak self] feed, index, message in
+            do {
+              let json: [String: Any] = [
+                "feed": feed == .archived ? "archived" : "feed",
+                "index": index,
+                "message": try message.toJson() ?? "",
+              ]
+              self?.broadcast(
+                name: messageAddedId,
+                body: json
+              )
+            } catch {
+              Courier.shared.client?.error(error.localizedDescription)
+            }
+          },
+          onMessageRemoved: { [weak self] feed, index, message in
+            do {
+              let json: [String: Any] = [
+                "feed": feed == .archived ? "archived" : "feed",
+                "index": index,
+                "message": try message.toJson() ?? "",
+              ]
+              self?.broadcast(
+                name: messageRemovedId,
+                body: json
+              )
+            } catch {
+              Courier.shared.client?.error(error.localizedDescription)
+            }
+          }
         )
         
         let id = UUID().uuidString
@@ -389,20 +463,17 @@ class CourierSharedModule: CourierReactNativeEventEmitter {
         
     }
     
-    @objc(fetchNextPageOfMessages: withRejecter:)
-    func fetchNextPageOfMessages(resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
-        
-        Task {
-            
-            do {
-                let messages = try await Courier.shared.fetchNextInboxPage()
-                resolve(try messages.map { try $0.toJson() ?? "" })
-            } catch {
-                Rejections.sharedError(reject, error: error)
-            }
-            
+    @objc(fetchNextPageOfMessages:withResolver:withRejecter:)
+    func fetchNextPageOfMessages(inboxMessageFeed: NSString, resolve: @escaping RCTPromiseResolveBlock, reject: @escaping RCTPromiseRejectBlock) -> Void {
+      Task {
+        do {
+          let value: InboxMessageFeed = inboxMessageFeed == "archived" ? .feed : .archived
+          let messages = try await Courier.shared.fetchNextInboxPage(value)
+          resolve(try messages.map { try $0.toJson() ?? "" })
+        } catch {
+          Rejections.sharedError(reject, error: error)
         }
-        
+      }
     }
 
     override func supportedEvents() -> [String]! {

package/ios/Utils.swift

@@ -51,7 +51,6 @@ internal extension String {
         switch self.lowercased() {
             case "none": return .none
             case "singleLine": return .singleLine
-            case "singleLineEtched": return .singleLineEtched
             default: return .singleLine
         }
         
@@ -60,7 +59,7 @@ internal extension String {
     func toSelectionStyle() -> UITableViewCell.SelectionStyle? {
         
         switch self.lowercased() {
-            case "none": return .none
+            case "none": return UITableViewCell.SelectionStyle.none
             case "blue": return .blue
             case "gray": return .gray
             case "default": return .default

package/lib/commonjs/Modules.js

@@ -20,6 +20,11 @@ class Modules {
       }
     });
   }
+  static getNativeComponent(componentName) {
+    return _reactNative.UIManager.getViewManagerConfig(componentName) != null ? (0, _reactNative.requireNativeComponent)(componentName) : () => {
+      throw new Error(Modules.LINKING_ERROR);
+    };
+  }
 }
 exports.Modules = Modules;
 //# sourceMappingURL=Modules.js.map

package/lib/commonjs/Modules.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","Modules","LINKING_ERROR","Platform","select","ios","default","Client","getNativeModule","NativeModules","CourierClientModule","Shared","CourierSharedModule","System","CourierSystemModule","nativeModule","Proxy","get","Error","exports"],"sourceRoot":"../../src","sources":["Modules.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEO,MAAMC,OAAO,CAAC;EAEnB,OAAgBC,aAAa,GAC7B,2FAA2F,GAC3FC,qBAAQ,CAACC,MAAM,CAAC;IAAEC,GAAG,EAAE,gCAAgC;IAAEC,OAAO,EAAE;EAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;EAE/B,OAAgBC,MAAM,GAAGN,OAAO,CAACO,eAAe,CAACC,0BAAa,CAACC,mBAAmB,CAAC;EACnF,OAAgBC,MAAM,GAAGV,OAAO,CAACO,eAAe,CAACC,0BAAa,CAACG,mBAAmB,CAAC;EACnF,OAAgBC,MAAM,GAAGZ,OAAO,CAACO,eAAe,CAACC,0BAAa,CAACK,mBAAmB,CAAC;EAEnF,OAAON,eAAeA,CAAIO,YAA2B,EAAK;IACxD,OAAOA,YAAY,GACfA,YAAY,GACZ,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;MACEC,GAAGA,CAAA,EAAG;QACJ,MAAM,IAAIC,KAAK,CAACjB,OAAO,CAACC,aAAa,CAAC;MACxC;IACF,CACF,CAAM;EACZ;AAEF;AAACiB,OAAA,CAAAlB,OAAA,GAAAA,OAAA","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","Modules","LINKING_ERROR","Platform","select","ios","default","Client","getNativeModule","NativeModules","CourierClientModule","Shared","CourierSharedModule","System","CourierSystemModule","nativeModule","Proxy","get","Error","getNativeComponent","componentName","UIManager","getViewManagerConfig","requireNativeComponent","exports"],"sourceRoot":"../../src","sources":["Modules.tsx"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEO,MAAMC,OAAO,CAAC;EAEnB,OAAgBC,aAAa,GAC7B,2FAA2F,GAC3FC,qBAAQ,CAACC,MAAM,CAAC;IAAEC,GAAG,EAAE,gCAAgC;IAAEC,OAAO,EAAE;EAAG,CAAC,CAAC,GACvE,sDAAsD,GACtD,+BAA+B;EAE/B,OAAgBC,MAAM,GAAGN,OAAO,CAACO,eAAe,CAACC,0BAAa,CAACC,mBAAmB,CAAC;EACnF,OAAgBC,MAAM,GAAGV,OAAO,CAACO,eAAe,CAACC,0BAAa,CAACG,mBAAmB,CAAC;EACnF,OAAgBC,MAAM,GAAGZ,OAAO,CAACO,eAAe,CAACC,0BAAa,CAACK,mBAAmB,CAAC;EAEnF,OAAON,eAAeA,CAAIO,YAA2B,EAAK;IACxD,OAAOA,YAAY,GACfA,YAAY,GACZ,IAAIC,KAAK,CACP,CAAC,CAAC,EACF;MACEC,GAAGA,CAAA,EAAG;QACJ,MAAM,IAAIC,KAAK,CAACjB,OAAO,CAACC,aAAa,CAAC;MACxC;IACF,CACF,CAAM;EACZ;EAEA,OAAOiB,kBAAkBA,CAACC,aAAqB,EAAE;IAC/C,OAAOC,sBAAS,CAACC,oBAAoB,CAACF,aAAa,CAAC,IAAI,IAAI,GACxD,IAAAG,mCAAsB,EAAMH,aAAa,CAAC,GAC1C,MAAM;MACJ,MAAM,IAAIF,KAAK,CAACjB,OAAO,CAACC,aAAa,CAAC;IACxC,CAAC;EACP;AAEF;AAACsB,OAAA,CAAAvB,OAAA,GAAAA,OAAA","ignoreList":[]}

package/lib/commonjs/index.js

@@ -617,18 +617,30 @@ class Courier {
    * @param {Object} props - The properties object.
    * @param {Function} [props.onInitialLoad] - Callback function called when the inbox is initially loaded.
    * @param {Function} [props.onError] - Callback function called when an error occurs. Receives the error message as a parameter.
-   * @param {Function} [props.onMessagesChanged] - Callback function called when messages change. Receives updated messages, unread count, total count, and pagination status.
+   * @param {Function} [props.onUnreadCountChanged] - Callback function called when the unread count changes.
+   * @param {Function} [props.onFeedChanged] - Callback function called when the feed changes.
+   * @param {Function} [props.onArchiveChanged] - Callback function called when the archive changes.
+   * @param {Function} [props.onPageAdded] - Callback function called when a new page is added.
+   * @param {Function} [props.onMessageChanged] - Callback function called when a message changes.
+   * @param {Function} [props.onMessageAdded] - Callback function called when a new message is added.
+   * @param {Function} [props.onMessageRemoved] - Callback function called when a message is removed.
    * @returns {CourierInboxListener} A listener object that can be used to remove the listener later.
    */
   addInboxListener(props) {
     const listenerIds = {
       loading: `inbox_loading_${_utils.Utils.generateUUID()}`,
       error: `inbox_error_${_utils.Utils.generateUUID()}`,
-      messages: `inbox_messages_${_utils.Utils.generateUUID()}`
+      unreadCount: `inbox_unread_count_${_utils.Utils.generateUUID()}`,
+      feed: `inbox_feed_${_utils.Utils.generateUUID()}`,
+      archive: `inbox_archive_${_utils.Utils.generateUUID()}`,
+      pageAdded: `inbox_page_added_${_utils.Utils.generateUUID()}`,
+      messageChanged: `inbox_message_changed_${_utils.Utils.generateUUID()}`,
+      messageAdded: `inbox_message_added_${_utils.Utils.generateUUID()}`,
+      messageRemoved: `inbox_message_removed_${_utils.Utils.generateUUID()}`
     };
 
     // Set the listener id
-    const id = _Modules.Modules.Shared.addInboxListener(listenerIds.loading, listenerIds.error, listenerIds.messages);
+    const id = _Modules.Modules.Shared.addInboxListener(listenerIds.loading, listenerIds.error, listenerIds.unreadCount, listenerIds.feed, listenerIds.archive, listenerIds.pageAdded, listenerIds.messageChanged, listenerIds.messageAdded, listenerIds.messageRemoved);
 
     // Create the initial listeners
     const listener = new _CourierInboxListener.CourierInboxListener(id);
@@ -640,25 +652,63 @@ class Courier {
       var _props$onError;
       (_props$onError = props.onError) === null || _props$onError === void 0 ? void 0 : _props$onError.call(props, event);
     });
-    listener.onMessagesChanged = this.sharedBroadcaster.addListener(listenerIds.messages, event => {
-      var _props$onMessagesChan;
-      // Convert JSON strings to InboxMessage objects
-      const convertedMessages = event.messages.map(jsonString => {
-        try {
-          const parsedMessage = JSON.parse(jsonString);
-          return parsedMessage;
-        } catch (error) {
-          Courier.log(`Error parsing message: ${error}`);
-          return null;
-        }
-      }).filter(message => message !== null);
-      (_props$onMessagesChan = props.onMessagesChanged) === null || _props$onMessagesChan === void 0 ? void 0 : _props$onMessagesChan.call(props, convertedMessages, event.unreadMessageCount, event.totalMessageCount, event.canPaginate);
+    listener.onUnreadCountChanged = this.sharedBroadcaster.addListener(listenerIds.unreadCount, event => {
+      var _props$onUnreadCountC;
+      (_props$onUnreadCountC = props.onUnreadCountChanged) === null || _props$onUnreadCountC === void 0 ? void 0 : _props$onUnreadCountC.call(props, event);
+    });
+    listener.onFeedChanged = this.sharedBroadcaster.addListener(listenerIds.feed, event => {
+      var _props$onFeedChanged;
+      const convertedMessages = this.convertMessages(event.messages);
+      (_props$onFeedChanged = props.onFeedChanged) === null || _props$onFeedChanged === void 0 ? void 0 : _props$onFeedChanged.call(props, convertedMessages, event.totalMessageCount, event.canPaginate);
+    });
+    listener.onArchiveChanged = this.sharedBroadcaster.addListener(listenerIds.archive, event => {
+      var _props$onArchiveChang;
+      const convertedMessages = this.convertMessages(event.messages);
+      (_props$onArchiveChang = props.onArchiveChanged) === null || _props$onArchiveChang === void 0 ? void 0 : _props$onArchiveChang.call(props, convertedMessages, event.totalMessageCount, event.canPaginate);
+    });
+    listener.onPageAdded = this.sharedBroadcaster.addListener(listenerIds.pageAdded, event => {
+      var _props$onPageAdded;
+      const convertedMessages = this.convertMessages(event.messages);
+      (_props$onPageAdded = props.onPageAdded) === null || _props$onPageAdded === void 0 ? void 0 : _props$onPageAdded.call(props, event.feed === 'archived' ? 'archived' : 'feed', convertedMessages, event.totalMessageCount, event.canPaginate);
+    });
+    listener.onMessageChanged = this.sharedBroadcaster.addListener(listenerIds.messageChanged, event => {
+      var _props$onMessageChang;
+      const convertedMessage = this.convertMessage(event.message);
+      (_props$onMessageChang = props.onMessageChanged) === null || _props$onMessageChang === void 0 ? void 0 : _props$onMessageChang.call(props, event.feed === 'archived' ? 'archived' : 'feed', event.index, convertedMessage);
+    });
+    listener.onMessageAdded = this.sharedBroadcaster.addListener(listenerIds.messageAdded, event => {
+      var _props$onMessageAdded;
+      const convertedMessage = this.convertMessage(event.message);
+      (_props$onMessageAdded = props.onMessageAdded) === null || _props$onMessageAdded === void 0 ? void 0 : _props$onMessageAdded.call(props, event.feed === 'archived' ? 'archived' : 'feed', event.index, convertedMessage);
+    });
+    listener.onMessageRemoved = this.sharedBroadcaster.addListener(listenerIds.messageRemoved, event => {
+      var _props$onMessageRemov;
+      const convertedMessage = this.convertMessage(event.message);
+      (_props$onMessageRemov = props.onMessageRemoved) === null || _props$onMessageRemov === void 0 ? void 0 : _props$onMessageRemov.call(props, event.feed === 'archived' ? 'archived' : 'feed', event.index, convertedMessage);
     });
 
     // Add listener to manager
     this.inboxListeners.set(id, listener);
     return listener;
   }
+  convertMessages(messages) {
+    return messages.map(jsonString => {
+      try {
+        return JSON.parse(jsonString);
+      } catch (error) {
+        Courier.log(`Error parsing message: ${error}`);
+        return null;
+      }
+    }).filter(message => message !== null);
+  }
+  convertMessage(message) {
+    try {
+      return JSON.parse(message);
+    } catch (error) {
+      Courier.log(`Error parsing message: ${error}`);
+      throw error;
+    }
+  }
 
   /**
    * Removes a specific inbox listener.
@@ -672,12 +722,18 @@ class Courier {
 
     // Remove the listener
     if (this.inboxListeners.has(props.listenerId)) {
-      var _listener$onInitialLo, _listener$onError, _listener$onMessagesC;
+      var _listener$onInitialLo, _listener$onError, _listener$onUnreadCou, _listener$onFeedChang, _listener$onArchiveCh, _listener$onPageAdded, _listener$onMessageCh, _listener$onMessageAd, _listener$onMessageRe;
       // Remove emitters
       const listener = this.inboxListeners.get(props.listenerId);
       listener === null || listener === void 0 || (_listener$onInitialLo = listener.onInitialLoad) === null || _listener$onInitialLo === void 0 ? void 0 : _listener$onInitialLo.remove();
       listener === null || listener === void 0 || (_listener$onError = listener.onError) === null || _listener$onError === void 0 ? void 0 : _listener$onError.remove();
-      listener === null || listener === void 0 || (_listener$onMessagesC = listener.onMessagesChanged) === null || _listener$onMessagesC === void 0 ? void 0 : _listener$onMessagesC.remove();
+      listener === null || listener === void 0 || (_listener$onUnreadCou = listener.onUnreadCountChanged) === null || _listener$onUnreadCou === void 0 ? void 0 : _listener$onUnreadCou.remove();
+      listener === null || listener === void 0 || (_listener$onFeedChang = listener.onFeedChanged) === null || _listener$onFeedChang === void 0 ? void 0 : _listener$onFeedChang.remove();
+      listener === null || listener === void 0 || (_listener$onArchiveCh = listener.onArchiveChanged) === null || _listener$onArchiveCh === void 0 ? void 0 : _listener$onArchiveCh.remove();
+      listener === null || listener === void 0 || (_listener$onPageAdded = listener.onPageAdded) === null || _listener$onPageAdded === void 0 ? void 0 : _listener$onPageAdded.remove();
+      listener === null || listener === void 0 || (_listener$onMessageCh = listener.onMessageChanged) === null || _listener$onMessageCh === void 0 ? void 0 : _listener$onMessageCh.remove();
+      listener === null || listener === void 0 || (_listener$onMessageAd = listener.onMessageAdded) === null || _listener$onMessageAd === void 0 ? void 0 : _listener$onMessageAd.remove();
+      listener === null || listener === void 0 || (_listener$onMessageRe = listener.onMessageRemoved) === null || _listener$onMessageRe === void 0 ? void 0 : _listener$onMessageRe.remove();
 
       // Remove the listener
       this.inboxListeners.delete(props.listenerId);
@@ -694,10 +750,16 @@ class Courier {
 
     // Remove all items from inboxListeners
     this.inboxListeners.forEach(listener => {
-      var _listener$onInitialLo2, _listener$onError2, _listener$onMessagesC2;
+      var _listener$onInitialLo2, _listener$onError2, _listener$onUnreadCou2, _listener$onFeedChang2, _listener$onArchiveCh2, _listener$onPageAdded2, _listener$onMessageCh2, _listener$onMessageAd2, _listener$onMessageRe2;
       listener === null || listener === void 0 || (_listener$onInitialLo2 = listener.onInitialLoad) === null || _listener$onInitialLo2 === void 0 ? void 0 : _listener$onInitialLo2.remove();
       listener === null || listener === void 0 || (_listener$onError2 = listener.onError) === null || _listener$onError2 === void 0 ? void 0 : _listener$onError2.remove();
-      listener === null || listener === void 0 || (_listener$onMessagesC2 = listener.onMessagesChanged) === null || _listener$onMessagesC2 === void 0 ? void 0 : _listener$onMessagesC2.remove();
+      listener === null || listener === void 0 || (_listener$onUnreadCou2 = listener.onUnreadCountChanged) === null || _listener$onUnreadCou2 === void 0 ? void 0 : _listener$onUnreadCou2.remove();
+      listener === null || listener === void 0 || (_listener$onFeedChang2 = listener.onFeedChanged) === null || _listener$onFeedChang2 === void 0 ? void 0 : _listener$onFeedChang2.remove();
+      listener === null || listener === void 0 || (_listener$onArchiveCh2 = listener.onArchiveChanged) === null || _listener$onArchiveCh2 === void 0 ? void 0 : _listener$onArchiveCh2.remove();
+      listener === null || listener === void 0 || (_listener$onPageAdded2 = listener.onPageAdded) === null || _listener$onPageAdded2 === void 0 ? void 0 : _listener$onPageAdded2.remove();
+      listener === null || listener === void 0 || (_listener$onMessageCh2 = listener.onMessageChanged) === null || _listener$onMessageCh2 === void 0 ? void 0 : _listener$onMessageCh2.remove();
+      listener === null || listener === void 0 || (_listener$onMessageAd2 = listener.onMessageAdded) === null || _listener$onMessageAd2 === void 0 ? void 0 : _listener$onMessageAd2.remove();
+      listener === null || listener === void 0 || (_listener$onMessageRe2 = listener.onMessageRemoved) === null || _listener$onMessageRe2 === void 0 ? void 0 : _listener$onMessageRe2.remove();
     });
     this.inboxListeners.clear();
   }
@@ -715,8 +777,8 @@ class Courier {
    * Fetches the next page of inbox messages.
    * @returns {Promise<InboxMessage[]>} A promise that resolves with an array of fetched inbox messages.
    */
-  async fetchNextPageOfMessages() {
-    const messages = await _Modules.Modules.Shared.fetchNextPageOfMessages();
+  async fetchNextPageOfMessages(props) {
+    const messages = await _Modules.Modules.Shared.fetchNextPageOfMessages(props.inboxMessageFeed);
     return messages.map(message => JSON.parse(message));
   }
 }