chore: handle chainId and accounts data on batch request (#169)

* chore: handle chainId and accounts data on batch request * Refactor message handling * Add tests for batch handling
MetaMask · Jul 15, 2024 · 6408dc3 · 6408dc3
1 parent 5430512
commit 6408dc3
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 3 deletions.
diff --git a/Example/Tests/EthereumTests.swift b/Example/Tests/EthereumTests.swift
@@ -567,15 +567,45 @@ class EthereumTests: XCTestCase {
         let requestId = Ethereum.BATCH_CONNECTION_ID
         let request = SubmittedRequest(method: "metamask_batch")
         ethereum.submittedRequests[requestId] = request
+        let ethereumMainnet = "0x1"
+        let accounts = ["0x1234"]
 
         let resultData: [String: Any] = [
-            "result": [["0x1234"], "0x1"]
+            "result": [["0x1234"], ethereumMainnet]
         ]
 
         ethereum.receiveResponse(resultData, id: requestId)
 
         XCTAssertTrue(mockEthereumDelegate.chainIdChangedCalled)
+        XCTAssertEqual(mockEthereumDelegate.chainId, ethereumMainnet)
         XCTAssertTrue(mockEthereumDelegate.accountChangedCalled)
+        XCTAssertEqual(mockEthereumDelegate.account, accounts.first)
+    }
+
+    func testReceiveDataResponseWithMetamaskBatch() {
+        let requestId = Ethereum.BATCH_CONNECTION_ID
+        let request = SubmittedRequest(method: "metamask_batch")
+        ethereum.submittedRequests[requestId] = request
+        let polygonChainId = "0x89"
+        let accounts = ["0x1234"]
+
+        let message: [String: Any] = [
+            "data": [
+                "id": requestId,
+                "result": ["0xf9990f422f9a", "0x8904d14b2c67b3988ca27"],
+                "chainId": polygonChainId,
+                "accounts": accounts
+            ]
+        ]
+
+        let data = message["data"] as? [String: Any] ?? [:]
+
+        ethereum.handleMessage(data)
+
+        XCTAssertTrue(mockEthereumDelegate.chainIdChangedCalled)
+        XCTAssertEqual(mockEthereumDelegate.chainId, polygonChainId)
+        XCTAssertTrue(mockEthereumDelegate.accountChangedCalled)
+        XCTAssertEqual(mockEthereumDelegate.account, accounts.first)
     }
 
     // MARK: Events

diff --git a/Sources/metamask-ios-sdk/Classes/Ethereum/Ethereum.swift b/Sources/metamask-ios-sdk/Classes/Ethereum/Ethereum.swift
@@ -766,8 +766,18 @@ public class Ethereum {
                     updateAccount(account)
                 }
                 updateChainId(chainId)
-            } else if let result = data["result"] {
-                sendResult(result, id: id)
+            } else {
+                if
+                    let accounts = data["accounts"] as? [String],
+                    let account = accounts.first {
+                    updateAccount(account)
+                }
+                if let chainId = data["chainId"] as? String {
+                    updateChainId(chainId)
+                }
+                if let result = data["result"] {
+                    sendResult(result, id: id)
+                }
             }
         default:
             if let chainId = data["chainId"] as? String {