[Notify] Messages publisher

Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesInteractor.swift

@@ -9,8 +9,8 @@ final class PushMessagesInteractor {
         self.subscription = subscription
     }
 
-    var notifyMessagePublisher: AnyPublisher<NotifyMessageRecord, Never> {
-        return Notify.instance.notifyMessagePublisher
+    var messagesPublisher: AnyPublisher<[NotifyMessageRecord], Never> {
+        return Notify.instance.messagesPublisher(topic: subscription.topic)
     }
 
     func getPushMessages() -> [NotifyMessageRecord] {

Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesPresenter.swift

@@ -8,10 +8,16 @@ final class PushMessagesPresenter: ObservableObject {
     private let router: PushMessagesRouter
     private var disposeBag = Set<AnyCancellable>()
 
-    @Published var pushMessages: [PushMessageViewModel] = []
+    @Published private var pushMessages: [NotifyMessageRecord] = []
+
+    var messages: [PushMessageViewModel] {
+        return pushMessages
+            .sorted { $0.publishedAt > $1.publishedAt }
+            .map { PushMessageViewModel(pushMessageRecord: $0) }
+    }
 
     init(interactor: PushMessagesInteractor, router: PushMessagesRouter) {
-        defer { reloadPushMessages() }
+        defer { setupInitialState() }
         self.interactor = interactor
         self.router = router
     }
@@ -20,7 +26,6 @@ final class PushMessagesPresenter: ObservableObject {
         if let index = indexSet.first {
             interactor.deletePushMessage(id: pushMessages[index].id)
         }
-        reloadPushMessages()
     }
 }
 
@@ -40,27 +45,13 @@ extension PushMessagesPresenter: SceneViewModel {
 
 private extension PushMessagesPresenter {
 
-    func reloadPushMessages() {
-        self.pushMessages = interactor.getPushMessages()
-            .sorted {
-                // Most recent first
-                $0.publishedAt > $1.publishedAt
-            }
-            .map { pushMessageRecord in
-                PushMessageViewModel(pushMessageRecord: pushMessageRecord)
-            }
-
-        interactor.notifyMessagePublisher
+    func setupInitialState() {
+        pushMessages = interactor.getPushMessages()
+
+        interactor.messagesPublisher
             .receive(on: DispatchQueue.main)
-            .sink { [weak self] newPushMessage in
-                let newMessageViewModel = PushMessageViewModel(pushMessageRecord: newPushMessage)
-                guard let index = self?.pushMessages.firstIndex(
-                    where: { $0.pushMessageRecord.publishedAt > newPushMessage.publishedAt }
-                ) else {
-                    self?.pushMessages.append(newMessageViewModel)
-                    return
-                }
-                self?.pushMessages.insert(newMessageViewModel, at: index)
+            .sink { [unowned self] messages in
+                pushMessages = interactor.getPushMessages()
             }
             .store(in: &disposeBag)
     }

Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesView.swift

@@ -11,7 +11,7 @@ struct PushMessagesView: View {
 
             VStack(alignment: .leading, spacing: 16) {
                 ZStack {
-                    if presenter.pushMessages.isEmpty {
+                    if presenter.messages.isEmpty {
                         VStack(spacing: 10) {
                             Image(systemName: "bell.badge.fill")
                                 .resizable()
@@ -29,9 +29,9 @@ struct PushMessagesView: View {
                     }
 
                     VStack {
-                        if !presenter.pushMessages.isEmpty {
+                        if !presenter.messages.isEmpty {
                             List {
-                                ForEach(presenter.pushMessages, id: \.id) { pm in
+                                ForEach(presenter.messages, id: \.id) { pm in
                                     notificationView(pushMessage: pm)
                                         .listRowSeparator(.hidden)
                                         .listRowInsets(EdgeInsets(top: 0, leading: 0, bottom: 16, trailing: 0))

Sources/WalletConnectNotify/Client/Wallet/NotifyClient.swift

@@ -23,7 +23,7 @@ public class NotifyClient {
     }
 
     public var notifyMessagePublisher: AnyPublisher<NotifyMessageRecord, Never> {
-        notifyMessageSubscriber.notifyMessagePublisher
+        return notifyMessageSubscriber.notifyMessagePublisher
     }
 
     public var updateSubscriptionPublisher: AnyPublisher<Result<NotifySubscription, Error>, Never> {
@@ -119,6 +119,10 @@ public class NotifyClient {
     public func isSyncRegistered(account: Account) -> Bool {
         return notifySyncService.isSyncRegistered(account: account)
     }
+
+    public func messagesPublisher(topic: String) -> AnyPublisher<[NotifyMessageRecord], Never> {
+        return notifyStorage.messagesPublisher(topic: topic)
+    }
 }
 
 #if targetEnvironment(simulator)

Sources/WalletConnectNotify/Client/Wallet/NotifyStorage.swift

@@ -18,6 +18,7 @@ final class NotifyStorage: NotifyStoring {
     private let newSubscriptionSubject = PassthroughSubject<NotifySubscription, Never>()
     private let updateSubscriptionSubject = PassthroughSubject<NotifySubscription, Never>()
     private let deleteSubscriptionSubject = PassthroughSubject<String, Never>()
+    private let messagesSubject = PassthroughSubject<[NotifyMessageRecord], Never>()
 
     private let subscriptionStoreDelegate: NotifySubscriptionStoreDelegate
 
@@ -26,7 +27,7 @@ final class NotifyStorage: NotifyStoring {
     }
 
     var updateSubscriptionPublisher: AnyPublisher<NotifySubscription, Never> {
-        return newSubscriptionSubject.eraseToAnyPublisher()
+        return updateSubscriptionSubject.eraseToAnyPublisher()
     }
 
     var deleteSubscriptionPublisher: AnyPublisher<String, Never> {
@@ -37,6 +38,10 @@ final class NotifyStorage: NotifyStoring {
         return subscriptionStore.dataUpdatePublisher
     }
 
+    var messagesPublisher: AnyPublisher<[NotifyMessageRecord], Never> {
+        return messagesSubject.eraseToAnyPublisher()
+    }
+
     init(
         subscriptionStore: SyncStore<NotifySubscription>,
         messagesStore: KeyedDatabase<NotifyMessageRecord>,
@@ -88,6 +93,12 @@ final class NotifyStorage: NotifyStoring {
 
     // MARK: Messages
 
+    func messagesPublisher(topic: String) -> AnyPublisher<[NotifyMessageRecord], Never> {
+        return messagesPublisher
+            .map { $0.filter { $0.topic == topic } }
+            .eraseToAnyPublisher()
+    }
+
     func getMessages(topic: String) -> [NotifyMessageRecord] {
         return messagesStore.getAll(for: topic)
             .sorted{$0.publishedAt > $1.publishedAt}
@@ -110,6 +121,10 @@ final class NotifyStorage: NotifyStoring {
 private extension NotifyStorage {
 
     func setupSubscriptions() {
+        messagesStore.onUpdate = { [unowned self] in
+            messagesSubject.send(messagesStore.getAll())
+        }
+
         subscriptionStore.syncUpdatePublisher.sink { [unowned self] (_, _, update) in
             switch update {
             case .set(let subscription):

Tests/WalletConnectUtilsTests/KeyedDatabaseTests.swift

@@ -37,4 +37,14 @@ final class KeyedDatabaseTests: XCTestCase {
 
         XCTAssertEqual(value, updated)
     }
+
+    func testOnUpdate() {
+        let new = Object(key: "key1", value: "value1")
+
+        var onUpdateCalled = false
+        sut.onUpdate = { onUpdateCalled = true }
+        sut.set(element: new, for: storageKey)
+
+        XCTAssertTrue(onUpdateCalled)
+    }
 }