Merge pull request #339 from WalletConnect/#336-remove-messages-dupli…

…cates

[Chat] #336 remove messages duplicates

Example/Showcase/Classes/DomainLayer/Chat/AccountNameResolver.swift

@@ -6,7 +6,7 @@ struct AccountNameResolver {
     private static var staticMap: [String: String] = [
         "swift.eth": "eip155:1:0xab16a96d359ec26a11e2c2b3d8f8b8942d5bfcdb",
         "kotlin.eth": "eip155:2:0xab16a96d359ec26a11e2c2b3d8f8b8942d5bfcdb",
-        "js.eth": "eip155:3:0xab16a96d359ec26a11e2c2b3d8f8b8942d5bfcdb",
+        "js.eth": "eip155:3:0xab16a96d359ec26a11e2c2b3d8f8b8942d5bfcdb"
     ]
 
     static func resolveName(_ account: Account) -> String {

Example/Showcase/Classes/PresentationLayer/ChatList/Models/ThreadViewModel.swift

@@ -13,7 +13,7 @@ struct ThreadViewModel: Identifiable {
     }
 
     var title: String {
-        return AccountNameResolver.resolveName(thread.peerAccount) 
+        return AccountNameResolver.resolveName(thread.peerAccount)
     }
 
     var subtitle: String {

Example/Showcase/Classes/PresentationLayer/Import/ImportView.swift

@@ -12,7 +12,7 @@ struct ImportView: View {
                 .padding(.top, 24.0)
 
             TextFieldView(title: "Username", placeholder: "username.eth or 0x0…", input: $presenter.input)
-            
+
             Spacer()
 
             BrandButton(title: "Ok, done", action: {

Example/Showcase/Classes/PresentationLayer/Welcome/WelcomeView.swift

@@ -7,7 +7,7 @@ struct WelcomeView: View {
     @EnvironmentObject var presenter: WelcomePresenter
 
     var body: some View {
-        GeometryReader { geometry in
+        GeometryReader { _ in
             ZStack {
                 Image("LaunchScreen")
                     .resizable()

Sources/Chat/NetworkingInteractor.swift

@@ -8,6 +8,7 @@ protocol NetworkInteracting {
     var socketConnectionStatusPublisher: AnyPublisher<SocketConnectionStatus, Never> { get }
     var requestPublisher: AnyPublisher<RequestSubscriptionPayload, Never> {get}
     var responsePublisher: AnyPublisher<ChatResponse, Never> {get}
+    func respondSuccess(payload: RequestSubscriptionPayload) async throws
     func subscribe(topic: String) async throws
     func request(_ request: JSONRPCRequest<ChatRequestParams>, topic: String, envelopeType: Envelope.EnvelopeType) async throws
     func respond(topic: String, response: JsonRpcResult, tag: Int) async throws
@@ -59,7 +60,13 @@ class NetworkingInteractor: NetworkInteracting {
         try await relayClient.publish(topic: topic, payload: message, tag: request.params.tag)
     }
 
+    func respondSuccess(payload: RequestSubscriptionPayload) async throws {
+        let response = JSONRPCResponse<AnyCodable>(id: payload.request.id, result: AnyCodable(true))
+        try await respond(topic: payload.topic, response: JsonRpcResult.response(response), tag: payload.request.params.responseTag)
+    }
+
     func respond(topic: String, response: JsonRpcResult, tag: Int) async throws {
+        _ = try jsonRpcHistory.resolve(response: response)
         let message = try serializer.serialize(topic: topic, encodable: response.value)
         try await relayClient.publish(topic: topic, payload: message, tag: tag, prompt: false)
     }
@@ -81,8 +88,13 @@ class NetworkingInteractor: NetworkInteracting {
     }
 
     private func handleChatRequest(topic: String, request: JSONRPCRequest<ChatRequestParams>) {
-        let payload = RequestSubscriptionPayload(topic: topic, request: request)
-        requestPublisherSubject.send(payload)
+        do {
+            try jsonRpcHistory.set(topic: topic, request: request)
+            let payload = RequestSubscriptionPayload(topic: topic, request: request)
+            requestPublisherSubject.send(payload)
+        } catch {
+            logger.debug(error)
+        }
     }
 
     private func handleJsonRpcResponse(response: JSONRPCResponse<AnyCodable>) {

Sources/Chat/ProtocolServices/Common/MessagingService.swift

@@ -56,15 +56,16 @@ class MessagingService {
             switch subscriptionPayload.request.params {
             case .message(var message):
                 message.topic = subscriptionPayload.topic
-                handleMessage(message)
+                handleMessage(message, subscriptionPayload)
             default:
                 return
             }
         }.store(in: &publishers)
     }
 
-    private func handleMessage(_ message: Message) {
+    private func handleMessage(_ message: Message, _ payload: RequestSubscriptionPayload) {
         Task(priority: .background) {
+            try await networkingInteractor.respondSuccess(payload: payload)
             await messagesStore.add(message)
             logger.debug("Received message")
             onMessage?(message)

Tests/ChatTests/Mocks/NetworkingInteractorMock.swift

@@ -5,6 +5,7 @@ import WalletConnectUtils
 import WalletConnectRelay
 
 class NetworkingInteractorMock: NetworkInteracting {
+
     var socketConnectionStatusPublisher: AnyPublisher<SocketConnectionStatus, Never> {
         socketConnectionStatusPublisherSubject.eraseToAnyPublisher()
     }
@@ -33,6 +34,10 @@ class NetworkingInteractorMock: NetworkInteracting {
 
     }
 
+    func respondSuccess(payload: RequestSubscriptionPayload) async throws {
+
+    }
+
     private(set) var subscriptions: [String] = []
 
     func subscribe(topic: String) async throws {