Merge pull request #894 from WalletConnect/#888-w3i-date-encoding

#888 w3i date encoding
WalletConnect · Jun 5, 2023 · 83e4b3f · 83e4b3f
2 parents a8b2678 + 85b72be
commit 83e4b3f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/Example/IntegrationTests/Push/PushTests.swift b/Example/IntegrationTests/Push/PushTests.swift
@@ -167,6 +167,7 @@ final class PushTests: XCTestCase {
                 return
             }
             subscriptionTopic = pushSubscription.topic
+            sleep(1)
             Task(priority: .userInitiated) { try! await walletPushClient.deleteSubscription(topic: pushSubscription.topic)}
         }.store(in: &publishers)
 

diff --git a/Sources/WalletConnectPush/Client/Wallet/PushMessagesDatabase.swift b/Sources/WalletConnectPush/Client/Wallet/PushMessagesDatabase.swift
@@ -11,7 +11,9 @@ class PushMessagesDatabase {
     }
 
     func getPushMessages(topic: String) -> [PushMessageRecord] {
-        return store.getAll().filter{$0.topic == topic}
+        return store.getAll()
+            .filter{$0.topic == topic}
+            .sorted{$0.publishedAt > $1.publishedAt}
     }
 
     func deletePushMessages(topic: String) {

diff --git a/Sources/WalletConnectUtils/Encodable.swift b/Sources/WalletConnectUtils/Encodable.swift
@@ -10,8 +10,11 @@ public enum DataConversionError: Error {
 public extension Encodable {
 
     // TODO: Migrate
-    func json() throws -> String {
+    func json(dateEncodingStrategy: JSONEncoder.DateEncodingStrategy? = nil) throws -> String {
         let encoder = JSONEncoder()
+        if let dateEncodingStrategy = dateEncodingStrategy {
+            encoder.dateEncodingStrategy = dateEncodingStrategy
+        }
         encoder.outputFormatting = .withoutEscapingSlashes
         let data = try encoder.encode(self)
         guard let string = String(data: data, encoding: .utf8) else {

diff --git a/Sources/Web3Inbox/WebView/WebViewProxy.swift b/Sources/Web3Inbox/WebView/WebViewProxy.swift
@@ -17,15 +17,15 @@ actor WebViewProxy {
 
     @MainActor
     func respond(_ response: RPCResponse) async throws {
-        let body = try response.json()
+        let body = try response.json(dateEncodingStrategy: .millisecondsSince1970)
         logger.debug("resonding to w3i with \(body)")
         let script = scriptFormatter.formatScript(body: body)
         webView.evaluateJavaScript(script, completionHandler: nil)
     }
 
     @MainActor
     func request(_ request: RPCRequest) async throws {
-        let body = try request.json()
+        let body = try request.json(dateEncodingStrategy: .millisecondsSince1970)
         logger.debug("requesting w3i with \(body)")
         let script = scriptFormatter.formatScript(body: body)
         webView.evaluateJavaScript(script, completionHandler: nil)