diff --git a/Example/DApp/Auth/AuthView.swift b/Example/DApp/Auth/AuthView.swift
index d3e699ed3..e39211e9a 100644
--- a/Example/DApp/Auth/AuthView.swift
+++ b/Example/DApp/Auth/AuthView.swift
@@ -3,39 +3,38 @@ import SwiftUI
 struct AuthView: View {
 
     @ObservedObject var viewModel: AuthViewModel
-    
+
     var body: some View {
         VStack(spacing: 16.0) {
-            
+
             Spacer()
-            
+
             Image(uiImage: viewModel.qrImage ?? UIImage())
                 .interpolation(.none)
                 .resizable()
                 .frame(width: 300, height: 300)
-            
+
             signingLabel()
                 .frame(maxWidth: .infinity)
-            
+
             Spacer()
-            
+
             Button("Connect Wallet", action: { })
                 .buttonStyle(CircleButtonStyle())
-            
+
             Button("Copy URI", action: { viewModel.copyDidPressed() })
                 .buttonStyle(CircleButtonStyle())
-            
+
             Button("Deeplink", action: { viewModel.deeplinkPressed() })
                 .buttonStyle(CircleButtonStyle())
-            
-            
+
         }
         .padding(16.0)
         .onAppear { Task(priority: .userInitiated) {
             try await viewModel.setupInitialState()
         }}
     }
-    
+
     @ViewBuilder
     private func signingLabel() -> some View {
         switch viewModel.state {
diff --git a/Example/DApp/Sign/Accounts/AccountsViewController.swift b/Example/DApp/Sign/Accounts/AccountsViewController.swift
index ad29010ae..a7e263999 100644
--- a/Example/DApp/Sign/Accounts/AccountsViewController.swift
+++ b/Example/DApp/Sign/Accounts/AccountsViewController.swift
@@ -38,7 +38,6 @@ final class AccountsViewController: UIViewController, UITableViewDataSource, UIT
         super.viewDidLoad()
         navigationItem.title = "Accounts"
 
-
         navigationItem.rightBarButtonItem = UIBarButtonItem(
             title: "Disconnect",
             style: .plain,
@@ -58,7 +57,7 @@ final class AccountsViewController: UIViewController, UITableViewDataSource, UIT
     func proposePushSubscription() {
         let account = session.namespaces.values.first!.accounts.first!
 
-        Task(priority: .high){ try! await Push.dapp.propose(account: account, topic: session.pairingTopic)}
+        Task(priority: .high) { try! await Push.dapp.propose(account: account, topic: session.pairingTopic)}
         Push.dapp.proposalResponsePublisher.sink { result in
             switch result {
             case .success(let subscription):
diff --git a/Example/DApp/Sign/Connect/ConnectView.swift b/Example/DApp/Sign/Connect/ConnectView.swift
index 7004411a0..0ffbd3d23 100644
--- a/Example/DApp/Sign/Connect/ConnectView.swift
+++ b/Example/DApp/Sign/Connect/ConnectView.swift
@@ -31,7 +31,7 @@ final class ConnectView: UIView {
         return button
     }()
 
-    let invisibleUriLabel: UILabel = { 
+    let invisibleUriLabel: UILabel = {
         let label = UILabel(frame: CGRect(origin: .zero, size: .init(width: 1, height: 1)))
         label.numberOfLines = 0
         label.textColor = .clear
diff --git a/Example/DApp/Sign/Connect/ConnectViewController.swift b/Example/DApp/Sign/Connect/ConnectViewController.swift
index 02c9020f7..655a1c251 100644
--- a/Example/DApp/Sign/Connect/ConnectViewController.swift
+++ b/Example/DApp/Sign/Connect/ConnectViewController.swift
@@ -34,7 +34,7 @@ class ConnectViewController: UIViewController, UITableViewDataSource, UITableVie
                 self.connectView.copyButton.isHidden = false
             }
         }
-        
+
         connectView.invisibleUriLabel.text = uri.absoluteString
         connectView.copyButton.addTarget(self, action: #selector(copyURI), for: .touchUpInside)
         connectView.connectWalletButton.addTarget(self, action: #selector(connectWithExampleWallet), for: .touchUpInside)
diff --git a/Example/EchoUITests/Engine/App.swift b/Example/EchoUITests/Engine/App.swift
index e273bbabc..7e5cc2215 100644
--- a/Example/EchoUITests/Engine/App.swift
+++ b/Example/EchoUITests/Engine/App.swift
@@ -9,7 +9,7 @@ enum App {
     var instance: XCUIApplication {
         return XCUIApplication(bundleIdentifier: bundleID)
     }
-    
+
     private var bundleID: String {
         switch self {
         case .dapp:
diff --git a/Example/EchoUITests/Engine/DAppEngine.swift b/Example/EchoUITests/Engine/DAppEngine.swift
index 5711ccce8..1164f27a1 100644
--- a/Example/EchoUITests/Engine/DAppEngine.swift
+++ b/Example/EchoUITests/Engine/DAppEngine.swift
@@ -18,7 +18,7 @@ struct DAppEngine {
     var accountRow: XCUIElement {
         instance.tables.cells.containing("0x").firstMatch
     }
-    
+
     var methodRow: XCUIElement {
         instance.tables.cells.firstMatch
     }
diff --git a/Example/EchoUITests/Engine/WalletEngine.swift b/Example/EchoUITests/Engine/WalletEngine.swift
index c45d327a8..a671306be 100644
--- a/Example/EchoUITests/Engine/WalletEngine.swift
+++ b/Example/EchoUITests/Engine/WalletEngine.swift
@@ -8,11 +8,11 @@ struct WalletEngine {
     }
 
     // Onboarding
-    
+
     var getStartedButton: XCUIElement {
         instance.buttons["Get Started"]
     }
-    
+
     // MainScreen
 
     var pasteURIButton: XCUIElement {
diff --git a/Example/EchoUITests/Extensions/XCTestCase.swift b/Example/EchoUITests/Extensions/XCTestCase.swift
index f2698a34b..827c94ce1 100644
--- a/Example/EchoUITests/Extensions/XCTestCase.swift
+++ b/Example/EchoUITests/Extensions/XCTestCase.swift
@@ -8,11 +8,11 @@ extension XCTestCase {
             if alerts.buttons["Allow"].exists {
                 alerts.buttons["Allow"].tap()
             }
-            
+
             return true
         }
         app.swipeUp()
-        
+
         self.removeUIInterruptionMonitor(pnPermission)
     }
 }
diff --git a/Example/EchoUITests/Extensions/XCUIElement.swift b/Example/EchoUITests/Extensions/XCUIElement.swift
index 514a23242..d9ce48169 100644
--- a/Example/EchoUITests/Extensions/XCUIElement.swift
+++ b/Example/EchoUITests/Extensions/XCUIElement.swift
@@ -4,7 +4,7 @@ import XCTest
 extension XCUIElement {
 
     static let waitTimeout: TimeInterval = 15
-    
+
     @discardableResult
     func wait(
         until expression: @escaping (XCUIElement) -> Bool,
@@ -35,7 +35,7 @@ extension XCUIElement {
 
         return self
     }
-    
+
     @discardableResult
     func wait<Value: Equatable>(
         until keyPath: KeyPath<XCUIElement, Value>,
@@ -53,7 +53,7 @@ extension XCUIElement {
             line: line
         )
     }
-    
+
     @discardableResult
     func wait(
         until keyPath: KeyPath<XCUIElement, Bool>,
diff --git a/Example/EchoUITests/Extensions/XCUIElementQuery.swift b/Example/EchoUITests/Extensions/XCUIElementQuery.swift
index a92ed3a08..ffb9fa79c 100644
--- a/Example/EchoUITests/Extensions/XCUIElementQuery.swift
+++ b/Example/EchoUITests/Extensions/XCUIElementQuery.swift
@@ -2,7 +2,7 @@ import Foundation
 import XCTest
 
 extension XCUIElementQuery {
-    
+
     func containing(_ text: String) -> XCUIElementQuery {
         let predicate = NSPredicate(format: "label CONTAINS[c] %@", text)
         let elementQuery = self.containing(predicate)
diff --git a/Example/EchoUITests/Tests/PushNotificationTests.swift b/Example/EchoUITests/Tests/PushNotificationTests.swift
index c9db0aeca..8789e2071 100644
--- a/Example/EchoUITests/Tests/PushNotificationTests.swift
+++ b/Example/EchoUITests/Tests/PushNotificationTests.swift
@@ -10,48 +10,48 @@ class PushNotificationTests: XCTestCase {
         engine.routing.launch(app: .wallet, clean: true)
         engine.routing.launch(app: .dapp, clean: true)
     }
-    
+
     func testPushNotification() {
-        
+
         // Initiate connection & copy URI from dApp
         engine.routing.activate(app: .dapp)
         engine.dapp.connectButton.wait(until: \.exists).tap()
         engine.dapp.newPairingButton.wait(until: \.exists).tap()
-        
+
         // Relies on existence of invisible label with uri in Dapp
         let uri = engine.dapp.instance.staticTexts.containing("wc:").firstMatch.label
-        
+
         engine.dapp.copyURIButton.wait(until: \.exists).tap()
-        
+
         // Paste URI into Wallet & and allow connect
         engine.routing.activate(app: .wallet)
-        
+
         allowPushNotificationsIfNeeded(app: engine.wallet.instance)
-        
+
         engine.wallet.getStartedButton.wait(until: \.exists).tap()
         engine.wallet.pasteURIButton.wait(until: \.exists).tap()
-        
+
         engine.wallet.alertUriTextField.wait(until: \.exists).tap()
         engine.wallet.alertUriTextField.typeText(uri)
         engine.wallet.alertConnectButton.wait(until: \.exists).tap()
-    
+
         // Allow session
         engine.wallet.allowButton.wait(until: \.exists, timeout: 15, message: "No session dialog appeared").tap()
-    
+
         // Trigger PN
         engine.routing.activate(app: .dapp)
         engine.dapp.accountRow.wait(until: \.exists, timeout: 15).tap()
         engine.dapp.methodRow.wait(until: \.exists).tap()
-        
+
         // Launch springboard
         engine.routing.activate(app: .springboard)
-        
+
         // Assert notification
         let notification = engine.routing.springboard.otherElements.descendants(matching: .any)["NotificationShortLookView"]
         notification
             .wait(until: \.exists, timeout: 15)
             .tap()
-        
+
         engine.wallet.instance.wait(until: \.exists)
     }
 }
diff --git a/Example/IntegrationTests/Chat/ChatTests.swift b/Example/IntegrationTests/Chat/ChatTests.swift
index 2c917aa35..3532ded62 100644
--- a/Example/IntegrationTests/Chat/ChatTests.swift
+++ b/Example/IntegrationTests/Chat/ChatTests.swift
@@ -39,7 +39,7 @@ final class ChatTests: XCTestCase {
         let clientId = try! networkingInteractor.getClientId()
         logger.debug("My client id is: \(clientId)")
 
-        return ChatClientFactory.create(keyserverURL: keyserverURL, relayClient: relayClient, networkingInteractor: networkingInteractor, keychain:  keychain, logger: logger, keyValueStorage: keyValueStorage)
+        return ChatClientFactory.create(keyserverURL: keyserverURL, relayClient: relayClient, networkingInteractor: networkingInteractor, keychain: keychain, logger: logger, keyValueStorage: keyValueStorage)
     }
 
     func testInvite() async throws {
diff --git a/Example/IntegrationTests/Chat/RegistryTests.swift b/Example/IntegrationTests/Chat/RegistryTests.swift
index 074251e63..c35aa1532 100644
--- a/Example/IntegrationTests/Chat/RegistryTests.swift
+++ b/Example/IntegrationTests/Chat/RegistryTests.swift
@@ -21,7 +21,7 @@ final class RegistryTests: XCTestCase {
         let keychain = KeychainStorageMock()
         let ksm = KeyManagementService(keychain: keychain)
         storage = IdentityStorage(keychain: keychain)
-        sut = IdentityService (
+        sut = IdentityService(
             keyserverURL: keyserverURL,
             kms: ksm,
             storage: storage,
diff --git a/Example/IntegrationTests/Pairing/PairingTests.swift b/Example/IntegrationTests/Pairing/PairingTests.swift
index 4fb84f283..a955795bd 100644
--- a/Example/IntegrationTests/Pairing/PairingTests.swift
+++ b/Example/IntegrationTests/Pairing/PairingTests.swift
@@ -51,7 +51,7 @@ final class PairingTests: XCTestCase {
 
         let clientId = try! networkingClient.getClientId()
         networkingLogger.debug("My client id is: \(clientId)")
-        
+
         return (pairingClient, networkingClient, keychain, keyValueStorage)
     }
 
diff --git a/Example/IntegrationTests/Push/PushTests.swift b/Example/IntegrationTests/Push/PushTests.swift
index d58fc905b..4c6c45cc3 100644
--- a/Example/IntegrationTests/Push/PushTests.swift
+++ b/Example/IntegrationTests/Push/PushTests.swift
@@ -53,7 +53,7 @@ final class PushTests: XCTestCase {
 
         let clientId = try! networkingClient.getClientId()
         networkingLogger.debug("My client id is: \(clientId)")
-        
+
         return (pairingClient, networkingClient, keychain, keyValueStorage)
     }
 
@@ -149,7 +149,6 @@ final class PushTests: XCTestCase {
         wait(for: [expectation], timeout: InputConfig.defaultTimeout)
     }
 
-
     func testDeletePushSubscription() async {
         let expectation = expectation(description: "expects to delete push subscription")
         let uri = try! await dappPairingClient.create()
@@ -192,7 +191,7 @@ final class PushTests: XCTestCase {
         walletPushClient.updateSubscriptionPublisher
             .sink { [unowned self] result in
                 guard case .success(let subscription) = result else { XCTFail(); return }
-                let updatedScope = Set(subscription.scope.filter{ $0.value.enabled == true }.keys)
+                let updatedScope = Set(subscription.scope.filter { $0.value.enabled == true }.keys)
                 XCTAssertEqual(updatedScope, updateScope)
                 Task { try! await walletPushClient.deleteSubscription(topic: subscription.topic) }
                 expectation.fulfill()
@@ -203,7 +202,6 @@ final class PushTests: XCTestCase {
 
 }
 
-
 private extension PushTests {
     func sign(_ message: String) -> SigningResult {
         let privateKey = Data(hex: "305c6cde3846927892cd32762f6120539f3ec74c9e3a16b9b798b1e85351ae2a")
diff --git a/Example/IntegrationTests/Sign/SignClientTests.swift b/Example/IntegrationTests/Sign/SignClientTests.swift
index 583cd886a..48ef15268 100644
--- a/Example/IntegrationTests/Sign/SignClientTests.swift
+++ b/Example/IntegrationTests/Sign/SignClientTests.swift
@@ -48,7 +48,7 @@ final class SignClientTests: XCTestCase {
 
         let clientId = try! networkingClient.getClientId()
         logger.debug("My client id is: \(clientId)")
-        
+
         return ClientDelegate(client: client)
     }
 
@@ -402,11 +402,11 @@ final class SignClientTests: XCTestCase {
 
         wait(for: [expectation], timeout: InputConfig.defaultTimeout)
     }
-    
+
     func testCaip25SatisfyAllRequiredAllOptionalNamespacesSuccessful() async throws {
         let dappSettlementExpectation = expectation(description: "Dapp expects to settle a session")
         let walletSettlementExpectation = expectation(description: "Wallet expects to settle a session")
-        
+
         let requiredNamespaces: [String: ProposalNamespace] = [
             "eip155:1": ProposalNamespace(
                 methods: ["personal_sign", "eth_sendTransaction"],
@@ -418,7 +418,7 @@ final class SignClientTests: XCTestCase {
                 events: ["any"]
             )
         ]
-        
+
         let optionalNamespaces: [String: ProposalNamespace] = [
             "eip155:5": ProposalNamespace(
                 methods: ["personal_sign", "eth_sendTransaction"],
@@ -430,7 +430,7 @@ final class SignClientTests: XCTestCase {
                 events: ["any"]
             )
         ]
-        
+
         let sessionProposal = Session.Proposal(
             id: "",
             pairingTopic: "",
@@ -440,7 +440,7 @@ final class SignClientTests: XCTestCase {
             sessionProperties: nil,
             proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [])), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
         )
-        
+
         let sessionNamespaces = try AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [
@@ -458,7 +458,7 @@ final class SignClientTests: XCTestCase {
                 Account(blockchain: Blockchain("eip155:5")!, address: "0x00")!
             ]
         )
-        
+
         wallet.onSessionProposal = { [unowned self] proposal in
             Task(priority: .high) {
                 do {
@@ -479,11 +479,11 @@ final class SignClientTests: XCTestCase {
         try await wallet.client.pair(uri: uri!)
         wait(for: [dappSettlementExpectation, walletSettlementExpectation], timeout: InputConfig.defaultTimeout)
     }
-    
+
     func testCaip25SatisfyAllRequiredNamespacesSuccessful() async throws {
         let dappSettlementExpectation = expectation(description: "Dapp expects to settle a session")
         let walletSettlementExpectation = expectation(description: "Wallet expects to settle a session")
-        
+
         let requiredNamespaces: [String: ProposalNamespace] = [
             "eip155:1": ProposalNamespace(
                 methods: ["personal_sign", "eth_sendTransaction"],
@@ -495,14 +495,14 @@ final class SignClientTests: XCTestCase {
                 events: ["any"]
             )
         ]
-        
+
         let optionalNamespaces: [String: ProposalNamespace] = [
             "eip155:5": ProposalNamespace(
                 methods: ["personal_sign", "eth_sendTransaction"],
                 events: ["any"]
             )
         ]
-        
+
         let sessionProposal = Session.Proposal(
             id: "",
             pairingTopic: "",
@@ -512,7 +512,7 @@ final class SignClientTests: XCTestCase {
             sessionProperties: nil,
             proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [])), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
         )
-        
+
         let sessionNamespaces = try AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [
@@ -526,7 +526,7 @@ final class SignClientTests: XCTestCase {
                 Account(blockchain: Blockchain("eip155:137")!, address: "0x00")!
             ]
         )
-        
+
         wallet.onSessionProposal = { [unowned self] proposal in
             Task(priority: .high) {
                 do {
@@ -547,20 +547,20 @@ final class SignClientTests: XCTestCase {
         try await wallet.client.pair(uri: uri!)
         wait(for: [dappSettlementExpectation, walletSettlementExpectation], timeout: InputConfig.defaultTimeout)
     }
-    
+
     func testCaip25SatisfyEmptyRequiredNamespacesExtraOptionalNamespacesSuccessful() async throws {
         let dappSettlementExpectation = expectation(description: "Dapp expects to settle a session")
         let walletSettlementExpectation = expectation(description: "Wallet expects to settle a session")
-        
+
         let requiredNamespaces: [String: ProposalNamespace] = [:]
-        
+
         let optionalNamespaces: [String: ProposalNamespace] = [
             "eip155:5": ProposalNamespace(
                 methods: ["personal_sign", "eth_sendTransaction"],
                 events: ["any"]
             )
         ]
-        
+
         let sessionProposal = Session.Proposal(
             id: "",
             pairingTopic: "",
@@ -570,7 +570,7 @@ final class SignClientTests: XCTestCase {
             sessionProperties: nil,
             proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [])), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
         )
-        
+
         let sessionNamespaces = try AutoNamespaces.build(
             sessionProposal: sessionProposal,
             chains: [
@@ -584,7 +584,7 @@ final class SignClientTests: XCTestCase {
                 Account(blockchain: Blockchain("eip155:5")!, address: "0x00")!
             ]
         )
-        
+
         wallet.onSessionProposal = { [unowned self] proposal in
             Task(priority: .high) {
                 do {
@@ -605,10 +605,10 @@ final class SignClientTests: XCTestCase {
         try await wallet.client.pair(uri: uri!)
         wait(for: [dappSettlementExpectation, walletSettlementExpectation], timeout: InputConfig.defaultTimeout)
     }
-    
+
     func testCaip25SatisfyPartiallyRequiredNamespacesFails() async throws {
         let settlementFailedExpectation = expectation(description: "Dapp fails to settle a session")
-        
+
         let requiredNamespaces: [String: ProposalNamespace] = [
             "eip155:1": ProposalNamespace(
                 methods: ["personal_sign", "eth_sendTransaction"],
@@ -619,14 +619,14 @@ final class SignClientTests: XCTestCase {
                 events: ["any"]
             )
         ]
-        
+
         let optionalNamespaces: [String: ProposalNamespace] = [
             "eip155:5": ProposalNamespace(
                 methods: ["personal_sign", "eth_sendTransaction"],
                 events: ["any"]
             )
         ]
-        
+
         let sessionProposal = Session.Proposal(
             id: "",
             pairingTopic: "",
@@ -636,7 +636,7 @@ final class SignClientTests: XCTestCase {
             sessionProperties: nil,
             proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [])), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
         )
-        
+
         do {
             let sessionNamespaces = try AutoNamespaces.build(
                 sessionProposal: sessionProposal,
@@ -649,7 +649,7 @@ final class SignClientTests: XCTestCase {
                     Account(blockchain: Blockchain("eip155:1")!, address: "0x00")!
                 ]
             )
-            
+
             wallet.onSessionProposal = { [unowned self] proposal in
                 Task(priority: .high) {
                     do {
@@ -662,15 +662,15 @@ final class SignClientTests: XCTestCase {
         } catch {
             settlementFailedExpectation.fulfill()
         }
-        
+
         let uri = try await dapp.client.connect(requiredNamespaces: requiredNamespaces, optionalNamespaces: optionalNamespaces)
         try await wallet.client.pair(uri: uri!)
         wait(for: [settlementFailedExpectation], timeout: 1)
     }
-    
+
     func testCaip25SatisfyPartiallyRequiredNamespacesMethodsFails() async throws {
         let settlementFailedExpectation = expectation(description: "Dapp fails to settle a session")
-        
+
         let requiredNamespaces: [String: ProposalNamespace] = [
             "eip155:1": ProposalNamespace(
                 methods: ["personal_sign", "eth_sendTransaction"],
@@ -682,14 +682,14 @@ final class SignClientTests: XCTestCase {
                 events: ["any"]
             )
         ]
-        
+
         let optionalNamespaces: [String: ProposalNamespace] = [
             "eip155:5": ProposalNamespace(
                 methods: ["personal_sign", "eth_sendTransaction"],
                 events: ["any"]
             )
         ]
-        
+
         let sessionProposal = Session.Proposal(
             id: "",
             pairingTopic: "",
@@ -699,7 +699,7 @@ final class SignClientTests: XCTestCase {
             sessionProperties: nil,
             proposal: SessionProposal(relays: [], proposer: Participant(publicKey: "", metadata: AppMetadata(name: "", description: "", url: "", icons: [])), requiredNamespaces: [:], optionalNamespaces: [:], sessionProperties: [:])
         )
-        
+
         do {
             let sessionNamespaces = try AutoNamespaces.build(
                 sessionProposal: sessionProposal,
@@ -714,7 +714,7 @@ final class SignClientTests: XCTestCase {
                     Account(blockchain: Blockchain("eip155:137")!, address: "0x00")!
                 ]
             )
-            
+
             wallet.onSessionProposal = { [unowned self] proposal in
                 Task(priority: .high) {
                     do {
diff --git a/Example/PNDecryptionService/NotificationService.swift b/Example/PNDecryptionService/NotificationService.swift
index 1be5f2335..aadab035e 100644
--- a/Example/PNDecryptionService/NotificationService.swift
+++ b/Example/PNDecryptionService/NotificationService.swift
@@ -21,8 +21,7 @@ class NotificationService: UNNotificationServiceExtension {
                 bestAttemptContent.body = pushMessage.body
                 contentHandler(bestAttemptContent)
                 return
-            }
-            catch {
+            } catch {
                 NSLog("echo decryption, error=%@", error.localizedDescription)
                 bestAttemptContent.title = ""
                 bestAttemptContent.body = "content not set"
diff --git a/Example/RelayIntegrationTests/RelayClientEndToEndTests.swift b/Example/RelayIntegrationTests/RelayClientEndToEndTests.swift
index 4c2331656..11da566e5 100644
--- a/Example/RelayIntegrationTests/RelayClientEndToEndTests.swift
+++ b/Example/RelayIntegrationTests/RelayClientEndToEndTests.swift
@@ -6,8 +6,8 @@ import Starscream
 @testable import WalletConnectRelay
 
 private class RelayKeychainStorageMock: KeychainStorageProtocol {
-    func add<T>(_ item: T, forKey key: String) throws where T : WalletConnectKMS.GenericPasswordConvertible {}
-    func read<T>(key: String) throws -> T where T : WalletConnectKMS.GenericPasswordConvertible {
+    func add<T>(_ item: T, forKey key: String) throws where T: WalletConnectKMS.GenericPasswordConvertible {}
+    func read<T>(key: String) throws -> T where T: WalletConnectKMS.GenericPasswordConvertible {
         return try T(rawRepresentation: Data())
     }
     func delete(key: String) throws {}
@@ -16,11 +16,11 @@ private class RelayKeychainStorageMock: KeychainStorageProtocol {
 
 class WebSocketFactoryMock: WebSocketFactory {
     private let webSocket: WebSocket
-    
+
     init(webSocket: WebSocket) {
         self.webSocket = webSocket
     }
-    
+
     func create(with url: URL) -> WebSocketConnecting {
         return webSocket
     }
diff --git a/Example/Shared/Signer/Signer.swift b/Example/Shared/Signer/Signer.swift
index f7fa459c5..54790fb65 100644
--- a/Example/Shared/Signer/Signer.swift
+++ b/Example/Shared/Signer/Signer.swift
@@ -6,7 +6,7 @@ final class Signer {
     enum Errors: Error {
         case notImplemented
     }
-    
+
     private init() {}
 
     static func sign(request: Request) throws -> AnyCodable {
@@ -22,7 +22,7 @@ final class Signer {
 
         case "solana_signTransaction":
             return SOLSigner.signTransaction(request.params)
-            
+
         default:
             throw Signer.Errors.notImplemented
         }
diff --git a/Example/Showcase/Classes/ApplicationLayer/SceneDelegate.swift b/Example/Showcase/Classes/ApplicationLayer/SceneDelegate.swift
index 537e88926..d761c43ae 100644
--- a/Example/Showcase/Classes/ApplicationLayer/SceneDelegate.swift
+++ b/Example/Showcase/Classes/ApplicationLayer/SceneDelegate.swift
@@ -33,7 +33,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         guard let walletConnectUri = WalletConnectURI(string: uri) else {
             return
         }
-        
+
         Task {
             try await Pair.instance.pair(uri: walletConnectUri)
         }
diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/ChatListRouter.swift b/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/ChatListRouter.swift
index bd2d8407f..85f613e26 100644
--- a/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/ChatListRouter.swift
+++ b/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/ChatListRouter.swift
@@ -4,7 +4,7 @@ import WalletConnectChat
 final class ChatListRouter {
 
     weak var viewController: UIViewController!
-    
+
     private let app: Application
 
     init(app: Application) {
@@ -33,4 +33,3 @@ final class ChatListRouter {
         WelcomeModule.create(app: app).present()
     }
 }
-
diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/ChatListView.swift b/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/ChatListView.swift
index 3dc52a15f..243ab9843 100644
--- a/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/ChatListView.swift
+++ b/Example/Showcase/Classes/PresentationLayer/Chat/ChatList/ChatListView.swift
@@ -25,7 +25,7 @@ struct ChatListView: View {
                             Spacer()
                         }
                         .padding(16.0)
-                        
+
                         if presenter.threadViewModels.isEmpty {
                             Spacer()
                             emptyView(size: geometry.size)
diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportPresenter.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportPresenter.swift
index 9987116c2..2f62fa910 100644
--- a/Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportPresenter.swift
+++ b/Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportPresenter.swift
@@ -19,7 +19,7 @@ final class ImportPresenter: ObservableObject {
     func didPressWeb3Modal() async throws {
         router.presentWeb3Modal()
     }
-    
+
     @MainActor
     func didPressImport() async throws {
         guard let importAccount = ImportAccount(input: input)
diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportRouter.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportRouter.swift
index 512dc95da..c0993af7a 100644
--- a/Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportRouter.swift
+++ b/Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportRouter.swift
@@ -11,7 +11,7 @@ final class ImportRouter {
     init(app: Application) {
         self.app = app
     }
-    
+
     func presentWeb3Modal() {
         Web3ModalSheetController(
             projectId: InputConfig.projectId,
diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportView.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportView.swift
index 9e0584723..0a5bd6b38 100644
--- a/Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportView.swift
+++ b/Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportView.swift
@@ -16,11 +16,11 @@ struct ImportView: View {
             Spacer()
 
             VStack {
-                
+
 //                BrandButton(title: "Web3Modal") {
 //                    try await presenter.didPressWeb3Modal()
 //                }
-                
+
                 BrandButton(title: "Ok, done" ) {
                     try await presenter.didPressImport()
                 }
diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Main/MainPresenter.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Main/MainPresenter.swift
index fc52791a8..d029480ba 100644
--- a/Example/Showcase/Classes/PresentationLayer/Chat/Main/MainPresenter.swift
+++ b/Example/Showcase/Classes/PresentationLayer/Chat/Main/MainPresenter.swift
@@ -13,7 +13,7 @@ final class MainPresenter {
     var viewControllers: [UIViewController] {
         return [
             router.chatViewController(account: importAccount.account),
-            router.web3InboxViewController(importAccount: importAccount),
+            router.web3InboxViewController(importAccount: importAccount)
         ]
     }
 
diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Welcome/WelcomeInteractor.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Welcome/WelcomeInteractor.swift
index 318dce292..ef1a57ce8 100644
--- a/Example/Showcase/Classes/PresentationLayer/Chat/Welcome/WelcomeInteractor.swift
+++ b/Example/Showcase/Classes/PresentationLayer/Chat/Welcome/WelcomeInteractor.swift
@@ -7,7 +7,7 @@ import Auth
 
 final class WelcomeInteractor {
     private var disposeBag = Set<AnyCancellable>()
-    
+
     private let chatService: ChatService
     private let accountStorage: AccountStorage
 
@@ -27,7 +27,7 @@ final class WelcomeInteractor {
     func trackConnection() -> Stream<SocketConnectionStatus> {
         return chatService.connectionPublisher
     }
-    
+
     func generateUri() async -> WalletConnectURI {
         return try! await Pair.instance.create()
     }
diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Welcome/WelcomePresenter.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Welcome/WelcomePresenter.swift
index db4e676f4..a89d9755f 100644
--- a/Example/Showcase/Classes/PresentationLayer/Chat/Welcome/WelcomePresenter.swift
+++ b/Example/Showcase/Classes/PresentationLayer/Chat/Welcome/WelcomePresenter.swift
@@ -33,6 +33,6 @@ final class WelcomePresenter: ObservableObject {
 private extension WelcomePresenter {
 
     func setupInitialState() {
-        
+
     }
 }
diff --git a/Example/Showcase/Classes/PresentationLayer/Chat/Welcome/WelcomeRouter.swift b/Example/Showcase/Classes/PresentationLayer/Chat/Welcome/WelcomeRouter.swift
index da574fb23..da9910f8a 100644
--- a/Example/Showcase/Classes/PresentationLayer/Chat/Welcome/WelcomeRouter.swift
+++ b/Example/Showcase/Classes/PresentationLayer/Chat/Welcome/WelcomeRouter.swift
@@ -20,7 +20,7 @@ final class WelcomeRouter {
         MainModule.create(app: app, importAccount: importAccount)
             .present()
     }
-    
+
     func openWallet(uri: String) {
         UIApplication.shared.open(URL(string: "walletapp://wc?uri=\(uri)")!)
     }
diff --git a/Example/Showcase/Common/Components/BrandButton.swift b/Example/Showcase/Common/Components/BrandButton.swift
index 6fee139db..c80bcae36 100644
--- a/Example/Showcase/Common/Components/BrandButton.swift
+++ b/Example/Showcase/Common/Components/BrandButton.swift
@@ -21,5 +21,3 @@ struct BrandButton: View {
         }
     }
 }
-
-
diff --git a/Example/Showcase/Common/Components/PlainButton.swift b/Example/Showcase/Common/Components/PlainButton.swift
index 1baa3cb9c..1ca629dbd 100644
--- a/Example/Showcase/Common/Components/PlainButton.swift
+++ b/Example/Showcase/Common/Components/PlainButton.swift
@@ -1,7 +1,7 @@
 import SwiftUI
 import AsyncButton
 
-struct PlainButton<Label> : View where Label : View {
+struct PlainButton<Label>: View where Label: View {
 
     let action: () async throws -> Void
     let label: () -> Label
diff --git a/Example/Showcase/Common/InputConfig.swift b/Example/Showcase/Common/InputConfig.swift
index bfbb51956..25a5945f8 100644
--- a/Example/Showcase/Common/InputConfig.swift
+++ b/Example/Showcase/Common/InputConfig.swift
@@ -5,7 +5,7 @@ struct InputConfig {
     static var projectId: String {
         return config(for: "PROJECT_ID")!
     }
-    
+
     static var relayHost: String {
         return config(for: "RELAY_HOST")!
     }
diff --git a/Example/WalletApp/ApplicationLayer/AppDelegate.swift b/Example/WalletApp/ApplicationLayer/AppDelegate.swift
index d294b73f6..195a0583e 100644
--- a/Example/WalletApp/ApplicationLayer/AppDelegate.swift
+++ b/Example/WalletApp/ApplicationLayer/AppDelegate.swift
@@ -25,7 +25,7 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
       didRegisterForRemoteNotificationsWithDeviceToken deviceToken: Data
     ) {
 
-        Task(priority: .high) {            
+        Task(priority: .high) {
             try await Push.wallet.register(deviceToken: deviceToken)
         }
     }
diff --git a/Example/WalletApp/ApplicationLayer/Configurator/ThirdPartyConfigurator.swift b/Example/WalletApp/ApplicationLayer/Configurator/ThirdPartyConfigurator.swift
index 58064d376..f5b41b9d9 100644
--- a/Example/WalletApp/ApplicationLayer/Configurator/ThirdPartyConfigurator.swift
+++ b/Example/WalletApp/ApplicationLayer/Configurator/ThirdPartyConfigurator.swift
@@ -14,14 +14,14 @@ struct ThirdPartyConfigurator: Configurator {
             icons: ["https://avatars.githubusercontent.com/u/37784886"],
             verifyUrl: "verify.walletconnect.com"
         )
-        
+
         Web3Wallet.configure(metadata: metadata, crypto: DefaultCryptoProvider(), environment: BuildConfiguration.shared.apnsEnvironment)
 
         let account = Account(blockchain: Blockchain("eip155:1")!, address: EthKeyStore.shared.address)!
 
         Web3Inbox.configure(account: account, config: [.chatEnabled: false, .settingsEnabled: false], onSign: Web3InboxSigner.onSing, environment: BuildConfiguration.shared.apnsEnvironment)
     }
-    
+
 }
 
 class Web3InboxSigner {
@@ -32,4 +32,3 @@ class Web3InboxSigner {
         return .signed(signature)
     }
 }
-
diff --git a/Example/WalletApp/ApplicationLayer/PushRegisterer.swift b/Example/WalletApp/ApplicationLayer/PushRegisterer.swift
index 91a7d63d5..21d3cf1dc 100644
--- a/Example/WalletApp/ApplicationLayer/PushRegisterer.swift
+++ b/Example/WalletApp/ApplicationLayer/PushRegisterer.swift
@@ -1,4 +1,3 @@
-
 import WalletConnectPush
 import Combine
 import UIKit
@@ -10,9 +9,9 @@ class PushRegisterer {
     func getNotificationSettings() {
         UNUserNotificationCenter.current().getNotificationSettings { settings in
             print("Notification settings: \(settings)")
-            
+
             guard settings.authorizationStatus == .authorized else { return }
-            
+
             DispatchQueue.main.async {
                 UIApplication.shared.registerForRemoteNotifications()
             }
@@ -23,7 +22,7 @@ class PushRegisterer {
         UNUserNotificationCenter.current()
             .requestAuthorization(
                 options: [.alert, .sound, .badge]
-            ) { granted, error in
+            ) { granted, _ in
                 print("Permission granted: \(granted)")
                 guard granted else { return }
                 self.getNotificationSettings()
diff --git a/Example/WalletApp/ApplicationLayer/SceneDelegate.swift b/Example/WalletApp/ApplicationLayer/SceneDelegate.swift
index 7bd4a81f3..782258b0c 100644
--- a/Example/WalletApp/ApplicationLayer/SceneDelegate.swift
+++ b/Example/WalletApp/ApplicationLayer/SceneDelegate.swift
@@ -2,11 +2,9 @@ import UIKit
 import Auth
 import WalletConnectPairing
 
-
 final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     var window: UIWindow?
 
-
     private let app = Application()
 
     private var configurators: [Configurator] {
@@ -17,7 +15,7 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             AppearanceConfigurator()
         ]
     }
-    
+
     func application(_ application: UIApplication, configurationForConnecting connectingSceneSession: UISceneSession, options: UIScene.ConnectionOptions) -> UISceneConfiguration {
           let sceneConfig: UISceneConfiguration = UISceneConfiguration(name: nil, sessionRole: connectingSceneSession.role)
           sceneConfig.delegateClass = SceneDelegate.self
@@ -29,7 +27,7 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
         window = UIWindow(windowScene: windowScene)
         window?.makeKeyAndVisible()
-        
+
         app.uri = connectionOptions.urlContexts.first?.url.absoluteString.replacingOccurrences(of: "walletapp://wc?uri=", with: "")
 
             configurators.configure()
diff --git a/Example/WalletApp/Common/Extensions/UIKit/UIViewController.swift b/Example/WalletApp/Common/Extensions/UIKit/UIViewController.swift
index c058d9ef6..bc75d6b02 100644
--- a/Example/WalletApp/Common/Extensions/UIKit/UIViewController.swift
+++ b/Example/WalletApp/Common/Extensions/UIKit/UIViewController.swift
@@ -22,7 +22,7 @@ extension UIViewController {
     func present(from viewController: UIViewController) {
         viewController.present(self, animated: true, completion: nil)
     }
-    
+
     func presentFullScreen(from viewController: UIViewController, transparentBackground: Bool = false) {
         if transparentBackground {
             view.backgroundColor = .clear
diff --git a/Example/WalletApp/Common/Helpers/TagsView.swift b/Example/WalletApp/Common/Helpers/TagsView.swift
index 5e53329cd..23c870302 100644
--- a/Example/WalletApp/Common/Helpers/TagsView.swift
+++ b/Example/WalletApp/Common/Helpers/TagsView.swift
@@ -26,9 +26,9 @@ public struct TagsView<RefreshBinding, Data, ItemView: View>: View {
     let items: [Data]
     let itemSpacing: CGFloat
     @ViewBuilder let viewMapping: (Data) -> ItemView
-    
+
     @State private var totalHeight: CGFloat
-    
+
     public init(
         binding: Binding<RefreshBinding>,
         items: [Data],
@@ -41,7 +41,7 @@ public struct TagsView<RefreshBinding, Data, ItemView: View>: View {
         self.viewMapping = viewMapping
         _totalHeight = State(initialValue: .zero)
     }
-    
+
     public var body: some View {
         let stack = VStack {
             GeometryReader { geometry in
@@ -52,7 +52,7 @@ public struct TagsView<RefreshBinding, Data, ItemView: View>: View {
             stack.frame(height: totalHeight)
         }
     }
-    
+
     private func content(in geometry: GeometryProxy) -> some View {
         var width = CGFloat.zero
         var height = CGFloat.zero
@@ -63,7 +63,7 @@ public struct TagsView<RefreshBinding, Data, ItemView: View>: View {
                 viewMapping(item)
                     .padding([.horizontal, .vertical], itemSpacing)
                     .alignmentGuide(.leading, computeValue: { d in
-                        if (abs(width - d.width) > geometry.size.width) {
+                        if abs(width - d.width) > geometry.size.width {
                             width = 0
                             height -= lastHeight
                         }
@@ -76,7 +76,7 @@ public struct TagsView<RefreshBinding, Data, ItemView: View>: View {
                         }
                         return result
                     })
-                    .alignmentGuide(.top, computeValue: { d in
+                    .alignmentGuide(.top, computeValue: { _ in
                         let result = height
                         if index == itemCount - 1 {
                             height = 0
diff --git a/Example/WalletApp/Common/InputConfig.swift b/Example/WalletApp/Common/InputConfig.swift
index 83b9fac4e..fbb0e6f4d 100644
--- a/Example/WalletApp/Common/InputConfig.swift
+++ b/Example/WalletApp/Common/InputConfig.swift
@@ -4,7 +4,7 @@ struct InputConfig {
     static var projectId: String {
         return config(for: "PROJECT_ID")!
     }
-    
+
     private static func config(for key: String) -> String? {
         return Bundle.main.object(forInfoDictionaryKey: key) as? String
     }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestPresenter.swift
index 257787ee4..5e74bdbe7 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestPresenter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestPresenter.swift
@@ -6,14 +6,14 @@ import Web3Wallet
 final class AuthRequestPresenter: ObservableObject {
     private let interactor: AuthRequestInteractor
     private let router: AuthRequestRouter
-    
+
     let request: AuthRequest
     let verified: Bool?
-    
+
     var message: String {
         return interactor.formatted(request: request)
     }
-    
+
     private var disposeBag = Set<AnyCancellable>()
 
     init(
diff --git a/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestRouter.swift b/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestRouter.swift
index 76e35da11..4237a7cdd 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestRouter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestRouter.swift
@@ -8,7 +8,7 @@ final class AuthRequestRouter {
     init(app: Application) {
         self.app = app
     }
-    
+
     func dismiss() {
         viewController.dismiss()
         UIApplication.shared.open(URL(string: "showcase://")!)
diff --git a/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestView.swift b/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestView.swift
index 067a6b00e..faaf6ff6a 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestView.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestView.swift
@@ -2,26 +2,26 @@ import SwiftUI
 
 struct AuthRequestView: View {
     @EnvironmentObject var presenter: AuthRequestPresenter
-    
+
     @State var text = ""
-    
+
     var body: some View {
         ZStack {
             Color.black.opacity(0.6)
-            
+
             VStack {
                 Spacer()
-                
+
                 VStack(spacing: 0) {
                     Image("header")
                         .resizable()
                         .scaledToFit()
-                    
+
                     HStack {
                         Text(presenter.request.payload.domain)
                             .foregroundColor(.grey8)
                             .font(.system(size: 22, weight: .bold, design: .rounded))
-                        
+
                         if let verified = presenter.verified {
                             if verified {
                                 Image(systemName: "checkmark.shield.fill")
@@ -39,20 +39,20 @@ struct AuthRequestView: View {
                         }
                     }
                     .padding(.top, 10)
-                    
+
                     Text("would like to connect")
                         .foregroundColor(.grey8)
                         .font(.system(size: 22, weight: .medium, design: .rounded))
-                    
+
                     Text(presenter.request.payload.domain)
                         .foregroundColor(.grey50)
                         .font(.system(size: 13, weight: .semibold, design: .rounded))
                         .multilineTextAlignment(.center)
                         .lineSpacing(4)
                         .padding(.top, 8)
-                    
+
                     authRequestView()
-                    
+
                     HStack(spacing: 20) {
                         Button {
                             Task(priority: .userInitiated) { try await
@@ -75,7 +75,7 @@ struct AuthRequestView: View {
                                 .cornerRadius(20)
                         }
                         .shadow(color: .white.opacity(0.25), radius: 8, y: 2)
-                        
+
                         Button {
                             Task(priority: .userInitiated) { try await
                                 presenter.onApprove()
@@ -104,13 +104,13 @@ struct AuthRequestView: View {
                 .background(.ultraThinMaterial)
                 .cornerRadius(34)
                 .padding(.horizontal, 10)
-                
+
                 Spacer()
             }
         }
         .edgesIgnoringSafeArea(.all)
     }
-    
+
     private func authRequestView() -> some View {
         VStack {
             VStack(alignment: .leading) {
@@ -123,7 +123,7 @@ struct AuthRequestView: View {
                     .cornerRadius(28, corners: .allCorners)
                     .padding(.leading, 15)
                     .padding(.top, 9)
-                
+
                 VStack(spacing: 0) {
                     ScrollView {
                         Text(presenter.message)
diff --git a/Example/WalletApp/PresentationLayer/Wallet/ConnectionDetails/ConnectionDetailsInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/ConnectionDetails/ConnectionDetailsInteractor.swift
index 27e2cf3d1..d926963dc 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/ConnectionDetails/ConnectionDetailsInteractor.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/ConnectionDetails/ConnectionDetailsInteractor.swift
@@ -6,11 +6,11 @@ final class ConnectionDetailsInteractor {
     var requestPublisher: AnyPublisher<(request: AuthRequest, context: VerifyContext?), Never> {
         return Web3Wallet.instance.authRequestPublisher
     }
-    
+
     func pair(uri: WalletConnectURI) async throws {
         try await Web3Wallet.instance.pair(uri: uri)
     }
-    
+
     func disconnectSession(session: Session) async throws {
         try await Web3Wallet.instance.disconnect(topic: session.topic)
     }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/ConnectionDetails/ConnectionDetailsPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/ConnectionDetails/ConnectionDetailsPresenter.swift
index 5312123a4..298d50b7c 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/ConnectionDetails/ConnectionDetailsPresenter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/ConnectionDetails/ConnectionDetailsPresenter.swift
@@ -7,9 +7,9 @@ import Web3Wallet
 final class ConnectionDetailsPresenter: ObservableObject {
     private let interactor: ConnectionDetailsInteractor
     private let router: ConnectionDetailsRouter
-    
+
     let session: Session
-    
+
     private var disposeBag = Set<AnyCancellable>()
 
     init(
@@ -34,7 +34,7 @@ final class ConnectionDetailsPresenter: ObservableObject {
             }
         }
     }
-    
+
     func accountReferences(namespace: String) -> [String] {
         session.namespaces[namespace]?.accounts.map { "\($0.namespace):\(($0.reference))" } ?? []
     }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/ConnectionDetails/ConnectionDetailsView.swift b/Example/WalletApp/PresentationLayer/Wallet/ConnectionDetails/ConnectionDetailsView.swift
index 91f2f6f57..787342430 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/ConnectionDetails/ConnectionDetailsView.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/ConnectionDetails/ConnectionDetailsView.swift
@@ -7,7 +7,7 @@ struct ConnectionDetailsView: View {
         ZStack {
             Color.grey100
                 .edgesIgnoringSafeArea(.all)
-            
+
             ScrollView {
                 VStack(spacing: 0) {
                     VStack(spacing: 2) {
@@ -25,17 +25,17 @@ struct ConnectionDetailsView: View {
                             }
                         }
                         .padding(.bottom, 6)
-                        
+
                         Text(presenter.session.peer.name)
                             .foregroundColor(.grey8)
                             .font(.system(size: 22, weight: .bold, design: .rounded))
-                        
+
                         Text(presenter.session.peer.url)
                             .foregroundColor(.grey50)
                             .font(.system(size: 13, weight: .medium, design: .rounded))
                     }
                     .padding(.horizontal, 15)
-                    
+
                     ForEach(presenter.session.namespaces.keys.sorted(), id: \.self) { namespace in
                         VStack {
                             VStack(alignment: .leading) {
@@ -48,18 +48,18 @@ struct ConnectionDetailsView: View {
                                     .cornerRadius(28, corners: .allCorners)
                                     .padding(.leading, 15)
                                     .padding(.top, 9)
-                                
+
                                 VStack(spacing: 0) {
                                     HStack {
                                         Text("Accounts")
                                             .foregroundColor(.grey50)
                                             .font(.system(size: 13, weight: .semibold, design: .rounded))
-                                        
+
                                         Spacer()
                                     }
                                     .padding(.horizontal, 18)
                                     .padding(.top, 10)
-                                    
+
                                     TagsView(items: presenter.accountReferences(namespace: namespace)) {
                                         Text($0)
                                             .foregroundColor(.cyanBackround)
@@ -70,23 +70,23 @@ struct ConnectionDetailsView: View {
                                             .cornerRadius(10, corners: .allCorners)
                                     }
                                     .padding(10)
-                                    
+
                                 }
                                 .background(Color.whiteBackground)
                                 .cornerRadius(20, corners: .allCorners)
                                 .padding(.horizontal, 5)
-                                
+
                                 VStack(alignment: .leading, spacing: 0) {
                                     HStack {
                                         Text("Methods")
                                             .foregroundColor(.grey50)
                                             .font(.system(size: 13, weight: .semibold, design: .rounded))
-                                        
+
                                         Spacer()
                                     }
                                     .padding(.horizontal, 18)
                                     .padding(.top, 10)
-                                    
+
                                     TagsView(items: Array(presenter.session.namespaces[namespace]?.methods ?? [])) {
                                         Text($0)
                                             .foregroundColor(.cyanBackround)
@@ -109,7 +109,7 @@ struct ConnectionDetailsView: View {
                         .padding(.horizontal, 20)
                         .padding(.top, 30)
                     }
-                    
+
                     Button {
                         presenter.onDelete()
                     } label: {
@@ -118,7 +118,7 @@ struct ConnectionDetailsView: View {
                             .font(.system(size: 20, weight: .semibold, design: .rounded))
                     }
                     .padding(.top, 20)
-                    
+
                     Spacer()
                 }
             }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Main/MainPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/Main/MainPresenter.swift
index 2f0548b02..e4e5e78ea 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Main/MainPresenter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Main/MainPresenter.swift
@@ -46,4 +46,3 @@ extension MainPresenter {
             .store(in: &disposeBag)
     }
 }
-
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Main/MainRouter.swift b/Example/WalletApp/PresentationLayer/Wallet/Main/MainRouter.swift
index fc3a4c0bb..ebc1da838 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Main/MainRouter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Main/MainRouter.swift
@@ -13,7 +13,7 @@ final class MainRouter {
         return WalletModule.create(app: app)
             .wrapToNavigationController()
     }
-    
+
     func present(proposal: Session.Proposal, context: VerifyContext?) {
         SessionProposalModule.create(app: app, proposal: proposal, context: context)
             .presentFullScreen(from: viewController, transparentBackground: true)
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Notifications/NotificationsPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/Notifications/NotificationsPresenter.swift
index ba6761a50..2fb20dbf0 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Notifications/NotificationsPresenter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Notifications/NotificationsPresenter.swift
@@ -13,7 +13,7 @@ final class NotificationsPresenter: ObservableObject {
         defer { setupInitialState() }
         self.interactor = interactor
         self.router = router
-        
+
     }
 
     func didPress(_ subscription: SubscriptionsViewModel) {
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Notifications/NotificationsView.swift b/Example/WalletApp/PresentationLayer/Wallet/Notifications/NotificationsView.swift
index aed832740..a7e934b68 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Notifications/NotificationsView.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Notifications/NotificationsView.swift
@@ -4,7 +4,6 @@ struct NotificationsView: View {
 
     @EnvironmentObject var presenter: NotificationsPresenter
 
-
     var body: some View {
         ZStack {
             Color.grey100
@@ -52,10 +51,6 @@ struct NotificationsView: View {
         }
     }
 
-
-
-
-
     private func subscriptionsView(subscription: SubscriptionsViewModel) -> some View {
         Button {
             presenter.didPress(subscription)
diff --git a/Example/WalletApp/PresentationLayer/Wallet/PasteUri/PasteUriPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/PasteUri/PasteUriPresenter.swift
index cf011016b..2da8c783e 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/PasteUri/PasteUriPresenter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/PasteUri/PasteUriPresenter.swift
@@ -8,7 +8,7 @@ final class PasteUriPresenter: ObservableObject {
 
     let onValue: (String) -> Void
     let onError: (Error) -> Void
-    
+
     init(
         interactor: PasteUriInteractor,
         router: PasteUriRouter,
diff --git a/Example/WalletApp/PresentationLayer/Wallet/PasteUri/PasteUriView.swift b/Example/WalletApp/PresentationLayer/Wallet/PasteUri/PasteUriView.swift
index 7f60086e6..2c8105925 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/PasteUri/PasteUriView.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/PasteUri/PasteUriView.swift
@@ -6,39 +6,39 @@ private enum FocusField: Hashable {
 
 struct PasteUriView: View {
     @Environment(\.dismiss) var dismiss
-    
+
     @EnvironmentObject var presenter: PasteUriPresenter
-    
+
     @State private var text = ""
 
     var body: some View {
         ZStack {
             Color(red: 20/255, green: 20/255, blue: 20/255, opacity: 0.4)
                 .edgesIgnoringSafeArea(.all)
-            
+
             VStack {
                 Spacer()
                 VStack(spacing: 6) {
                     Text("Enter a WalletConnect URI")
                         .foregroundColor(.grey8)
                         .font(.system(size: 22, weight: .bold, design: .rounded))
-                    
+
                     Text("To get the URI press the copy to clipboard button in wallet connection interfaces.")
                         .foregroundColor(.grey50)
                         .font(.system(size: 15, weight: .medium, design: .rounded))
                         .multilineTextAlignment(.center)
                         .lineSpacing(4)
-                    
+
                     ZStack {
                         RoundedRectangle(cornerRadius: 15)
                             .fill(Color.whiteBackground)
-                        
+
                         HStack {
                             TextField("wc://a13aef...", text: $text)
                                 .padding(.horizontal, 17)
                                 .foregroundColor(.grey50)
                                 .font(.system(size: 17, weight: .regular, design: .rounded))
-                            
+
                             Button {
                                 text = ""
                             } label: {
@@ -51,7 +51,7 @@ struct PasteUriView: View {
                     .frame(height: 44)
                     .padding(.top, 20)
                     .ignoresSafeArea(.keyboard)
-                    
+
                     Button {
                         presenter.onValue(text)
                         dismiss()
@@ -74,7 +74,7 @@ struct PasteUriView: View {
                     .padding(.top, 20)
                     .shadow(color: .white.opacity(0.25), radius: 8, y: 2)
                     .disabled(text.isEmpty)
-                    
+
                     Button {
                         dismiss()
                     } label: {
diff --git a/Example/WalletApp/PresentationLayer/Wallet/PushMessages/Models/PushMessageViewModel.swift b/Example/WalletApp/PresentationLayer/Wallet/PushMessages/Models/PushMessageViewModel.swift
index 35a61e1d6..278a37199 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/PushMessages/Models/PushMessageViewModel.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/PushMessages/Models/PushMessageViewModel.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 import WalletConnectPush
 
@@ -9,7 +8,7 @@ struct PushMessageViewModel: Identifiable {
     var id: String {
         return pushMessageRecord.id
     }
-    
+
     var imageUrl: String {
         return pushMessageRecord.message.icon
     }
@@ -21,7 +20,7 @@ struct PushMessageViewModel: Identifiable {
     var subtitle: String {
         return pushMessageRecord.message.body
     }
-    
+
     var publishedAt: String {
         return pushMessageRecord.publishedAt.formatted(.relative(presentation: .named, unitsStyle: .wide))
     }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesInteractor.swift
index b2fa4a51f..3ca50792a 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesInteractor.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesInteractor.swift
@@ -12,7 +12,7 @@ final class PushMessagesInteractor {
     var pushMessagePublisher: AnyPublisher<PushMessageRecord, Never> {
         return Push.wallet.pushMessagePublisher
     }
-    
+
     func getPushMessages() -> [PushMessageRecord] {
         return Push.wallet.getMessageHistory(topic: subscription.topic)
     }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesPresenter.swift
index 1abf8a408..664b24a42 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesPresenter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesPresenter.swift
@@ -7,7 +7,7 @@ final class PushMessagesPresenter: ObservableObject {
     private let interactor: PushMessagesInteractor
     private let router: PushMessagesRouter
     private var disposeBag = Set<AnyCancellable>()
-    
+
     @Published var pushMessages: [PushMessageViewModel] = []
 
     init(interactor: PushMessagesInteractor, router: PushMessagesRouter) {
@@ -15,7 +15,7 @@ final class PushMessagesPresenter: ObservableObject {
         self.interactor = interactor
         self.router = router
     }
-    
+
     func deletePushMessage(at indexSet: IndexSet) {
         if let index = indexSet.first {
             interactor.deletePushMessage(id: pushMessages[index].id)
@@ -49,7 +49,7 @@ private extension PushMessagesPresenter {
             .map { pushMessageRecord in
                 PushMessageViewModel(pushMessageRecord: pushMessageRecord)
             }
-        
+
         interactor.pushMessagePublisher
             .receive(on: DispatchQueue.main)
             .sink { [weak self] newPushMessage in
@@ -65,4 +65,3 @@ private extension PushMessagesPresenter {
             .store(in: &disposeBag)
     }
 }
-
diff --git a/Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesView.swift b/Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesView.swift
index c29766ed3..ace43cbb3 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesView.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/PushMessages/PushMessagesView.swift
@@ -49,8 +49,6 @@ struct PushMessagesView: View {
         }
     }
 
-
-
     private func notificationView(pushMessage: PushMessageViewModel) -> some View {
         VStack {
             HStack(spacing: 10) {
@@ -68,20 +66,19 @@ struct PushMessagesView: View {
                     }
                 }
                 .padding(.leading, 20)
-                
-                    
+
                 VStack(alignment: .leading, spacing: 2) {
                     Text(pushMessage.title)
                         .foregroundColor(.grey8)
                         .font(.system(size: 20, weight: .semibold, design: .rounded))
-                    
+
                     HStack {
                         Text(pushMessage.subtitle)
                             .foregroundColor(.grey50)
                             .font(.system(size: 13, weight: .medium, design: .rounded))
-                        
+
                         Spacer()
-                        
+
                         Text(pushMessage.publishedAt)
                             .foregroundColor(.grey50)
                             .font(.system(size: 13, weight: .medium, design: .rounded))
diff --git a/Example/WalletApp/PresentationLayer/Wallet/PushRequest/PushRequestInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/PushRequest/PushRequestInteractor.swift
index 2afda2ff4..7458dffb3 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/PushRequest/PushRequestInteractor.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/PushRequest/PushRequestInteractor.swift
@@ -5,7 +5,7 @@ final class PushRequestInteractor {
     func approve(pushRequest: PushRequest) async throws {
         try await Push.wallet.approve(id: pushRequest.id, onSign: Web3InboxSigner.onSing)
     }
-    
+
     func reject(pushRequest: PushRequest) async throws {
         try await Push.wallet.reject(id: pushRequest.id)
     }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Scan/ScanPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/Scan/ScanPresenter.swift
index 53ab44c7c..628494afd 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Scan/ScanPresenter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Scan/ScanPresenter.swift
@@ -22,13 +22,12 @@ final class ScanPresenter: ObservableObject {
         self.onValue = onValue
         self.onError = onError
     }
-    
+
     func dismiss() {
         router.dismiss()
     }
 }
 
-
 // MARK: - Private functions
 private extension ScanPresenter {
     func setupInitialState() {
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Scan/ScanRouter.swift b/Example/WalletApp/PresentationLayer/Wallet/Scan/ScanRouter.swift
index cdd0e33e2..7728f5082 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Scan/ScanRouter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Scan/ScanRouter.swift
@@ -8,7 +8,7 @@ final class ScanRouter {
     init(app: Application) {
         self.app = app
     }
-    
+
     func dismiss() {
         viewController.dismiss()
     }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Scan/ScanView.swift b/Example/WalletApp/PresentationLayer/Wallet/Scan/ScanView.swift
index e04d1204a..591fcdecb 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Scan/ScanView.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Scan/ScanView.swift
@@ -19,7 +19,7 @@ struct ScanView: View {
                     Text("Scan the code")
                         .foregroundColor(.white)
                         .font(.system(size: 20, weight: .semibold, design: .rounded))
-                    
+
                     HStack {
                         Spacer()
 
@@ -34,7 +34,7 @@ struct ScanView: View {
                     }
                     .padding(.trailing, 30)
                 }
-                
+
                 Spacer()
             }
             .padding(.top, 24)
diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift
index b5bc8aa7f..792dc172c 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift
@@ -9,7 +9,7 @@ final class SessionProposalInteractor {
         let supportedEvents = Array(proposal.requiredNamespaces.map { $0.value.events }.first ?? [])
         let supportedChains = Array((proposal.requiredNamespaces.map { $0.value.chains }.first ?? [] )!)
         let supportedAccounts = supportedChains.map { Account(blockchain: $0, address: ETHSigner.address)! }
-        
+
         /* Use only supported values for production. I.e:
         let supportedMethods = ["eth_signTransaction", "personal_sign", "eth_signTypedData", "eth_sendTransaction", "eth_sign"]
         let supportedEvents = ["accountsChanged", "chainChanged"]
diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalModule.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalModule.swift
index b0edc7232..31570d9bd 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalModule.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalModule.swift
@@ -15,9 +15,9 @@ final class SessionProposalModule {
         )
         let view = SessionProposalView().environmentObject(presenter)
         let viewController = SceneViewController(viewModel: presenter, content: view)
-        
+
         router.viewController = viewController
-        
+
         return viewController
     }
 }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalPresenter.swift
index a13d932c2..b5af255f5 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalPresenter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalPresenter.swift
@@ -6,10 +6,10 @@ import Web3Wallet
 final class SessionProposalPresenter: ObservableObject {
     private let interactor: SessionProposalInteractor
     private let router: SessionProposalRouter
-    
+
     let sessionProposal: Session.Proposal
     let verified: Bool?
-    
+
     private var disposeBag = Set<AnyCancellable>()
 
     init(
@@ -24,7 +24,7 @@ final class SessionProposalPresenter: ObservableObject {
         self.sessionProposal = proposal
         self.verified = (context?.validation == .valid) ? true : (context?.validation == .unknown ? nil : false)
     }
-    
+
     @MainActor
     func onApprove() async throws {
         try await interactor.approve(proposal: sessionProposal)
diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalRouter.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalRouter.swift
index cd9de7971..e817d9d64 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalRouter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalRouter.swift
@@ -8,7 +8,7 @@ final class SessionProposalRouter {
     init(app: Application) {
         self.app = app
     }
-    
+
     func dismiss() {
         viewController.dismiss()
     }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalView.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalView.swift
index 97717d9b5..903554e0f 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalView.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalView.swift
@@ -3,26 +3,26 @@ import Web3Wallet
 
 struct SessionProposalView: View {
     @EnvironmentObject var presenter: SessionProposalPresenter
-    
+
     @State var text = ""
-    
+
     var body: some View {
         ZStack {
             Color.black.opacity(0.6)
-            
+
             VStack {
                 Spacer()
-                
+
                 VStack(spacing: 0) {
                     Image("header")
                         .resizable()
                         .scaledToFit()
-                    
+
                     HStack {
                         Text(presenter.sessionProposal.proposer.name)
                             .foregroundColor(.grey8)
                             .font(.system(size: 22, weight: .bold, design: .rounded))
-                        
+
                         if let verified = presenter.verified {
                             if verified {
                                 Image(systemName: "checkmark.shield.fill")
@@ -39,24 +39,24 @@ struct SessionProposalView: View {
                                 .foregroundStyle(.white, .orange)
                         }
                     }
-                    
+
                     .padding(.top, 10)
-                    
+
                     Text("would like to connect")
                         .foregroundColor(.grey8)
                         .font(.system(size: 22, weight: .medium, design: .rounded))
-                    
+
                     Text(presenter.sessionProposal.proposer.name)
                         .foregroundColor(.grey50)
                         .font(.system(size: 13, weight: .semibold, design: .rounded))
                         .multilineTextAlignment(.center)
                         .lineSpacing(4)
                         .padding(.top, 8)
-                    
+
                     Divider()
                         .padding(.top, 12)
                         .padding(.horizontal, -18)
-                    
+
                     ScrollView {
                         Text("Required namespaces".uppercased())
                             .foregroundColor(.grey50)
@@ -64,13 +64,13 @@ struct SessionProposalView: View {
                             .multilineTextAlignment(.center)
                             .lineSpacing(4)
                             .padding(.vertical, 12)
-                        
+
                         ForEach(presenter.sessionProposal.requiredNamespaces.keys.sorted(), id: \.self) { chain in
                             if let namespaces = presenter.sessionProposal.requiredNamespaces[chain] {
                                 sessionProposalView(namespaces: namespaces)
                             }
                         }
-                        
+
                         if let optionalNamespaces = presenter.sessionProposal.optionalNamespaces {
                             if !optionalNamespaces.isEmpty {
                                 Text("Optional namespaces".uppercased())
@@ -80,7 +80,7 @@ struct SessionProposalView: View {
                                     .lineSpacing(4)
                                     .padding(.vertical, 12)
                             }
-                            
+
                             ForEach(optionalNamespaces.keys.sorted(), id: \.self) { chain in
                                 if let namespaces = optionalNamespaces[chain] {
                                     sessionProposalView(namespaces: namespaces)
@@ -90,7 +90,7 @@ struct SessionProposalView: View {
                     }
                     .frame(height: 250)
                     .padding(.top, 12)
-                    
+
                     HStack(spacing: 20) {
                         Button {
                             Task(priority: .userInitiated) { try await
@@ -113,7 +113,7 @@ struct SessionProposalView: View {
                                 .cornerRadius(20)
                         }
                         .shadow(color: .white.opacity(0.25), radius: 8, y: 2)
-                        
+
                         Button {
                             Task(priority: .userInitiated) { try await
                                 presenter.onApprove()
@@ -142,13 +142,13 @@ struct SessionProposalView: View {
                 .background(.ultraThinMaterial)
                 .cornerRadius(34)
                 .padding(.horizontal, 10)
-                
+
                 Spacer()
             }
         }
         .edgesIgnoringSafeArea(.all)
     }
-    //private func sessionProposalView(chain: String) -> some View {
+    // private func sessionProposalView(chain: String) -> some View {
     private func sessionProposalView(namespaces: ProposalNamespace) -> some View {
         VStack {
             VStack(alignment: .leading) {
@@ -163,18 +163,18 @@ struct SessionProposalView: View {
                 }
                 .padding(.horizontal, 15)
                 .padding(.top, 9)
-                
+
                 VStack(spacing: 0) {
                     HStack {
                         Text("Methods")
                             .foregroundColor(.grey50)
                             .font(.system(size: 13, weight: .semibold, design: .rounded))
-                        
+
                         Spacer()
                     }
                     .padding(.horizontal, 18)
                     .padding(.top, 10)
-                    
+
                     TagsView(items: Array(namespaces.methods)) {
                         Text($0)
                             .foregroundColor(.cyanBackround)
@@ -189,19 +189,19 @@ struct SessionProposalView: View {
                 .background(Color.whiteBackground)
                 .cornerRadius(20, corners: .allCorners)
                 .padding(.horizontal, 5)
-                
+
                 if !namespaces.events.isEmpty {
                     VStack(spacing: 0) {
                         HStack {
                             Text("Events")
                                 .foregroundColor(.grey50)
                                 .font(.system(size: 13, weight: .semibold, design: .rounded))
-                            
+
                             Spacer()
                         }
                         .padding(.horizontal, 18)
                         .padding(.top, 10)
-                        
+
                         TagsView(items: Array(namespaces.events)) {
                             Text($0)
                                 .foregroundColor(.cyanBackround)
diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestPresenter.swift
index 910a5288e..cb794dae1 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestPresenter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestPresenter.swift
@@ -6,17 +6,17 @@ import Web3Wallet
 final class SessionRequestPresenter: ObservableObject {
     private let interactor: SessionRequestInteractor
     private let router: SessionRequestRouter
-    
+
     let sessionRequest: Request
     let verified: Bool?
-    
+
     var message: String {
         return String(describing: sessionRequest.params.value)
     }
-    
+
     @Published var showError = false
     @Published var errorMessage = "Error"
-    
+
     private var disposeBag = Set<AnyCancellable>()
 
     init(
diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestRouter.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestRouter.swift
index cb7dff530..f50dc89ab 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestRouter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestRouter.swift
@@ -8,7 +8,7 @@ final class SessionRequestRouter {
     init(app: Application) {
         self.app = app
     }
-    
+
     func dismiss() {
         viewController.dismiss()
     }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestView.swift b/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestView.swift
index dc56b2e24..77c483c05 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestView.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestView.swift
@@ -2,26 +2,26 @@ import SwiftUI
 
 struct SessionRequestView: View {
     @EnvironmentObject var presenter: SessionRequestPresenter
-    
+
     @State var text = ""
-    
+
     var body: some View {
         ZStack {
             Color.black.opacity(0.6)
-            
+
             VStack {
                 Spacer()
-                
+
                 VStack(spacing: 0) {
                     Image("header")
                         .resizable()
                         .scaledToFit()
-                    
+
                     HStack {
                         Text(presenter.sessionRequest.method)
                             .foregroundColor(.grey8)
                             .font(.system(size: 22, weight: .bold, design: .rounded))
-                        
+
                         if let verified = presenter.verified {
                             if verified {
                                 Image(systemName: "checkmark.shield.fill")
@@ -39,11 +39,11 @@ struct SessionRequestView: View {
                         }
                     }
                     .padding(.top, 10)
-                    
+
                     if presenter.message != "[:]" {
                         authRequestView()
                     }
-                    
+
                     HStack(spacing: 20) {
                         Button {
                             Task(priority: .userInitiated) { try await
@@ -66,7 +66,7 @@ struct SessionRequestView: View {
                                 .cornerRadius(20)
                         }
                         .shadow(color: .white.opacity(0.25), radius: 8, y: 2)
-                        
+
                         Button {
                             Task(priority: .userInitiated) { try await
                                 presenter.onApprove()
@@ -95,7 +95,7 @@ struct SessionRequestView: View {
                 .background(.ultraThinMaterial)
                 .cornerRadius(34)
                 .padding(.horizontal, 10)
-                
+
                 Spacer()
             }
             .alert(presenter.errorMessage, isPresented: $presenter.showError) {
@@ -104,7 +104,7 @@ struct SessionRequestView: View {
         }
         .edgesIgnoringSafeArea(.all)
     }
-    
+
     private func authRequestView() -> some View {
         VStack {
             VStack(alignment: .leading) {
@@ -117,7 +117,7 @@ struct SessionRequestView: View {
                     .cornerRadius(28, corners: .allCorners)
                     .padding(.leading, 15)
                     .padding(.top, 9)
-                
+
                 VStack(spacing: 0) {
                     ScrollView {
                         Text(presenter.message)
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletInteractor.swift b/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletInteractor.swift
index d6eabca65..6fafa17b8 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletInteractor.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletInteractor.swift
@@ -19,11 +19,11 @@ final class WalletInteractor {
     func getSessions() -> [Session] {
         return Web3Wallet.instance.getSessions()
     }
-    
+
     func pair(uri: WalletConnectURI) async throws {
         try await Web3Wallet.instance.pair(uri: uri)
     }
-    
+
     func disconnectSession(session: Session) async throws {
         try await Web3Wallet.instance.disconnect(topic: session.topic)
     }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletPresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletPresenter.swift
index 930b3472e..6b9f962d1 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletPresenter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletPresenter.swift
@@ -7,17 +7,17 @@ final class WalletPresenter: ObservableObject {
     enum Errors: Error {
         case invalidUri(uri: String)
     }
-    
+
     private let interactor: WalletInteractor
     private let router: WalletRouter
-    
+
     private let uri: String?
-    
+
     @Published var sessions = [Session]()
-    
+
     @Published var showError = false
     @Published var errorMessage = "Error"
-    
+
     private var disposeBag = Set<AnyCancellable>()
 
     init(
@@ -32,7 +32,7 @@ final class WalletPresenter: ObservableObject {
         self.router = router
         self.uri = uri
     }
-    
+
     func onConnection(session: Session) {
         router.presentConnectionDetails(session: session)
     }
@@ -79,7 +79,7 @@ extension WalletPresenter {
                 self?.router.present(request: result.request, context: result.context)
             }
             .store(in: &disposeBag)
-        
+
         interactor.sessionRequestPublisher
             .receive(on: DispatchQueue.main)
             .sink { [weak self] request, context in
@@ -92,13 +92,12 @@ extension WalletPresenter {
                 self?.sessions = sessions
             }
             .store(in: &disposeBag)
-        
+
         sessions = interactor.getSessions()
-        
+
         pairFromDapp()
     }
 
-    
     private func pair(uri: WalletConnectURI) {
         Task(priority: .high) { [unowned self] in
             do {
@@ -111,7 +110,7 @@ extension WalletPresenter {
             }
         }
     }
-    
+
     private func pairFromDapp() {
         guard let uri = uri,
               let walletConnectUri = WalletConnectURI(string: uri)
@@ -120,7 +119,7 @@ extension WalletPresenter {
         }
         pair(uri: walletConnectUri)
     }
-    
+
     func removeSession(at indexSet: IndexSet) async {
         if let index = indexSet.first {
             try? await interactor.disconnectSession(session: sessions[index])
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletRouter.swift b/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletRouter.swift
index 9d6342d79..3519af8bf 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletRouter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletRouter.swift
@@ -20,12 +20,12 @@ final class WalletRouter {
         SessionRequestModule.create(app: app, sessionRequest: sessionRequest, sessionContext: sessionContext)
             .presentFullScreen(from: viewController, transparentBackground: true)
     }
-    
+
     func presentPaste(onValue: @escaping (String) -> Void, onError: @escaping (Error) -> Void) {
         PasteUriModule.create(app: app, onValue: onValue, onError: onError)
             .presentFullScreen(from: viewController, transparentBackground: true)
     }
-    
+
     func presentConnectionDetails(session: Session) {
         ConnectionDetailsModule.create(app: app, session: session)
             .push(from: viewController)
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletView.swift b/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletView.swift
index c4dddd391..85e0a043a 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletView.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Wallet/WalletView.swift
@@ -8,13 +8,13 @@ struct WalletView: View {
         ZStack {
             Color.grey100
                 .edgesIgnoringSafeArea(.all)
-            
+
             VStack(alignment: .leading, spacing: 16) {
                 ZStack {
                     if presenter.sessions.isEmpty {
                         VStack(spacing: 10) {
                             Image("connect-template")
-                            
+
                             Text("Apps you connect with will appear here. To connect scan or paste the code that’s displayed in the app.")
                                 .foregroundColor(.grey50)
                                 .font(.system(size: 15, weight: .regular, design: .rounded))
@@ -23,7 +23,7 @@ struct WalletView: View {
                         }
                         .padding(20)
                     }
-                    
+
                     VStack {
                         if !presenter.sessions.isEmpty {
                             List {
@@ -40,12 +40,12 @@ struct WalletView: View {
                             }
                             .listStyle(PlainListStyle())
                         }
-                        
+
                         Spacer()
-                        
+
                         HStack(spacing: 20) {
                             Spacer()
-                            
+
                             Button {
                                 presenter.onPasteUri()
                             } label: {
@@ -54,7 +54,7 @@ struct WalletView: View {
                                     .frame(width: 56, height: 56)
                             }
                             .shadow(color: .black.opacity(0.25), radius: 8, y: 4)
-                            
+
                             Button {
                                 presenter.onScanUri()
                             } label: {
@@ -74,7 +74,7 @@ struct WalletView: View {
             Button("OK", role: .cancel) {}
         }
     }
-    
+
     private func connectionView(session: Session) -> some View {
         Button {
             presenter.onConnection(session: session)
@@ -95,19 +95,19 @@ struct WalletView: View {
                         }
                     }
                     .padding(.leading, 20)
-                    
+
                     VStack(alignment: .leading, spacing: 2) {
                         Text(session.peer.name)
                             .foregroundColor(.grey8)
                             .font(.system(size: 20, weight: .semibold, design: .rounded))
-                        
+
                         Text(session.peer.url)
                             .foregroundColor(.grey50)
                             .font(.system(size: 13, weight: .medium, design: .rounded))
                     }
-                    
+
                     Spacer()
-                    
+
                     Image("forward-shevron")
                         .foregroundColor(.grey8)
                         .padding(.trailing, 20)
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Web3Inbox/Web3InboxViewController.swift b/Example/WalletApp/PresentationLayer/Wallet/Web3Inbox/Web3InboxViewController.swift
index e4043cca5..c72138c94 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Web3Inbox/Web3InboxViewController.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Web3Inbox/Web3InboxViewController.swift
@@ -4,7 +4,6 @@ import Web3Inbox
 
 final class Web3InboxViewController: UIViewController {
 
-
     init() {
         super.init(nibName: nil, bundle: nil)
     }
@@ -22,6 +21,3 @@ final class Web3InboxViewController: UIViewController {
         view = Web3Inbox.instance.getWebView()
     }
 }
-
-
-
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomeModule.swift b/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomeModule.swift
index 000f8e651..47c6faf2a 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomeModule.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomeModule.swift
@@ -8,9 +8,9 @@ final class WelcomeModule {
         let presenter = WelcomePresenter(interactor: interactor, router: router)
         let view = WelcomeView().environmentObject(presenter)
         let viewController = SceneViewController(viewModel: presenter, content: view)
-        
+
         router.viewController = viewController
-        
+
         return viewController
     }
 }
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomePresenter.swift b/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomePresenter.swift
index 2b60f80ab..a447b8f16 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomePresenter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomePresenter.swift
@@ -14,9 +14,9 @@ final class WelcomePresenter: ObservableObject {
         self.interactor = interactor
         self.router = router
     }
-    
+
     func onGetStarted() {
-        
+
         let pasteboard = UIPasteboard.general
         let clientId = try? Networking.interactor.getClientId()
         pasteboard.string = clientId
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomeRouter.swift b/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomeRouter.swift
index e7c495e62..ade633cf2 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomeRouter.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomeRouter.swift
@@ -8,7 +8,7 @@ final class WelcomeRouter {
     init(app: Application) {
         self.app = app
     }
-    
+
     func presentWallet() {
         MainModule.create(app: app)
             .present()
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomeView.swift b/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomeView.swift
index a0c8ab63a..e29038c69 100644
--- a/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomeView.swift
+++ b/Example/WalletApp/PresentationLayer/Wallet/Welcome/WelcomeView.swift
@@ -2,38 +2,38 @@ import SwiftUI
 
 struct WelcomeView: View {
     @Environment(\.colorScheme) var colorScheme
-    
+
     @EnvironmentObject var presenter: WelcomePresenter
-    
+
     @State private var presentWallet = false
-    
+
     var body: some View {
         ZStack {
             Color.grey100
                 .edgesIgnoringSafeArea(.all)
-            
+
             VStack {
                 Spacer()
-                
+
                 Image((colorScheme == .light) ? "welcome-light" : "welcome-dark")
                     .scaledToFill()
             }
             .edgesIgnoringSafeArea(.all)
-            
+
             VStack(spacing: 0) {
                 Text("Welcome")
                     .foregroundColor(.grey8)
                     .font(.system(size: 34, weight: .bold, design: .rounded))
-                
+
                 Text("We made this Example Wallet App to help developers integrate the WalletConnect SDK and provide an amazing experience to their users.")
                     .foregroundColor(.grey50)
                     .font(.system(size: 15, weight: .medium, design: .rounded))
                     .multilineTextAlignment(.center)
                     .lineSpacing(3)
                     .padding(.top, 10)
-                
+
                 Spacer()
-                
+
                 Button {
                     presenter.onGetStarted()
                 } label: {
diff --git a/Package.swift b/Package.swift
index c8a77cfb3..6310e1877 100644
--- a/Package.swift
+++ b/Package.swift
@@ -45,7 +45,7 @@ let package = Package(
             targets: ["Web3Inbox"]),
         .library(
             name: "Web3Modal",
-            targets: ["Web3Modal"]),
+            targets: ["Web3Modal"])
 
     ],
     dependencies: [
diff --git a/Sources/Auth/AuthClientProtocol.swift b/Sources/Auth/AuthClientProtocol.swift
index d79048ca8..712918150 100644
--- a/Sources/Auth/AuthClientProtocol.swift
+++ b/Sources/Auth/AuthClientProtocol.swift
@@ -3,7 +3,7 @@ import Combine
 
 public protocol AuthClientProtocol {
     var authRequestPublisher: AnyPublisher<(request: AuthRequest, context: VerifyContext?), Never> { get }
-    
+
     func formatMessage(payload: AuthPayload, address: String) throws -> String
     func respond(requestId: RPCID, signature: CacaoSignature, from account: Account) async throws
     func reject(requestId: RPCID) async throws
diff --git a/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift b/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift
index 18cda08d3..67210b3b8 100644
--- a/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift
+++ b/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift
@@ -10,7 +10,7 @@ class WalletRequestSubscriber {
     private let pairingRegisterer: PairingRegisterer
     private let verifyClient: VerifyClient?
     var onRequest: (((request: AuthRequest, context: VerifyContext?)) -> Void)?
-    
+
     init(
         networkingInteractor: NetworkInteracting,
         logger: ConsoleLogging,
@@ -27,19 +27,19 @@ class WalletRequestSubscriber {
         self.verifyClient = verifyClient
         subscribeForRequest()
     }
-    
+
     private func subscribeForRequest() {
         pairingRegisterer.register(method: AuthRequestProtocolMethod())
             .sink { [unowned self] (payload: RequestSubscriptionPayload<AuthRequestParams>) in
                 logger.debug("WalletRequestSubscriber: Received request")
-                
+
                 pairingRegisterer.activate(
                     pairingTopic: payload.topic,
                     peerMetadata: payload.request.requester.metadata
                 )
-                
+
                 let request = AuthRequest(id: payload.id, payload: payload.request.payloadParams)
-                
+
                 guard let verifyClient else {
                     onRequest?((request, nil))
                     return
diff --git a/Sources/Chat/Types/Payloads/MessagePayload.swift b/Sources/Chat/Types/Payloads/MessagePayload.swift
index bb0632d5d..72c6df7cb 100644
--- a/Sources/Chat/Types/Payloads/MessagePayload.swift
+++ b/Sources/Chat/Types/Payloads/MessagePayload.swift
@@ -11,7 +11,7 @@ struct MessagePayload: JWTClaimsCodable {
         let aud: String // recipient blockchain account (did:pkh)
         let sub: String // message sent by the author account
         let act: String // description of action intent
-        
+
         // TODO: Media not implemented
         // public let xma: Media?
     }
diff --git a/Sources/WalletConnectEcho/Register/EchoAuthenticator.swift b/Sources/WalletConnectEcho/Register/EchoAuthenticator.swift
index c47247fa4..6a7e6626e 100644
--- a/Sources/WalletConnectEcho/Register/EchoAuthenticator.swift
+++ b/Sources/WalletConnectEcho/Register/EchoAuthenticator.swift
@@ -27,4 +27,3 @@ class EchoAuthenticator: EchoAuthenticating {
         return Data.randomBytes(count: 32).toHexString()
     }
 }
-
diff --git a/Sources/WalletConnectEcho/Register/EchoRegisterService.swift b/Sources/WalletConnectEcho/Register/EchoRegisterService.swift
index e7e27e68f..ee690656b 100644
--- a/Sources/WalletConnectEcho/Register/EchoRegisterService.swift
+++ b/Sources/WalletConnectEcho/Register/EchoRegisterService.swift
@@ -57,4 +57,3 @@ actor EchoRegisterService {
     }
 #endif
 }
-
diff --git a/Sources/WalletConnectEcho/Register/EchoService.swift b/Sources/WalletConnectEcho/Register/EchoService.swift
index 44c328101..acde1a88a 100644
--- a/Sources/WalletConnectEcho/Register/EchoService.swift
+++ b/Sources/WalletConnectEcho/Register/EchoService.swift
@@ -43,7 +43,7 @@ enum EchoAPI: HTTPService {
         return "https"
     }
 
-    var additionalHeaderFields: [String : String]? {
+    var additionalHeaderFields: [String: String]? {
         switch self {
         case .register(_, _, _, _, let auth):
             return ["Authorization": auth]
@@ -53,4 +53,3 @@ enum EchoAPI: HTTPService {
     }
 
 }
-
diff --git a/Sources/WalletConnectIdentity/IdentityKeyAPI.swift b/Sources/WalletConnectIdentity/IdentityKeyAPI.swift
index b99d7165c..bb32c0758 100644
--- a/Sources/WalletConnectIdentity/IdentityKeyAPI.swift
+++ b/Sources/WalletConnectIdentity/IdentityKeyAPI.swift
@@ -40,7 +40,7 @@ enum IdentityKeyAPI: HTTPService {
         }
     }
 
-    var queryParameters: [String : String]? {
+    var queryParameters: [String: String]? {
         switch self {
         case .resolveIdentity(let publicKey):
             return ["publicKey": publicKey]
@@ -51,7 +51,7 @@ enum IdentityKeyAPI: HTTPService {
         }
     }
 
-    var additionalHeaderFields: [String : String]? {
+    var additionalHeaderFields: [String: String]? {
         return nil
     }
 }
diff --git a/Sources/WalletConnectKMS/Keychain/GroupKeychainStorage.swift b/Sources/WalletConnectKMS/Keychain/GroupKeychainStorage.swift
index 7523f26f5..f0812b160 100644
--- a/Sources/WalletConnectKMS/Keychain/GroupKeychainStorage.swift
+++ b/Sources/WalletConnectKMS/Keychain/GroupKeychainStorage.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 public final class GroupKeychainStorage: KeychainStorageProtocol {
diff --git a/Sources/WalletConnectKMS/Serialiser/Serializer.swift b/Sources/WalletConnectKMS/Serialiser/Serializer.swift
index dcd8f984e..9d36ecb0c 100644
--- a/Sources/WalletConnectKMS/Serialiser/Serializer.swift
+++ b/Sources/WalletConnectKMS/Serialiser/Serializer.swift
@@ -58,7 +58,7 @@ public class Serializer: Serializing {
             throw Errors.symmetricKeyForTopicNotFound
         }
     }
-    
+
     private func handleType1Envelope<T: Codable>(_ topic: String, peerPubKey: Data, sealbox: Data) throws -> (T, String, Data) {
         guard let selfPubKey = kms.getPublicKey(for: topic)
         else { throw Errors.publicKeyForTopicNotFound }
diff --git a/Sources/WalletConnectNetworking/HTTPClient/HTTPNetworkClient.swift b/Sources/WalletConnectNetworking/HTTPClient/HTTPNetworkClient.swift
index 1cb5da106..b87948bd6 100644
--- a/Sources/WalletConnectNetworking/HTTPClient/HTTPNetworkClient.swift
+++ b/Sources/WalletConnectNetworking/HTTPClient/HTTPNetworkClient.swift
@@ -56,7 +56,7 @@ public actor HTTPNetworkClient: HTTPClient {
             completion(.failure(HTTPError.malformedURL(service)))
             return
         }
-        session.dataTask(with: request) { data, response, error in
+        session.dataTask(with: request) { _, response, error in
             do {
                 try HTTPNetworkClient.validate(response, error)
                 completion(.success(()))
diff --git a/Sources/WalletConnectNetworking/NetworkingInteractor.swift b/Sources/WalletConnectNetworking/NetworkingInteractor.swift
index 1f8a7cebf..e9e49dac0 100644
--- a/Sources/WalletConnectNetworking/NetworkingInteractor.swift
+++ b/Sources/WalletConnectNetworking/NetworkingInteractor.swift
@@ -1,7 +1,6 @@
 import Foundation
 import Combine
 
-
 public class NetworkingInteractor: NetworkInteracting {
     private var publishers = Set<AnyCancellable>()
     private let relayClient: RelayClient
@@ -96,7 +95,7 @@ public class NetworkingInteractor: NetworkInteracting {
     public func responseErrorSubscription<Request: Codable>(on request: ProtocolMethod) -> AnyPublisher<ResponseSubscriptionErrorPayload<Request>, Never> {
         return responsePublisher
             .filter { $0.request.method == request.method }
-            .compactMap { topic, rpcRequest, rpcResponse, publishedAt, _ in
+            .compactMap { topic, rpcRequest, rpcResponse, _, _ in
                 guard let id = rpcResponse.id, let request = try? rpcRequest.params?.get(Request.self), let error = rpcResponse.error else { return nil }
                 return ResponseSubscriptionErrorPayload(id: id, topic: topic, request: request, error: error)
             }
diff --git a/Sources/WalletConnectPairing/Services/Common/PairingResubscribeService.swift b/Sources/WalletConnectPairing/Services/Common/PairingResubscribeService.swift
index b1ff2d304..aff25c7ca 100644
--- a/Sources/WalletConnectPairing/Services/Common/PairingResubscribeService.swift
+++ b/Sources/WalletConnectPairing/Services/Common/PairingResubscribeService.swift
@@ -18,7 +18,7 @@ final class PairingResubscribeService {
         networkInteractor.socketConnectionStatusPublisher
             .sink { [unowned self] status in
                 guard status == .connected else { return }
-                let topics = pairingStorage.getAll().map{$0.topic}
+                let topics = pairingStorage.getAll().map {$0.topic}
                 Task(priority: .high) {
                     try await networkInteractor.batchSubscribe(topics: topics)
                 }
diff --git a/Sources/WalletConnectPairing/Types/AppMetadata.swift b/Sources/WalletConnectPairing/Types/AppMetadata.swift
index e30e8c71c..541c7e4f7 100644
--- a/Sources/WalletConnectPairing/Types/AppMetadata.swift
+++ b/Sources/WalletConnectPairing/Types/AppMetadata.swift
@@ -42,7 +42,7 @@ public struct AppMetadata: Codable, Equatable {
 
     /// An array of URL strings pointing to the icon assets on the web.
     public let icons: [String]
-    
+
     /// The URL which used by VerifyClient.
     public let verifyUrl: String?
 
diff --git a/Sources/WalletConnectPush/Client/Common/PushResubscribeService.swift b/Sources/WalletConnectPush/Client/Common/PushResubscribeService.swift
index 227d8d2cb..58b614374 100644
--- a/Sources/WalletConnectPush/Client/Common/PushResubscribeService.swift
+++ b/Sources/WalletConnectPush/Client/Common/PushResubscribeService.swift
@@ -19,7 +19,7 @@ final class PushResubscribeService {
         networkInteractor.socketConnectionStatusPublisher
             .sink { [unowned self] status in
                 guard status == .connected else { return }
-                let topics = subscriptionsStorage.getAll().map{$0.topic}
+                let topics = subscriptionsStorage.getAll().map {$0.topic}
                 Task(priority: .high) {
                     try await networkInteractor.batchSubscribe(topics: topics)
                 }
diff --git a/Sources/WalletConnectPush/Client/Dapp/wc_notifyPropose/NotifyProposeResponseSubscriber.swift b/Sources/WalletConnectPush/Client/Dapp/wc_notifyPropose/NotifyProposeResponseSubscriber.swift
index 48061be1e..0669f06fe 100644
--- a/Sources/WalletConnectPush/Client/Dapp/wc_notifyPropose/NotifyProposeResponseSubscriber.swift
+++ b/Sources/WalletConnectPush/Client/Dapp/wc_notifyPropose/NotifyProposeResponseSubscriber.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 import Combine
 
@@ -26,7 +25,6 @@ class NotifyProposeResponseSubscriber {
         subscribeForProposalErrors()
     }
 
-
     private func subscribeForProposalResponse() {
         let protocolMethod = NotifyProposeProtocolMethod()
         networkingInteractor.responseSubscription(on: protocolMethod)
diff --git a/Sources/WalletConnectPush/Client/Dapp/wc_notifyPropose/NotifyProposer.swift b/Sources/WalletConnectPush/Client/Dapp/wc_notifyPropose/NotifyProposer.swift
index 02c3720f2..7f89950eb 100644
--- a/Sources/WalletConnectPush/Client/Dapp/wc_notifyPropose/NotifyProposer.swift
+++ b/Sources/WalletConnectPush/Client/Dapp/wc_notifyPropose/NotifyProposer.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 class NotifyProposer {
diff --git a/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_notifyPropose/NotifyProposeResponder.swift b/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_notifyPropose/NotifyProposeResponder.swift
index 2680cefa6..cf4f66bfa 100644
--- a/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_notifyPropose/NotifyProposeResponder.swift
+++ b/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_notifyPropose/NotifyProposeResponder.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 import Combine
 
@@ -94,4 +93,3 @@ class NotifyProposeResponder {
         return keys
     }
 }
-
diff --git a/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_notifyUpdate/NotifyUpdateRequester.swift b/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_notifyUpdate/NotifyUpdateRequester.swift
index 814a08d2e..614bb3a88 100644
--- a/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_notifyUpdate/NotifyUpdateRequester.swift
+++ b/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_notifyUpdate/NotifyUpdateRequester.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 class NotifyUpdateRequester {
diff --git a/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_notifyUpdate/NotifyUpdateResponseSubscriber.swift b/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_notifyUpdate/NotifyUpdateResponseSubscriber.swift
index ef7e24ea0..9d38d69a8 100644
--- a/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_notifyUpdate/NotifyUpdateResponseSubscriber.swift
+++ b/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_notifyUpdate/NotifyUpdateResponseSubscriber.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 import Combine
 
@@ -47,7 +46,7 @@ class NotifyUpdateResponseSubscriber {
                         return
                     }
                     let expiry = Date(timeIntervalSince1970: TimeInterval(claims.exp))
-                    
+
                     let updatedSubscription = PushSubscription(topic: subscriptionTopic, account: oldSubscription.account, relay: oldSubscription.relay, metadata: oldSubscription.metadata, scope: scope, expiry: expiry)
 
                     subscriptionsStore.set(updatedSubscription, forKey: subscriptionTopic)
diff --git a/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_pushSubscribe/PushSubscribeRequester.swift b/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_pushSubscribe/PushSubscribeRequester.swift
index 2a4f12782..df290dcc3 100644
--- a/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_pushSubscribe/PushSubscribeRequester.swift
+++ b/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_pushSubscribe/PushSubscribeRequester.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 class PushSubscribeRequester {
@@ -49,7 +48,7 @@ class PushSubscribeRequester {
         let keysY = try generateAgreementKeys(peerPublicKey: peerPublicKey)
 
         let responseTopic  = keysY.derivedTopic()
-        
+
         dappsMetadataStore.set(metadata, forKey: responseTopic)
 
         try kms.setSymmetricKey(keysY.sharedKey, for: subscribeTopic)
@@ -83,7 +82,6 @@ class PushSubscribeRequester {
         return try AgreementPublicKey(base64url: pubKeyBase64Url)
     }
 
-
     private func generateAgreementKeys(peerPublicKey: AgreementPublicKey) throws -> AgreementKeys {
         let selfPubKey = try kms.createX25519KeyPair()
 
@@ -93,7 +91,7 @@ class PushSubscribeRequester {
 
     private func createJWTWrapper(subscriptionAccount: Account, dappUrl: String) async throws -> SubscriptionJWTPayload.Wrapper {
         let types = try await subscriptionScopeProvider.getSubscriptionScope(dappUrl: dappUrl)
-        let scope = types.map{$0.name}.joined(separator: " ")
+        let scope = types.map {$0.name}.joined(separator: " ")
         let jwtPayload = SubscriptionJWTPayload(keyserver: keyserverURL, subscriptionAccount: subscriptionAccount, dappUrl: dappUrl, scope: scope)
         return try identityClient.signAndCreateWrapper(
             payload: jwtPayload,
diff --git a/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_pushSubscribe/PushSubscribeResponseSubscriber.swift b/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_pushSubscribe/PushSubscribeResponseSubscriber.swift
index b5aa6af71..0a557c4bd 100644
--- a/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_pushSubscribe/PushSubscribeResponseSubscriber.swift
+++ b/Sources/WalletConnectPush/Client/Wallet/ProtocolEngine/wc_pushSubscribe/PushSubscribeResponseSubscriber.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 import Combine
 
@@ -71,7 +70,7 @@ class PushSubscribeResponseSubscriber {
                         account = try Account(DIDPKHString: claims.sub)
                         metadata = try dappsMetadataStore.get(key: payload.topic)
                         let availableTypes = try await subscriptionScopeProvider.getSubscriptionScope(dappUrl: metadata!.url)
-                        subscribedTypes = availableTypes.filter{subscribedScope.contains($0.name)}
+                        subscribedTypes = availableTypes.filter {subscribedScope.contains($0.name)}
                         logger.debug("PushSubscribeResponseSubscriber: subscribing push subscription topic: \(pushSubscriptionTopic!)")
                         try await networkingInteractor.subscribe(topic: pushSubscriptionTopic)
                     } catch {
diff --git a/Sources/WalletConnectPush/Client/Wallet/PushMessagesDatabase.swift b/Sources/WalletConnectPush/Client/Wallet/PushMessagesDatabase.swift
index 4bb026d3c..6d095e705 100644
--- a/Sources/WalletConnectPush/Client/Wallet/PushMessagesDatabase.swift
+++ b/Sources/WalletConnectPush/Client/Wallet/PushMessagesDatabase.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 import WalletConnectUtils
 import Combine
@@ -11,11 +10,11 @@ class PushMessagesDatabase {
     }
 
     func getPushMessages(topic: String) -> [PushMessageRecord] {
-        return store.getAll().filter{$0.topic == topic}
+        return store.getAll().filter {$0.topic == topic}
     }
 
     func deletePushMessages(topic: String) {
-        let messagesKeys = getPushMessages(topic: topic).map{$0.id}
+        let messagesKeys = getPushMessages(topic: topic).map {$0.id}
         store.delete(forKeys: messagesKeys)
     }
 
diff --git a/Sources/WalletConnectPush/Client/Wallet/SubscriptionScopeProvider.swift b/Sources/WalletConnectPush/Client/Wallet/SubscriptionScopeProvider.swift
index a2140addd..586da5abb 100644
--- a/Sources/WalletConnectPush/Client/Wallet/SubscriptionScopeProvider.swift
+++ b/Sources/WalletConnectPush/Client/Wallet/SubscriptionScopeProvider.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 class SubscriptionScopeProvider {
diff --git a/Sources/WalletConnectPush/Client/Wallet/WalletPushClient.swift b/Sources/WalletConnectPush/Client/Wallet/WalletPushClient.swift
index fa8076d76..dced9fcc5 100644
--- a/Sources/WalletConnectPush/Client/Wallet/WalletPushClient.swift
+++ b/Sources/WalletConnectPush/Client/Wallet/WalletPushClient.swift
@@ -4,7 +4,6 @@ import WalletConnectNetworking
 import WalletConnectPairing
 import WalletConnectEcho
 
-
 public class WalletPushClient {
 
     private var publishers = Set<AnyCancellable>()
@@ -145,4 +144,3 @@ extension WalletPushClient {
     }
 }
 #endif
-
diff --git a/Sources/WalletConnectPush/Client/Wallet/WalletPushClientFactory.swift b/Sources/WalletConnectPush/Client/Wallet/WalletPushClientFactory.swift
index 55dd526f0..0b82adcc9 100644
--- a/Sources/WalletConnectPush/Client/Wallet/WalletPushClientFactory.swift
+++ b/Sources/WalletConnectPush/Client/Wallet/WalletPushClientFactory.swift
@@ -6,7 +6,7 @@ import WalletConnectIdentity
 public struct WalletPushClientFactory {
 
     public static func create(networkInteractor: NetworkInteracting, pairingRegisterer: PairingRegisterer, echoClient: EchoClient) -> WalletPushClient {
-        let logger = ConsoleLogger(suffix: "🔔",loggingLevel: .debug)
+        let logger = ConsoleLogger(suffix: "🔔", loggingLevel: .debug)
         let keyValueStorage = UserDefaults.standard
         let keyserverURL = URL(string: "https://keys.walletconnect.com")!
         let keychainStorage = KeychainStorage(serviceIdentifier: "com.walletconnect.sdk")
@@ -50,7 +50,6 @@ public struct WalletPushClientFactory {
         let resubscribeService = PushResubscribeService(networkInteractor: networkInteractor, subscriptionsStorage: subscriptionStore)
         let pushSubscriptionsObserver = PushSubscriptionsObserver(store: subscriptionStore)
 
-
         let dappsMetadataStore = CodableStore<AppMetadata>(defaults: keyValueStorage, identifier: PushStorageIdntifiers.dappsMetadataStore)
         let subscriptionScopeProvider = SubscriptionScopeProvider()
 
diff --git a/Sources/WalletConnectPush/Client/Wallet/WebDidResolver.swift b/Sources/WalletConnectPush/Client/Wallet/WebDidResolver.swift
index f7e6617ad..2d6279677 100644
--- a/Sources/WalletConnectPush/Client/Wallet/WebDidResolver.swift
+++ b/Sources/WalletConnectPush/Client/Wallet/WebDidResolver.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 class WebDidResolver {
diff --git a/Sources/WalletConnectPush/ProtocolMethods/NotifyProposeProtocolMethod.swift b/Sources/WalletConnectPush/ProtocolMethods/NotifyProposeProtocolMethod.swift
index 027293d19..bd90fda5c 100644
--- a/Sources/WalletConnectPush/ProtocolMethods/NotifyProposeProtocolMethod.swift
+++ b/Sources/WalletConnectPush/ProtocolMethods/NotifyProposeProtocolMethod.swift
@@ -9,4 +9,3 @@ struct NotifyProposeProtocolMethod: ProtocolMethod {
 
     let responseConfig: RelayConfig = RelayConfig(tag: 4011, prompt: true, ttl: 86400)
 }
-
diff --git a/Sources/WalletConnectPush/ProtocolMethods/NotifyUpdateProtocolMethod.swift b/Sources/WalletConnectPush/ProtocolMethods/NotifyUpdateProtocolMethod.swift
index 198ec859f..f4731feeb 100644
--- a/Sources/WalletConnectPush/ProtocolMethods/NotifyUpdateProtocolMethod.swift
+++ b/Sources/WalletConnectPush/ProtocolMethods/NotifyUpdateProtocolMethod.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 struct NotifyUpdateProtocolMethod: ProtocolMethod {
@@ -8,4 +7,3 @@ struct NotifyUpdateProtocolMethod: ProtocolMethod {
 
     let responseConfig: RelayConfig = RelayConfig(tag: 4009, prompt: true, ttl: 86400)
 }
-
diff --git a/Sources/WalletConnectPush/ProtocolMethods/PushSubscribeProtocolMethod.swift b/Sources/WalletConnectPush/ProtocolMethods/PushSubscribeProtocolMethod.swift
index a101dc0e5..6b12a0b98 100644
--- a/Sources/WalletConnectPush/ProtocolMethods/PushSubscribeProtocolMethod.swift
+++ b/Sources/WalletConnectPush/ProtocolMethods/PushSubscribeProtocolMethod.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 struct PushSubscribeProtocolMethod: ProtocolMethod {
diff --git a/Sources/WalletConnectPush/RPCRequests/NotifyProposeParams.swift b/Sources/WalletConnectPush/RPCRequests/NotifyProposeParams.swift
index 2d33ca7d7..623b6f427 100644
--- a/Sources/WalletConnectPush/RPCRequests/NotifyProposeParams.swift
+++ b/Sources/WalletConnectPush/RPCRequests/NotifyProposeParams.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 struct NotifyProposeParams: Codable {
diff --git a/Sources/WalletConnectPush/RPCRequests/NotifyProposeResponseParams.swift b/Sources/WalletConnectPush/RPCRequests/NotifyProposeResponseParams.swift
index a74c795bb..90ee1a60f 100644
--- a/Sources/WalletConnectPush/RPCRequests/NotifyProposeResponseParams.swift
+++ b/Sources/WalletConnectPush/RPCRequests/NotifyProposeResponseParams.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 struct NotifyProposeResponseParams: Codable {
diff --git a/Sources/WalletConnectPush/RPCRequests/SubscribeResponseParams.swift b/Sources/WalletConnectPush/RPCRequests/SubscribeResponseParams.swift
index 51e75148f..da111ae53 100644
--- a/Sources/WalletConnectPush/RPCRequests/SubscribeResponseParams.swift
+++ b/Sources/WalletConnectPush/RPCRequests/SubscribeResponseParams.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 struct SubscribeResponseParams: Codable {
diff --git a/Sources/WalletConnectPush/RPCRequests/SubscriptionJWTPayload.swift b/Sources/WalletConnectPush/RPCRequests/SubscriptionJWTPayload.swift
index d45ac558b..d884bbcd6 100644
--- a/Sources/WalletConnectPush/RPCRequests/SubscriptionJWTPayload.swift
+++ b/Sources/WalletConnectPush/RPCRequests/SubscriptionJWTPayload.swift
@@ -65,4 +65,3 @@ struct SubscriptionJWTPayload: JWTClaimsCodable {
         )
     }
 }
-
diff --git a/Sources/WalletConnectPush/Types/NotificationConfig.swift b/Sources/WalletConnectPush/Types/NotificationConfig.swift
index c53e9b674..648239f3b 100644
--- a/Sources/WalletConnectPush/Types/NotificationConfig.swift
+++ b/Sources/WalletConnectPush/Types/NotificationConfig.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 struct NotificationConfig: Codable {
diff --git a/Sources/WalletConnectPush/Types/NotificationType.swift b/Sources/WalletConnectPush/Types/NotificationType.swift
index b741c4a2f..6b32cde98 100644
--- a/Sources/WalletConnectPush/Types/NotificationType.swift
+++ b/Sources/WalletConnectPush/Types/NotificationType.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 public struct NotificationType: Codable, Hashable {
diff --git a/Sources/WalletConnectPush/Types/PushRequest.swift b/Sources/WalletConnectPush/Types/PushRequest.swift
index a27b87a9b..b559b4c83 100644
--- a/Sources/WalletConnectPush/Types/PushRequest.swift
+++ b/Sources/WalletConnectPush/Types/PushRequest.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 import WalletConnectPairing
 
diff --git a/Sources/WalletConnectPush/Types/PushSubscriptionResult.swift b/Sources/WalletConnectPush/Types/PushSubscriptionResult.swift
index 3e7044917..61dc1d674 100644
--- a/Sources/WalletConnectPush/Types/PushSubscriptionResult.swift
+++ b/Sources/WalletConnectPush/Types/PushSubscriptionResult.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 public struct PushSubscriptionResult: Equatable, Codable {
diff --git a/Sources/WalletConnectPush/Types/WebDidDoc.swift b/Sources/WalletConnectPush/Types/WebDidDoc.swift
index 28f301773..aca4975f0 100644
--- a/Sources/WalletConnectPush/Types/WebDidDoc.swift
+++ b/Sources/WalletConnectPush/Types/WebDidDoc.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 // MARK: - WebDidDoc
diff --git a/Sources/WalletConnectRelay/AppStateObserving.swift b/Sources/WalletConnectRelay/AppStateObserving.swift
index 9626d463e..152406996 100644
--- a/Sources/WalletConnectRelay/AppStateObserving.swift
+++ b/Sources/WalletConnectRelay/AppStateObserving.swift
@@ -27,7 +27,7 @@ class AppStateObserver: AppStateObserving {
     }
 
     @MainActor
-    var currentState: ApplicationState{
+    var currentState: ApplicationState {
         get async {
 #if canImport(UIKit)
             let isActive = UIApplication.shared.applicationState == .active
diff --git a/Sources/WalletConnectRelay/BundleFinder.swift b/Sources/WalletConnectRelay/BundleFinder.swift
index b237dbb00..6303b7a42 100644
--- a/Sources/WalletConnectRelay/BundleFinder.swift
+++ b/Sources/WalletConnectRelay/BundleFinder.swift
@@ -16,7 +16,7 @@ extension Foundation.Bundle {
 
             // For command-line tools.
             Bundle.main.bundleURL,
-            
+
             // One of these should be used when building SwiftUI Previews
             Bundle(for: BundleFinder.self).resourceURL?
                 .deletingLastPathComponent()
diff --git a/Sources/WalletConnectRelay/Dispatching.swift b/Sources/WalletConnectRelay/Dispatching.swift
index 71d08f576..2dd24c573 100644
--- a/Sources/WalletConnectRelay/Dispatching.swift
+++ b/Sources/WalletConnectRelay/Dispatching.swift
@@ -15,10 +15,10 @@ final class Dispatcher: NSObject, Dispatching {
     var onMessage: ((String) -> Void)?
     var socket: WebSocketConnecting
     var socketConnectionHandler: SocketConnectionHandler
-    
+
     private let relayUrlFactory: RelayUrlFactory
     private let logger: ConsoleLogging
-    
+
     private let defaultTimeout: Int = 5
 
     private let socketConnectionStatusPublisherSubject = CurrentValueSubject<SocketConnectionStatus, Never>(.disconnected)
@@ -37,16 +37,16 @@ final class Dispatcher: NSObject, Dispatching {
     ) {
         self.relayUrlFactory = relayUrlFactory
         self.logger = logger
-        
+
         let socket = socketFactory.create(with: relayUrlFactory.create())
         socket.request.addValue(EnvironmentInfo.userAgent, forHTTPHeaderField: "User-Agent")
         self.socket = socket
-        
+
         switch socketConnectionType {
         case .automatic:    socketConnectionHandler = AutomaticSocketConnectionHandler(socket: socket)
         case .manual:       socketConnectionHandler = ManualSocketConnectionHandler(socket: socket)
         }
-        
+
         super.init()
         setUpWebSocketSession()
         setUpSocketConnectionObserving()
diff --git a/Sources/WalletConnectRelay/Misc/NetworkError.swift b/Sources/WalletConnectRelay/Misc/NetworkError.swift
index bb96055a5..5ec3310fe 100644
--- a/Sources/WalletConnectRelay/Misc/NetworkError.swift
+++ b/Sources/WalletConnectRelay/Misc/NetworkError.swift
@@ -10,7 +10,7 @@ extension NetworkError: LocalizedError {
     var errorDescription: String? {
         return localizedDescription
     }
-    
+
     var localizedDescription: String {
         switch self {
         case .webSocketNotConnected:
diff --git a/Sources/WalletConnectRelay/RPC/Methods/BatchSubscribe.swift b/Sources/WalletConnectRelay/RPC/Methods/BatchSubscribe.swift
index e3dc5f176..b5968e525 100644
--- a/Sources/WalletConnectRelay/RPC/Methods/BatchSubscribe.swift
+++ b/Sources/WalletConnectRelay/RPC/Methods/BatchSubscribe.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 struct BatchSubscribe: RelayRPC {
@@ -13,4 +12,3 @@ struct BatchSubscribe: RelayRPC {
         "irn_batchSubscribe"
     }
 }
-
diff --git a/Sources/WalletConnectRelay/RPC/Methods/Publish.swift b/Sources/WalletConnectRelay/RPC/Methods/Publish.swift
index efa83e48c..34e816261 100644
--- a/Sources/WalletConnectRelay/RPC/Methods/Publish.swift
+++ b/Sources/WalletConnectRelay/RPC/Methods/Publish.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 struct Publish: RelayRPC {
@@ -17,4 +16,3 @@ struct Publish: RelayRPC {
         "irn_publish"
     }
 }
-
diff --git a/Sources/WalletConnectRelay/RPC/Methods/Subscribe.swift b/Sources/WalletConnectRelay/RPC/Methods/Subscribe.swift
index 73d2eb22e..55a1cda81 100644
--- a/Sources/WalletConnectRelay/RPC/Methods/Subscribe.swift
+++ b/Sources/WalletConnectRelay/RPC/Methods/Subscribe.swift
@@ -10,4 +10,3 @@ struct Subscribe: RelayRPC {
         "irn_subscribe"
     }
 }
-
diff --git a/Sources/WalletConnectRelay/RPC/Methods/Unsubscribe.swift b/Sources/WalletConnectRelay/RPC/Methods/Unsubscribe.swift
index d424370c3..c874a9a93 100644
--- a/Sources/WalletConnectRelay/RPC/Methods/Unsubscribe.swift
+++ b/Sources/WalletConnectRelay/RPC/Methods/Unsubscribe.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 struct Unsubscribe: RelayRPC {
@@ -14,4 +13,3 @@ struct Unsubscribe: RelayRPC {
         "irn_unsubscribe"
     }
 }
-
diff --git a/Sources/WalletConnectRelay/RelayClient.swift b/Sources/WalletConnectRelay/RelayClient.swift
index 6831041bb..c19c1cb44 100644
--- a/Sources/WalletConnectRelay/RelayClient.swift
+++ b/Sources/WalletConnectRelay/RelayClient.swift
@@ -188,7 +188,6 @@ public final class RelayClient {
         }
     }
 
-
     private func observeSubscription(requestId: RPCID, topics: [String]) {
         var cancellable: AnyCancellable?
         cancellable = subscriptionResponsePublisher
diff --git a/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift b/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift
index acb93af8b..1728a73bf 100644
--- a/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift
+++ b/Sources/WalletConnectSign/Engine/Common/ApproveEngine.swift
@@ -280,7 +280,7 @@ private extension ApproveEngine {
             return respondError(payload: payload, reason: .invalidUpdateRequest, protocolMethod: SessionProposeProtocolMethod())
         }
         proposalPayloadsStore.set(payload, forKey: proposal.proposer.publicKey)
-        
+
         guard let verifyClient else {
             onSessionProposal?(proposal.publicRepresentation(pairingTopic: payload.topic), nil)
             return
diff --git a/Sources/WalletConnectSign/Engine/Common/SessionEngine.swift b/Sources/WalletConnectSign/Engine/Common/SessionEngine.swift
index 76dc4dc10..312cc050f 100644
--- a/Sources/WalletConnectSign/Engine/Common/SessionEngine.swift
+++ b/Sources/WalletConnectSign/Engine/Common/SessionEngine.swift
@@ -114,7 +114,7 @@ private extension SessionEngine {
         networkingInteractor.socketConnectionStatusPublisher
             .sink { [unowned self] status in
                 guard status == .connected else { return }
-                let topics = sessionStore.getAll().map{$0.topic}
+                let topics = sessionStore.getAll().map {$0.topic}
                 Task(priority: .high) {
                     try await networkingInteractor.batchSubscribe(topics: topics)
                 }
diff --git a/Sources/WalletConnectSign/Namespace.swift b/Sources/WalletConnectSign/Namespace.swift
index 43ba9518a..cfa686fe5 100644
--- a/Sources/WalletConnectSign/Namespace.swift
+++ b/Sources/WalletConnectSign/Namespace.swift
@@ -46,7 +46,7 @@ enum Namespace {
     static func validate(_ namespaces: [String: ProposalNamespace]) throws {
         for (key, namespace) in namespaces {
             let caip2Namespace = key.components(separatedBy: ":")
-            
+
             if caip2Namespace.count > 1 {
                 if let chain = caip2Namespace.last, !chain.isEmpty, namespace.chains != nil {
                     throw WalletConnectError.unsupportedNamespace(.unsupportedChains)
@@ -101,14 +101,14 @@ enum Namespace {
                         let unionChains = requiredNamespaces[network]?.chains!.union(proposalNamespace.chains ?? [])
                         let unionMethods = requiredNamespaces[network]?.methods.union(proposalNamespace.methods)
                         let unionEvents = requiredNamespaces[network]?.events.union(proposalNamespace.events)
-                        
+
                         let namespace = ProposalNamespace(chains: unionChains, methods: unionMethods ?? [], events: unionEvents ?? [])
                         requiredNamespaces[network] = namespace
                     }
                 }
             }
         }
-        
+
         for (key, proposedNamespace) in requiredNamespaces {
             guard let approvedNamespace = sessionNamespaces[key] else {
                 throw WalletConnectError.unsupportedNamespace(.unsupportedNamespaceKey)
@@ -169,17 +169,17 @@ public enum AutoNamespaces {
                 guard !sessionChains.isEmpty else {
                     throw AutoNamespacesError.requiredChainsNotSatisfied
                 }
-                
+
                 let sessionMethods = Set(proposalNamespace.methods).intersection(Set(methods))
                 guard proposalNamespace.methods.isSubset(of: Set(methods)) else {
                     throw AutoNamespacesError.requiredMethodsNotSatisfied
                 }
-                
+
                 let sessionEvents = Set(proposalNamespace.events).intersection(Set(events))
                 guard proposalNamespace.events.isSubset(of: Set(events)) else {
                     throw AutoNamespacesError.requiredEventsNotSatisfied
                 }
-                
+
                 let availableAccountsBlockchains = accounts.map { $0.blockchain }
                 guard !sessionChains.intersection(Set(availableAccountsBlockchains)).isEmpty else {
                     throw AutoNamespacesError.requiredAccountsNotSatisfied
@@ -191,7 +191,7 @@ public enum AutoNamespaces {
                     methods: sessionMethods,
                     events: sessionEvents
                 )
-                
+
                 if sessionNamespaces[caip2Namespace] == nil {
                     sessionNamespaces[caip2Namespace] = sessionNamespace
                 } else {
@@ -206,23 +206,22 @@ public enum AutoNamespaces {
                 }
             } else {
                 if let network = $0.key.components(separatedBy: ":").first,
-                   let chain = $0.key.components(separatedBy: ":").last
-                {
+                   let chain = $0.key.components(separatedBy: ":").last {
                     let sessionChains = Set([Blockchain(namespace: network, reference: chain)]).intersection(Set(chains))
                     guard !sessionChains.isEmpty else {
                         throw AutoNamespacesError.requiredChainsNotSatisfied
                     }
-                    
+
                     let sessionMethods = Set(proposalNamespace.methods).intersection(Set(methods))
                     guard proposalNamespace.methods.isSubset(of: Set(methods)) else {
                         throw AutoNamespacesError.requiredMethodsNotSatisfied
                     }
-                    
+
                     let sessionEvents = Set(proposalNamespace.events).intersection(Set(events))
                     guard proposalNamespace.events.isSubset(of: Set(events)) else {
                         throw AutoNamespacesError.requiredEventsNotSatisfied
                     }
-                    
+
                     let availableAccountsBlockchains = accounts.map { $0.blockchain }
                     guard !sessionChains.intersection(Set(availableAccountsBlockchains)).isEmpty else {
                         throw AutoNamespacesError.requiredAccountsNotSatisfied
@@ -234,7 +233,7 @@ public enum AutoNamespaces {
                         methods: sessionMethods,
                         events: sessionEvents
                     )
-                    
+
                     if sessionNamespaces[network] == nil {
                         sessionNamespaces[network] = sessionNamespace
                     } else {
@@ -250,7 +249,7 @@ public enum AutoNamespaces {
                 }
             }
         }
-        
+
         sessionProposal.optionalNamespaces?.forEach {
             let caip2Namespace = $0.key
             let proposalNamespace = $0.value
@@ -260,12 +259,12 @@ public enum AutoNamespaces {
                 guard !sessionChains.isEmpty else {
                     return
                 }
-                
+
                 let sessionMethods = Set(proposalNamespace.methods).intersection(Set(methods))
                 guard !sessionMethods.isEmpty else {
                     return
                 }
-                
+
                 let sessionEvents = Set(proposalNamespace.events).intersection(Set(events))
                 guard !sessionEvents.isEmpty else {
                     return
@@ -277,7 +276,7 @@ public enum AutoNamespaces {
                     methods: sessionMethods,
                     events: sessionEvents
                 )
-                
+
                 if sessionNamespaces[caip2Namespace] == nil {
                     sessionNamespaces[caip2Namespace] = sessionNamespace
                 } else {
@@ -292,30 +291,29 @@ public enum AutoNamespaces {
                 }
             } else {
                 if let network = $0.key.components(separatedBy: ":").first,
-                   let chain = $0.key.components(separatedBy: ":").last
-                {
+                   let chain = $0.key.components(separatedBy: ":").last {
                     let sessionChains = Set([Blockchain(namespace: network, reference: chain)]).intersection(Set(chains))
                     guard !sessionChains.isEmpty else {
                         return
                     }
-                    
+
                     let sessionMethods = Set(proposalNamespace.methods).intersection(Set(methods))
                     guard !sessionMethods.isEmpty else {
                         return
                     }
-                    
+
                     let sessionEvents = Set(proposalNamespace.events).intersection(Set(events))
                     guard !sessionEvents.isEmpty else {
                         return
                     }
-                    
+
                     let sessionNamespace = SessionNamespace(
                         chains: Set([Blockchain(namespace: network, reference: chain)!]),
                         accounts: Set(accounts).filter { $0.blockchain == Blockchain(namespace: network, reference: chain)! },
                         methods: sessionMethods,
                         events: sessionEvents
                     )
-                    
+
                     if sessionNamespaces[network] == nil {
                         sessionNamespaces[network] = sessionNamespace
                     } else {
@@ -331,7 +329,7 @@ public enum AutoNamespaces {
                 }
             }
         }
-        
+
         return sessionNamespaces
     }
 }
diff --git a/Sources/WalletConnectSign/Services/App/AppProposeService.swift b/Sources/WalletConnectSign/Services/App/AppProposeService.swift
index 541999a1a..9399e56df 100644
--- a/Sources/WalletConnectSign/Services/App/AppProposeService.swift
+++ b/Sources/WalletConnectSign/Services/App/AppProposeService.swift
@@ -38,7 +38,7 @@ final class AppProposeService {
         let proposer = Participant(
             publicKey: publicKey.hexRepresentation,
             metadata: metadata)
-        
+
         let proposal = SessionProposal(
             relays: [relay],
             proposer: proposer,
@@ -46,7 +46,7 @@ final class AppProposeService {
             optionalNamespaces: optionalNamespaces,
             sessionProperties: sessionProperties
         )
-        
+
         let request = RPCRequest(method: protocolMethod.method, params: proposal)
         try await networkingInteractor.request(request, topic: pairingTopic, protocolMethod: protocolMethod)
     }
diff --git a/Sources/WalletConnectSign/Session.swift b/Sources/WalletConnectSign/Session.swift
index c880f6cd0..1a7e14841 100644
--- a/Sources/WalletConnectSign/Session.swift
+++ b/Sources/WalletConnectSign/Session.swift
@@ -36,7 +36,7 @@ extension Session {
             self.name = name
             self.data = data
         }
-        
+
         internal func internalRepresentation() -> SessionType.EventParams.Event {
             SessionType.EventParams.Event(name: name, data: data)
         }
diff --git a/Sources/WalletConnectSign/Sign/SignClientProtocol.swift b/Sources/WalletConnectSign/Sign/SignClientProtocol.swift
index a1dcfc3f3..98d4aa58e 100644
--- a/Sources/WalletConnectSign/Sign/SignClientProtocol.swift
+++ b/Sources/WalletConnectSign/Sign/SignClientProtocol.swift
@@ -9,7 +9,7 @@ public protocol SignClientProtocol {
     var sessionSettlePublisher: AnyPublisher<Session, Never> { get }
     var sessionDeletePublisher: AnyPublisher<(String, Reason), Never> { get }
     var sessionResponsePublisher: AnyPublisher<Response, Never> { get }
-    
+
     func approve(proposalId: String, namespaces: [String: SessionNamespace]) async throws
     func reject(proposalId: String, reason: RejectionReason) async throws
     func update(topic: String, namespaces: [String: SessionNamespace]) async throws
@@ -20,7 +20,7 @@ public protocol SignClientProtocol {
     func disconnect(topic: String) async throws
     func getSessions() -> [Session]
     func cleanup() async throws
-    
+
     func getPendingRequests(topic: String?) -> [Request]
     func getSessionRequestRecord(id: RPCID) -> Request?
 }
diff --git a/Sources/WalletConnectSign/WalletConnectError.swift b/Sources/WalletConnectSign/WalletConnectError.swift
index a1be34777..9e516c6d4 100644
--- a/Sources/WalletConnectSign/WalletConnectError.swift
+++ b/Sources/WalletConnectSign/WalletConnectError.swift
@@ -63,7 +63,6 @@ extension WalletConnectError {
     }
 }
 
-
 extension WalletConnectError: LocalizedError {
     public var errorDescription: String? {
         return self.localizedDescription
diff --git a/Sources/WalletConnectSigner/Ethereum/ContractCall/RPCService.swift b/Sources/WalletConnectSigner/Ethereum/ContractCall/RPCService.swift
index eb6db47e7..da14a57c4 100644
--- a/Sources/WalletConnectSigner/Ethereum/ContractCall/RPCService.swift
+++ b/Sources/WalletConnectSigner/Ethereum/ContractCall/RPCService.swift
@@ -28,7 +28,7 @@ struct RPCService: HTTPService {
         ]
     }
 
-    var additionalHeaderFields: [String : String]? {
+    var additionalHeaderFields: [String: String]? {
         return nil
     }
 
diff --git a/Sources/WalletConnectUtils/Extensions/Date.swift b/Sources/WalletConnectUtils/Extensions/Date.swift
index 3536b02b9..8cbe1316d 100644
--- a/Sources/WalletConnectUtils/Extensions/Date.swift
+++ b/Sources/WalletConnectUtils/Extensions/Date.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 public extension Date {
diff --git a/Sources/WalletConnectUtils/Logger.swift b/Sources/WalletConnectUtils/Logger.swift
index ee6b0aad2..c60137ce8 100644
--- a/Sources/WalletConnectUtils/Logger.swift
+++ b/Sources/WalletConnectUtils/Logger.swift
@@ -71,8 +71,7 @@ public enum LoggingLevel: Comparable {
     case debug
 }
 
-
-fileprivate func logFormattedDate(_ date: Date) -> String {
+private func logFormattedDate(_ date: Date) -> String {
     let dateFormatter = DateFormatter()
     dateFormatter.locale = NSLocale.current
     dateFormatter.dateFormat = "HH:mm:ss.SSSS"
diff --git a/Sources/WalletConnectUtils/RPCHistory/RPCHistory.swift b/Sources/WalletConnectUtils/RPCHistory/RPCHistory.swift
index 4fc00aebe..ece958c87 100644
--- a/Sources/WalletConnectUtils/RPCHistory/RPCHistory.swift
+++ b/Sources/WalletConnectUtils/RPCHistory/RPCHistory.swift
@@ -57,7 +57,7 @@ public final class RPCHistory {
         return record
     }
 
-    public func deleteAll(forTopics topics: [String]){
+    public func deleteAll(forTopics topics: [String]) {
         storage.getAll().forEach { record in
             if topics.contains(record.topic) {
                 storage.delete(forKey: "\(record.id)")
@@ -67,7 +67,7 @@ public final class RPCHistory {
 
     public func getAll<Object: Codable>(of type: Object.Type, topic: String) -> [Object] {
         return storage.getAll()
-            .filter{$0.topic == topic}
+            .filter {$0.topic == topic}
             .compactMap { try? $0.request.params?.get(Object.self) }
     }
 
diff --git a/Sources/WalletConnectVerify/KeyAttestationService.swift b/Sources/WalletConnectVerify/KeyAttestationService.swift
index d57bfbc4f..af0109aa6 100644
--- a/Sources/WalletConnectVerify/KeyAttestationService.swift
+++ b/Sources/WalletConnectVerify/KeyAttestationService.swift
@@ -8,7 +8,7 @@ protocol KeyAttesting {
 class KeyAttestationService: KeyAttesting {
     // TODO - Add DCAppAttestService handling for iOS 14.0
     // private let service = DCAppAttestService.shared
-    
+
     //    If the method, which accesses a remote Apple server, returns the serverUnavailable error,
     // try attestation again later with the same key. For any other error,
     // discard the key identifier and create a new key when you want to try again.
diff --git a/Sources/WalletConnectVerify/OriginVerifier.swift b/Sources/WalletConnectVerify/OriginVerifier.swift
index 039cccecf..c710ae85d 100644
--- a/Sources/WalletConnectVerify/OriginVerifier.swift
+++ b/Sources/WalletConnectVerify/OriginVerifier.swift
@@ -4,13 +4,13 @@ public final class OriginVerifier {
     enum Errors: Error {
         case registrationFailed
     }
-    
+
     private let verifyHost: String
-    
+
     init(verifyHost: String) {
         self.verifyHost = verifyHost
     }
-    
+
     func verifyOrigin(assertionId: String) async throws -> String {
         let httpClient = HTTPNetworkClient(host: verifyHost)
         let response = try await httpClient.request(
@@ -23,4 +23,3 @@ public final class OriginVerifier {
         return origin
     }
 }
-
diff --git a/Sources/WalletConnectVerify/Register/VerifyService.swift b/Sources/WalletConnectVerify/Register/VerifyService.swift
index 5cf720118..69a8665c2 100644
--- a/Sources/WalletConnectVerify/Register/VerifyService.swift
+++ b/Sources/WalletConnectVerify/Register/VerifyService.swift
@@ -27,7 +27,7 @@ enum VerifyAPI: HTTPService {
         return "https"
     }
 
-    var additionalHeaderFields: [String : String]? {
+    var additionalHeaderFields: [String: String]? {
         nil
     }
 }
diff --git a/Sources/WalletConnectVerify/VerifyClient.swift b/Sources/WalletConnectVerify/VerifyClient.swift
index 9edbc6f3a..67ab1f71d 100644
--- a/Sources/WalletConnectVerify/VerifyClient.swift
+++ b/Sources/WalletConnectVerify/VerifyClient.swift
@@ -5,11 +5,11 @@ public actor VerifyClient {
     enum Errors: Error {
         case attestationNotSupported
     }
-    
+
     let originVerifier: OriginVerifier
     let assertionRegistrer: AssertionRegistrer
     let appAttestationRegistrer: AppAttestationRegistrer
-    
+
     private let verifyHost: String
 
     init(
@@ -31,7 +31,7 @@ public actor VerifyClient {
     public func verifyOrigin(assertionId: String) async throws -> String {
         return try await originVerifier.verifyOrigin(assertionId: assertionId)
     }
-    
+
     public func createVerifyContext(origin: String?, domain: String) -> VerifyContext {
         return VerifyContext(
             origin: origin,
diff --git a/Sources/WalletConnectVerify/VerifyContext.swift b/Sources/WalletConnectVerify/VerifyContext.swift
index 094ea95ab..06d0f78f3 100644
--- a/Sources/WalletConnectVerify/VerifyContext.swift
+++ b/Sources/WalletConnectVerify/VerifyContext.swift
@@ -4,11 +4,11 @@ public struct VerifyContext: Equatable, Hashable {
         case valid
         case invalid
     }
-    
+
     public let origin: String?
     public let validation: ValidationStatus
     public let verifyUrl: String
-    
+
     public init(origin: String?, validation: ValidationStatus, verifyUrl: String) {
         self.origin = origin
         self.validation = validation
diff --git a/Sources/Web3Inbox/ChatClient/ChatClientProxy.swift b/Sources/Web3Inbox/ChatClient/ChatClientProxy.swift
index ef51bd3b4..080e3b3c4 100644
--- a/Sources/Web3Inbox/ChatClient/ChatClientProxy.swift
+++ b/Sources/Web3Inbox/ChatClient/ChatClientProxy.swift
@@ -40,7 +40,7 @@ final class ChatClientProxy {
         case .resolve:
             let params = try parse(ResolveRequest.self, params: request.params)
             let inviteKey = try await client.resolve(account: params.account)
-            try await respond(with: inviteKey,request: request)
+            try await respond(with: inviteKey, request: request)
 
         case .getMessages:
             let params = try parse(GetMessagesRequest.self, params: request.params)
@@ -72,7 +72,7 @@ final class ChatClientProxy {
 
 private extension ChatClientProxy {
 
-    private typealias Blob = Dictionary<String, String>
+    private typealias Blob = [String: String]
 
     enum Errors: Error {
         case unregisteredMethod
diff --git a/Sources/Web3Inbox/ConfigParam.swift b/Sources/Web3Inbox/ConfigParam.swift
index 429be268d..4592e0488 100644
--- a/Sources/Web3Inbox/ConfigParam.swift
+++ b/Sources/Web3Inbox/ConfigParam.swift
@@ -1,4 +1,3 @@
-
 import Foundation
 
 public enum ConfigParam {
diff --git a/Sources/Web3Inbox/PushClientProxy/PushClientProxy.swift b/Sources/Web3Inbox/PushClientProxy/PushClientProxy.swift
index 2a84f4bd4..b41f99ad9 100644
--- a/Sources/Web3Inbox/PushClientProxy/PushClientProxy.swift
+++ b/Sources/Web3Inbox/PushClientProxy/PushClientProxy.swift
@@ -33,7 +33,7 @@ final class PushClientProxy {
             let params = try parse(SubscribeRequest.self, params: request.params)
             try await client.subscribe(metadata: params.metadata, account: params.account, onSign: onSign)
             try await respond(request: request)
-        case .getActiveSubscriptions: 
+        case .getActiveSubscriptions:
             let subscriptions = client.getActiveSubscriptions()
             try await respond(with: subscriptions, request: request)
         case .getMessageHistory:
@@ -54,7 +54,7 @@ final class PushClientProxy {
 
 private extension PushClientProxy {
 
-    private typealias Blob = Dictionary<String, String>
+    private typealias Blob = [String: String]
 
     enum Errors: Error {
         case unregisteredMethod
diff --git a/Sources/Web3Inbox/PushClientProxy/PushClientRequestSubscriber.swift b/Sources/Web3Inbox/PushClientProxy/PushClientRequestSubscriber.swift
index 156de1516..970afa8f2 100644
--- a/Sources/Web3Inbox/PushClientProxy/PushClientRequestSubscriber.swift
+++ b/Sources/Web3Inbox/PushClientProxy/PushClientRequestSubscriber.swift
@@ -32,7 +32,7 @@ final class PushClientRequestSubscriber {
             case .success(let subscription):
                 handle(event: .pushSubscription, params: subscription)
             case .failure:
-                //TODO - handle error
+                // TODO - handle error
                 break
 
             }
@@ -43,7 +43,7 @@ final class PushClientRequestSubscriber {
             case .success(let subscription):
                 handle(event: .pushUpdate, params: subscription)
             case .failure:
-                //TODO - handle error
+                // TODO - handle error
                 break
             }
         }.store(in: &publishers)
diff --git a/Sources/Web3Inbox/Web3InboxClient.swift b/Sources/Web3Inbox/Web3InboxClient.swift
index 730180633..05fda4858 100644
--- a/Sources/Web3Inbox/Web3InboxClient.swift
+++ b/Sources/Web3Inbox/Web3InboxClient.swift
@@ -67,7 +67,7 @@ private extension Web3InboxClient {
     func setupSubscriptions() {
 
         // Chat
-        
+
         chatClientProxy.onResponse = { [unowned self] response in
             try await self.chatWebviewProxy.respond(response)
         }
diff --git a/Sources/Web3Inbox/WebView/WebViewProxy.swift b/Sources/Web3Inbox/WebView/WebViewProxy.swift
index 5948b6660..6cd317c38 100644
--- a/Sources/Web3Inbox/WebView/WebViewProxy.swift
+++ b/Sources/Web3Inbox/WebView/WebViewProxy.swift
@@ -32,7 +32,6 @@ actor WebViewProxy {
     }
 }
 
-
 protocol WebViewScriptFormatter {
     func formatScript(body: String) -> String
 }
diff --git a/Sources/Web3Modal/Modal/ModalContainerView.swift b/Sources/Web3Modal/Modal/ModalContainerView.swift
index 312120dbf..0fc73be71 100644
--- a/Sources/Web3Modal/Modal/ModalContainerView.swift
+++ b/Sources/Web3Modal/Modal/ModalContainerView.swift
@@ -2,25 +2,25 @@ import SwiftUI
 import WalletConnectPairing
 
 public struct ModalContainerView: View {
-    
+
     @Environment(\.presentationMode) var presentationMode
-    
+
     @State var showModal: Bool = false
-    
+
     let projectId: String
     let metadata: AppMetadata
     let webSocketFactory: WebSocketFactory
-    
+
     public init(projectId: String, metadata: AppMetadata, webSocketFactory: WebSocketFactory) {
         self.projectId = projectId
         self.metadata = metadata
         self.webSocketFactory = webSocketFactory
     }
-    
+
     public var body: some View {
-        
+
         VStack(spacing: 0) {
-            
+
             Color.thickOverlay
                 .colorScheme(.light)
                 .onTapGesture {
@@ -28,7 +28,7 @@ public struct ModalContainerView: View {
                         showModal = false
                     }
                 }
-            
+
             if showModal {
                 ModalSheet(
                     viewModel: .init(
@@ -54,7 +54,7 @@ public struct ModalContainerView: View {
             }
         }
     }
-    
+
     private func dismiss() {
         // Small delay so the sliding transition can happen before cross disolve starts
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.2) {
diff --git a/Sources/Web3Modal/Modal/ModalInteractor.swift b/Sources/Web3Modal/Modal/ModalInteractor.swift
index a89a1b0db..07c8dd55d 100644
--- a/Sources/Web3Modal/Modal/ModalInteractor.swift
+++ b/Sources/Web3Modal/Modal/ModalInteractor.swift
@@ -8,27 +8,27 @@ extension ModalSheet {
         let projectId: String
         let metadata: AppMetadata
         let socketFactory: WebSocketFactory
-        
+
         lazy var sessionsPublisher: AnyPublisher<[Session], Never> = Sign.instance.sessionsPublisher
-        
+
         init(projectId: String, metadata: AppMetadata, webSocketFactory: WebSocketFactory) {
             self.projectId = projectId
             self.metadata = metadata
             self.socketFactory = webSocketFactory
-            
+
             Pair.configure(metadata: metadata)
             Networking.configure(projectId: projectId, socketFactory: socketFactory)
         }
-        
+
 //        func getListings() async throws -> [Listing] {
 //            let listingResponse = try await ExplorerApi.live().getMobileListings(projectId)
 //            return listingResponse.listings.values.compactMap { $0 }
 //        }
-        
+
         func connect() async throws -> WalletConnectURI {
-            
+
             let uri = try await Pair.instance.create()
-            
+
             let methods: Set<String> = ["eth_sendTransaction", "personal_sign", "eth_signTypedData"]
             let blockchains: Set<Blockchain> = [Blockchain("eip155:1")!, Blockchain("eip155:137")!]
             let namespaces: [String: ProposalNamespace] = [
@@ -38,9 +38,9 @@ extension ModalSheet {
                     events: []
                 )
             ]
-            
+
             try await Sign.instance.connect(requiredNamespaces: namespaces, topic: uri.topic)
-            
+
             return uri
         }
     }
diff --git a/Sources/Web3Modal/Modal/ModalSheet.swift b/Sources/Web3Modal/Modal/ModalSheet.swift
index 3df7d7cf3..4c4fff9b3 100644
--- a/Sources/Web3Modal/Modal/ModalSheet.swift
+++ b/Sources/Web3Modal/Modal/ModalSheet.swift
@@ -2,11 +2,11 @@ import SwiftUI
 
 public struct ModalSheet: View {
     @ObservedObject var viewModel: ModalViewModel
-    
+
     public var body: some View {
         VStack(spacing: 0) {
             modalHeader()
-            
+
             VStack(spacing: 0) {
                 contentHeader()
                 content()
@@ -31,7 +31,7 @@ public struct ModalSheet: View {
             }
         )
     }
-    
+
     private func modalHeader() -> some View {
         HStack(spacing: 0) {
             Image(.walletconnect_logo)
@@ -39,9 +39,9 @@ public struct ModalSheet: View {
                 .scaledToFit()
                 .frame(width: 180)
                 .padding(.leading, 10)
-            
+
             Spacer()
-            
+
             HStack(spacing: 16) {
                 helpButton()
                 closeButton()
@@ -51,15 +51,15 @@ public struct ModalSheet: View {
         .foregroundColor(Color.foreground1)
         .frame(height: 48)
     }
-    
+
     private func contentHeader() -> some View {
         HStack(spacing: 0) {
             if viewModel.destination != .wallets {
                 backButton()
             }
-            
+
             Spacer()
-            
+
             switch viewModel.destination {
             case .wallets:
                 qrButton()
@@ -79,14 +79,14 @@ public struct ModalSheet: View {
                 .padding(.horizontal, 50)
         )
     }
-    
+
     @ViewBuilder
     private func content() -> some View {
         switch viewModel.destination {
         case .wallets:
-            
+
             Text("TBD in subsequent PR")
-            
+
 //            ZStack {
 //                VStack {
 //                    HStack {
@@ -103,7 +103,7 @@ public struct ModalSheet: View {
 //
 //                Spacer().frame(height: 200)
 //            }
-            
+
         case .help:
             WhatIsWalletView()
         case .qr:
@@ -116,7 +116,7 @@ public struct ModalSheet: View {
             }
         }
     }
-    
+
 //    @ViewBuilder
 //    private func gridItem(for index: Int) -> some View {
 //        let wallet: Listing = viewModel.wallets.indices.contains(index) ? viewModel.wallets[index] : nil
@@ -152,7 +152,7 @@ public struct ModalSheet: View {
 //            .frame(maxWidth: 80, maxHeight: 96)
 //        }
 //    }
-    
+
     private func helpButton() -> some View {
         Button(action: {
             withAnimation {
@@ -164,7 +164,7 @@ public struct ModalSheet: View {
         })
         .buttonStyle(CircuralIconButtonStyle())
     }
-    
+
     private func closeButton() -> some View {
         Button {
             withAnimation {
@@ -176,7 +176,7 @@ public struct ModalSheet: View {
         }
         .buttonStyle(CircuralIconButtonStyle())
     }
-    
+
     private func backButton() -> some View {
         Button {
             withAnimation {
@@ -187,7 +187,7 @@ public struct ModalSheet: View {
                 .padding(20)
         }
     }
-    
+
     private func qrButton() -> some View {
         Button {
             withAnimation {
@@ -198,7 +198,7 @@ public struct ModalSheet: View {
                 .padding()
         }
     }
-    
+
     private func copyButton() -> some View {
         Button {
             viewModel.onCopyButton()
diff --git a/Sources/Web3Modal/Modal/ModalViewModel.swift b/Sources/Web3Modal/Modal/ModalViewModel.swift
index 05633ca9c..bd078337a 100644
--- a/Sources/Web3Modal/Modal/ModalViewModel.swift
+++ b/Sources/Web3Modal/Modal/ModalViewModel.swift
@@ -1,4 +1,3 @@
-
 import Combine
 import Foundation
 import SwiftUI
@@ -8,7 +7,7 @@ extension ModalSheet {
         case wallets
         case help
         case qr
-        
+
         var contentTitle: String {
             switch self {
             case .wallets:
@@ -20,24 +19,24 @@ extension ModalSheet {
             }
         }
     }
-    
+
     final class ModalViewModel: ObservableObject {
         private var disposeBag = Set<AnyCancellable>()
         private let interactor: Interactor
         private let projectId: String
-        
+
         @Published var isShown: Binding<Bool>
-        
+
         @Published var uri: String?
         @Published var destination: Destination = .wallets
         @Published var errorMessage: String?
 //        @Published var wallets: [Listing] = []
-        
+
         init(isShown: Binding<Bool>, projectId: String, interactor: Interactor) {
             self.isShown = isShown
             self.interactor = interactor
             self.projectId = projectId
-            
+
             interactor.sessionsPublisher
                 .receive(on: DispatchQueue.main)
                 .sink { sessions in
@@ -46,7 +45,7 @@ extension ModalSheet {
                 }
                 .store(in: &disposeBag)
         }
-        
+
 //        @MainActor
 //        func fetchWallets() async {
 //            do {
@@ -58,7 +57,7 @@ extension ModalSheet {
 //                errorMessage = error.localizedDescription
 //            }
 //        }
-        
+
         @MainActor
         func createURI() async {
             do {
@@ -68,19 +67,19 @@ extension ModalSheet {
                 errorMessage = error.localizedDescription
             }
         }
-        
+
         func navigateTo(_ destination: Destination) {
             self.destination = destination
         }
-        
+
         func onBackButton() {
             destination = .wallets
         }
-        
+
         func onCopyButton() {
             UIPasteboard.general.string = uri
         }
-        
+
 //        func imageUrl(for listing: Listing) -> URL? {
 //            let urlString = "https://explorer-api.walletconnect.com/v3/logo/md/\(listing.imageId)?projectId=\(projectId)"
 //            
diff --git a/Sources/Web3Modal/Modal/Screens/QRCodeView.swift b/Sources/Web3Modal/Modal/Screens/QRCodeView.swift
index 8ca2a6ca6..0d1939b8a 100644
--- a/Sources/Web3Modal/Modal/Screens/QRCodeView.swift
+++ b/Sources/Web3Modal/Modal/Screens/QRCodeView.swift
@@ -2,13 +2,13 @@ import SwiftUI
 import QRCode
 
 struct QRCodeView: View {
-    
+
     @State var doc: QRCode.Document!
-    
+
     @Environment(\.colorScheme) var colorScheme: ColorScheme
-    
+
     @State var uri: String
-    
+
     var body: some View {
         QRCodeViewUI(
             content: uri,
@@ -33,12 +33,12 @@ struct QRCodeView: View {
 }
 
 struct QRCodeView_Previews: PreviewProvider {
-    
+
     static let stubUri: String = Array(repeating: ["a", "b", "c", "1", "2", "3"], count: 50)
         .flatMap({ $0 })
         .shuffled()
         .joined()
-    
+
     static var previews: some View {
         QRCodeView(uri: stubUri)
             .previewLayout(.sizeThatFits)
diff --git a/Sources/Web3Modal/Modal/Screens/WhatIsWalletView.swift b/Sources/Web3Modal/Modal/Screens/WhatIsWalletView.swift
index 1119fc8eb..0fe9971b8 100644
--- a/Sources/Web3Modal/Modal/Screens/WhatIsWalletView.swift
+++ b/Sources/Web3Modal/Modal/Screens/WhatIsWalletView.swift
@@ -1,9 +1,9 @@
 import SwiftUI
 
 struct WhatIsWalletView: View {
-    
+
     var body: some View {
-        
+
         VStack(spacing: 10) {
             HelpSection(
                 title: "A home for your digital assets",
@@ -20,7 +20,7 @@ struct WhatIsWalletView: View {
                 description: "With your wallet, you can explore and interact with DeFi, NFTs, DAOs, and much more.",
                 assets: ["Browser", "Noun", "DAO"]
             )
-            
+
             HStack {
                 Button(action: {}) {
                     HStack {
@@ -42,11 +42,11 @@ struct WhatIsWalletView: View {
 }
 
 struct HelpSection: View {
-    
+
     let title: String
     let description: String
     let assets: [String]
-    
+
     var body: some View {
         VStack {
             HStack {
@@ -54,7 +54,7 @@ struct HelpSection: View {
                     Image(asset, bundle: .module)
                 }
             }
-            
+
             Text(title)
                 .font(.system(size: 16))
                 .foregroundColor(.foreground1)
@@ -72,9 +72,9 @@ struct HelpSection: View {
 }
 
 struct WhatIsWalletView_Previews: PreviewProvider {
-    
+
     static var previews: some View {
-        
+
         WhatIsWalletView()
     }
 }
diff --git a/Sources/Web3Modal/Resources/Asset.swift b/Sources/Web3Modal/Resources/Asset.swift
index c5d987646..3933c6090 100644
--- a/Sources/Web3Modal/Resources/Asset.swift
+++ b/Sources/Web3Modal/Resources/Asset.swift
@@ -1,23 +1,22 @@
-
 import SwiftUI
 import UIKit
 
 enum Asset: String {
-    
+
     // Icons
     case close
     case external_link
     case help
     case wallet
-    
+
     // large
     case copy_large
     case qr_large
-    
+
     // Images
     case walletconnect_logo
     case wc_logo
-    
+
     // Help
     case Browser
     case DAO
@@ -34,25 +33,25 @@ enum Asset: String {
 }
 
 extension Asset {
-    
+
     var image: Image {
         Image(self)
     }
-    
+
     var uiImage: UIImage {
         UIImage(self)
     }
 }
 
 extension Image {
-    
+
     init(_ asset: Asset) {
         self.init(asset.rawValue, bundle: .module)
     }
 }
 
 extension UIImage {
-    
+
     convenience init(_ asset: Asset) {
         self.init(named: asset.rawValue, in: .module, compatibleWith: .current)!
     }
diff --git a/Sources/Web3Modal/Resources/Color.swift b/Sources/Web3Modal/Resources/Color.swift
index 5664e6081..942c98e8d 100644
--- a/Sources/Web3Modal/Resources/Color.swift
+++ b/Sources/Web3Modal/Resources/Color.swift
@@ -15,11 +15,11 @@ enum AssetColor: String {
 }
 
 extension Color {
- 
+
     init(_ asset: AssetColor) {
         self.init(asset.rawValue, bundle: .module)
     }
-    
+
     static let foreground1 = Color(.foreground1)
     static let foreground2 = Color(.foreground2)
     static let foreground3 = Color(.foreground3)
@@ -34,18 +34,18 @@ extension Color {
 }
 
 extension UIColor {
- 
+
     convenience init(_ asset: AssetColor) {
         self.init(named: asset.rawValue, in: .module, compatibleWith: nil)!
     }
 }
 
 extension AssetColor {
-    
+
     var swituiColor: Color {
         Color(self)
     }
-    
+
     var uiColor: UIColor {
         UIColor(self)
     }
@@ -65,14 +65,14 @@ struct Color_Previews: PreviewProvider {
             .negative,
             .thickOverlay,
             .thinOverlay,
-            .accent,
+            .accent
         ]
     }
 
     static var previews: some View {
         VStack {
             let columns = [
-                GridItem(.adaptive(minimum: 150)),
+                GridItem(.adaptive(minimum: 150))
             ]
 
             LazyVGrid(columns: columns, alignment: .leading) {
diff --git a/Sources/Web3Modal/Styles/Button.swift b/Sources/Web3Modal/Styles/Button.swift
index d3784853b..fd3416dea 100644
--- a/Sources/Web3Modal/Styles/Button.swift
+++ b/Sources/Web3Modal/Styles/Button.swift
@@ -1,4 +1,3 @@
-
 import SwiftUI
 
 struct CircuralIconButtonStyle: ButtonStyle {
@@ -27,14 +26,14 @@ struct W3MButtonStyle: ButtonStyle {
 }
 
 struct ButtonStyle_Previews: PreviewProvider {
-    
+
     static var previews: some View {
-        
+
         VStack {
-            
+
             Button("Foo", action: {})
                 .buttonStyle(W3MButtonStyle())
-            
+
             Button("F", action: {})
                 .buttonStyle(CircuralIconButtonStyle())
         }
diff --git a/Sources/Web3Modal/UI/AsyncImage.swift b/Sources/Web3Modal/UI/AsyncImage.swift
index 4eca1aba1..b7e79aa13 100644
--- a/Sources/Web3Modal/UI/AsyncImage.swift
+++ b/Sources/Web3Modal/UI/AsyncImage.swift
@@ -3,7 +3,7 @@ import SwiftUI
 
 struct AsyncImage<Content>: View where Content: View {
     final class Loader: ObservableObject {
-        @Published var data: Data? = nil
+        @Published var data: Data?
 
         private var cancellables = Set<AnyCancellable>()
 
diff --git a/Sources/Web3Modal/UIKitSupport/Web3ModalSheetController.swift b/Sources/Web3Modal/UIKitSupport/Web3ModalSheetController.swift
index 9890a66d2..46df4c405 100644
--- a/Sources/Web3Modal/UIKitSupport/Web3ModalSheetController.swift
+++ b/Sources/Web3Modal/UIKitSupport/Web3ModalSheetController.swift
@@ -3,21 +3,21 @@ import WalletConnectNetworking
 import WalletConnectPairing
 
 public class Web3ModalSheetController: UIHostingController<AnyView> {
-    
+
     @MainActor dynamic required init?(coder aDecoder: NSCoder) {
         fatalError("init(coder:) has not been implemented")
     }
-    
+
     public init(projectId: String, metadata: AppMetadata, webSocketFactory: WebSocketFactory) {
         let view = AnyView(
             ModalContainerView(projectId: projectId, metadata: metadata, webSocketFactory: webSocketFactory)
         )
-        
+
         super.init(rootView: view)
         self.modalTransitionStyle = .crossDissolve
         self.modalPresentationStyle = .overFullScreen
     }
-    
+
     override public func viewDidLoad() {
         super.viewDidLoad()
         self.view.backgroundColor = .clear
diff --git a/Sources/Web3Wallet/Web3Wallet.swift b/Sources/Web3Wallet/Web3Wallet.swift
index 4745d2989..5a259efdc 100644
--- a/Sources/Web3Wallet/Web3Wallet.swift
+++ b/Sources/Web3Wallet/Web3Wallet.swift
@@ -30,7 +30,7 @@ public class Web3Wallet {
             echoClient: Echo.instance
         )
     }()
-    
+
     private static var config: Config?
 
     private init() { }
diff --git a/Sources/Web3Wallet/Web3WalletClient.swift b/Sources/Web3Wallet/Web3WalletClient.swift
index 0f117f0a8..f5c838758 100644
--- a/Sources/Web3Wallet/Web3WalletClient.swift
+++ b/Sources/Web3Wallet/Web3WalletClient.swift
@@ -8,7 +8,7 @@ import Combine
 /// Access via `Web3Wallet.instance`
 public class Web3WalletClient {
     // MARK: - Public Properties
-    
+
     /// Publisher that sends session proposal
     ///
     /// event is emited on responder client only
@@ -22,40 +22,40 @@ public class Web3WalletClient {
     public var sessionRequestPublisher: AnyPublisher<(request: Request, context: VerifyContext?), Never> {
         signClient.sessionRequestPublisher.eraseToAnyPublisher()
     }
-    
+
     /// Publisher that sends authentication requests
     ///
     /// Wallet should subscribe on events in order to receive auth requests.
     public var authRequestPublisher: AnyPublisher<(request: AuthRequest, context: VerifyContext?), Never> {
         authClient.authRequestPublisher.eraseToAnyPublisher()
     }
-    
+
     /// Publisher that sends sessions on every sessions update
     ///
     /// Event will be emited on controller and non-controller clients.
     public var sessionsPublisher: AnyPublisher<[Session], Never> {
         signClient.sessionsPublisher.eraseToAnyPublisher()
     }
-    
+
     /// Publisher that sends web socket connection status
     public var socketConnectionStatusPublisher: AnyPublisher<SocketConnectionStatus, Never> {
         signClient.socketConnectionStatusPublisher.eraseToAnyPublisher()
     }
-    
+
     /// Publisher that sends session when one is settled
     ///
     /// Event is emited on proposer and responder client when both communicating peers have successfully established a session.
     public var sessionSettlePublisher: AnyPublisher<Session, Never> {
         signClient.sessionSettlePublisher.eraseToAnyPublisher()
     }
-    
+
     /// Publisher that sends deleted session topic
     ///
     /// Event can be emited on any type of the client.
     public var sessionDeletePublisher: AnyPublisher<(String, Reason), Never> {
         signClient.sessionDeletePublisher.eraseToAnyPublisher()
     }
-    
+
     /// Publisher that sends response for session request
     ///
     /// In most cases that event will be emited on dApp client.
@@ -68,7 +68,7 @@ public class Web3WalletClient {
     private let signClient: SignClientProtocol
     private let pairingClient: PairingClientProtocol
     private let echoClient: EchoClientProtocol
-    
+
     private var account: Account?
 
     init(
@@ -82,7 +82,7 @@ public class Web3WalletClient {
         self.pairingClient = pairingClient
         self.echoClient = echoClient
     }
-    
+
     /// For a wallet to approve a session proposal.
     /// - Parameters:
     ///   - proposalId: Session Proposal id
@@ -98,7 +98,7 @@ public class Web3WalletClient {
     public func reject(proposalId: String, reason: RejectionReason) async throws {
         try await signClient.reject(proposalId: proposalId, reason: reason)
     }
-    
+
     /// For wallet to reject authentication request
     /// - Parameter requestId: authentication request id
     public func reject(requestId: RPCID) async throws {
@@ -119,7 +119,7 @@ public class Web3WalletClient {
     public func extend(topic: String) async throws {
         try await signClient.extend(topic: topic)
     }
-    
+
     /// For the wallet to respond on pending dApp's JSON-RPC request
     /// - Parameters:
     ///   - topic: Topic of the session for which the request was received.
@@ -128,7 +128,7 @@ public class Web3WalletClient {
     public func respond(topic: String, requestId: RPCID, response: RPCResult) async throws {
         try await signClient.respond(topic: topic, requestId: requestId, response: response)
     }
-    
+
     /// For the wallet to emit an event to a dApp
     ///
     /// When a client wants to emit an event to its peer client (eg. chain changed or tx replaced)
@@ -143,7 +143,7 @@ public class Web3WalletClient {
     public func emit(topic: String, event: Session.Event, chainId: Blockchain) async throws {
         try await signClient.emit(topic: topic, event: event, chainId: chainId)
     }
-    
+
     /// For wallet to receive a session proposal from a dApp
     /// Responder should call this function in order to accept peer's pairing and be able to subscribe for future session proposals.
     /// - Parameter uri: Pairing URI that is commonly presented as a QR code by a dapp.
@@ -158,7 +158,7 @@ public class Web3WalletClient {
     public func disconnectPairing(topic: String) async throws {
         try await pairingClient.disconnect(topic: topic)
     }
-    
+
     /// For a wallet and a dApp to terminate a session
     ///
     /// Should Error:
@@ -174,11 +174,11 @@ public class Web3WalletClient {
     public func getSessions() -> [Session] {
         signClient.getSessions()
     }
-    
+
     public func formatMessage(payload: AuthPayload, address: String) throws -> String {
         try authClient.formatMessage(payload: payload, address: address)
     }
-    
+
     /// For a wallet to respond on authentication request
     /// - Parameters:
     ///   - requestId: authentication request id
@@ -186,37 +186,37 @@ public class Web3WalletClient {
     public func respond(requestId: RPCID, signature: CacaoSignature, from account: Account) async throws {
         try await authClient.respond(requestId: requestId, signature: signature, from: account)
     }
-    
+
     /// Query pending requests
     /// - Returns: Pending requests received from peer with `wc_sessionRequest` protocol method
     /// - Parameter topic: topic representing session for which you want to get pending requests. If nil, you will receive pending requests for all active sessions.
     public func getPendingRequests(topic: String? = nil) -> [Request] {
         signClient.getPendingRequests(topic: topic)
     }
-    
+
     /// - Parameter id: id of a wc_sessionRequest jsonrpc request
     /// - Returns: json rpc record object for given id or nil if record for give id does not exits
     public func getSessionRequestRecord(id: RPCID) -> Request? {
         signClient.getSessionRequestRecord(id: id)
     }
-    
+
     /// Query pending authentication requests
     /// - Returns: Pending authentication requests
     public func getPendingRequests() throws -> [AuthRequest] {
         try authClient.getPendingRequests()
     }
-    
+
     public func registerEchoClient(deviceToken: Data) async throws {
         try await echoClient.register(deviceToken: deviceToken)
     }
-    
+
     /// Delete all stored data such as: pairings, sessions, keys
     ///
     /// - Note: Will unsubscribe from all topics
     public func cleanup() async throws {
         try await signClient.cleanup()
     }
-    
+
     public func getPairings() -> [Pairing] {
         return pairingClient.getPairings()
     }
diff --git a/Tests/AuthTests/SIWEMessageFormatterTests.swift b/Tests/AuthTests/SIWEMessageFormatterTests.swift
index 521c46c64..23e52e938 100644
--- a/Tests/AuthTests/SIWEMessageFormatterTests.swift
+++ b/Tests/AuthTests/SIWEMessageFormatterTests.swift
@@ -82,7 +82,7 @@ class SIWEMessageFormatterTests: XCTestCase {
             service.invalid wants you to sign in with your Ethereum account:
             0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2
 
-            
+
             URI: https://service.invalid/login
             Version: 1
             Chain ID: 1
diff --git a/Tests/RelayerTests/DispatcherTests.swift b/Tests/RelayerTests/DispatcherTests.swift
index 170bbcb37..9d2ab074b 100644
--- a/Tests/RelayerTests/DispatcherTests.swift
+++ b/Tests/RelayerTests/DispatcherTests.swift
@@ -6,8 +6,8 @@ import TestingUtils
 import Combine
 
 private class DispatcherKeychainStorageMock: KeychainStorageProtocol {
-    func add<T>(_ item: T, forKey key: String) throws where T : WalletConnectKMS.GenericPasswordConvertible {}
-    func read<T>(key: String) throws -> T where T : WalletConnectKMS.GenericPasswordConvertible {
+    func add<T>(_ item: T, forKey key: String) throws where T: WalletConnectKMS.GenericPasswordConvertible {}
+    func read<T>(key: String) throws -> T where T: WalletConnectKMS.GenericPasswordConvertible {
         return try T(rawRepresentation: Data())
     }
     func delete(key: String) throws {}
@@ -40,11 +40,11 @@ class WebSocketMock: WebSocketConnecting {
 
 class WebSocketFactoryMock: WebSocketFactory {
     private let webSocket: WebSocketMock
-    
+
     init(webSocket: WebSocketMock) {
         self.webSocket = webSocket
     }
-    
+
     func create(with url: URL) -> WebSocketConnecting {
         return webSocket
     }
@@ -55,7 +55,7 @@ final class DispatcherTests: XCTestCase {
     var sut: Dispatcher!
     var webSocket: WebSocketMock!
     var networkMonitor: NetworkMonitoringMock!
-    
+
     override func setUp() {
         webSocket = WebSocketMock()
         let webSocketFactory = WebSocketFactoryMock(webSocket: webSocket)
diff --git a/Tests/RelayerTests/RelayClientTests.swift b/Tests/RelayerTests/RelayClientTests.swift
index 7a6841a84..f95b08f3c 100644
--- a/Tests/RelayerTests/RelayClientTests.swift
+++ b/Tests/RelayerTests/RelayClientTests.swift
@@ -66,7 +66,7 @@ final class RelayClientTests: XCTestCase {
     func testSubscriptionRequestDeliveredOnce() {
         let expectation = expectation(description: "Duplicate Subscription requests must notify only the first time")
         let request = Subscription.init(id: "sub_id", topic: "topic", message: "message").asRPCRequest()
-        
+
         sut.messagePublisher.sink { (_, _, _) in
             expectation.fulfill()
         }.store(in: &publishers)
diff --git a/Tests/TestingUtils/NetworkingInteractorMock.swift b/Tests/TestingUtils/NetworkingInteractorMock.swift
index 14f7f9d24..a2ebf3451 100644
--- a/Tests/TestingUtils/NetworkingInteractorMock.swift
+++ b/Tests/TestingUtils/NetworkingInteractorMock.swift
@@ -73,7 +73,7 @@ public class NetworkingInteractorMock: NetworkInteracting {
     public func responseErrorSubscription<Request: Codable>(on request: ProtocolMethod) -> AnyPublisher<ResponseSubscriptionErrorPayload<Request>, Never> {
         return responsePublisher
             .filter { $0.request.method == request.method }
-            .compactMap { (topic, rpcRequest, rpcResponse, publishedAt, _) in
+            .compactMap { (topic, rpcRequest, rpcResponse, _, _) in
                 guard let id = rpcResponse.id, let request = try? rpcRequest.params?.get(Request.self), let error = rpcResponse.error else { return nil }
                 return ResponseSubscriptionErrorPayload(id: id, topic: topic, request: request, error: error)
             }
diff --git a/Tests/VerifyTests/AppAttestationRegistrerTests.swift b/Tests/VerifyTests/AppAttestationRegistrerTests.swift
index d50edd182..df18e5a3a 100644
--- a/Tests/VerifyTests/AppAttestationRegistrerTests.swift
+++ b/Tests/VerifyTests/AppAttestationRegistrerTests.swift
@@ -39,7 +39,6 @@ class AppAttestationRegistrerTests: XCTestCase {
         XCTAssertEqual("c52ef2f630a172c4a3ae7ef5750b7662a904273fc81d1e892c5dd0c508c09583", sha256)
     }
 
-    
     func testAttestation() async {
         try! await sut.registerAttestationIfNeeded()
         XCTAssertTrue(attestKeyGenerator.keysGenerated)
diff --git a/Tests/WalletConnectSignTests/ApproveEngineTests.swift b/Tests/WalletConnectSignTests/ApproveEngineTests.swift
index a41b1cd46..3284456f2 100644
--- a/Tests/WalletConnectSignTests/ApproveEngineTests.swift
+++ b/Tests/WalletConnectSignTests/ApproveEngineTests.swift
@@ -62,7 +62,7 @@ final class ApproveEngineTests: XCTestCase {
         let proposerPubKey = AgreementPrivateKey().publicKey.hexRepresentation
         let proposal = SessionProposal.stub(proposerPubKey: proposerPubKey)
         pairingRegisterer.subject.send(RequestSubscriptionPayload(id: RPCID("id"), topic: topicA, request: proposal, decryptedPayload: Data(), publishedAt: Date(), derivedTopic: nil))
-        
+
         try await engine.approveProposal(proposerPubKey: proposal.proposer.publicKey, validating: SessionNamespace.stubDictionary())
 
         let topicB = networkingInteractor.subscriptions.last!
diff --git a/Tests/WalletConnectSignTests/AutoNamespacesValidationTests.swift b/Tests/WalletConnectSignTests/AutoNamespacesValidationTests.swift
index af452092d..9e00cba1d 100644
--- a/Tests/WalletConnectSignTests/AutoNamespacesValidationTests.swift
+++ b/Tests/WalletConnectSignTests/AutoNamespacesValidationTests.swift
@@ -44,7 +44,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
         ]
         XCTAssertEqual(sessionNamespaces, expectedNamespaces)
     }
-    
+
     func testAutoNamespacesDifferentChainsRequiredAndOptional() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
@@ -91,7 +91,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
         ]
         XCTAssertEqual(sessionNamespaces, expectedNamespaces)
     }
-    
+
     func testAutoNamespacesInlineChainRequiredAndOptional() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
@@ -136,7 +136,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
         ]
         XCTAssertEqual(sessionNamespaces, expectedNamespaces)
     }
-    
+
     func testAutoNamespacesMultipleInlineChainRequiredAndOptional() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
@@ -186,7 +186,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
         ]
         XCTAssertEqual(sessionNamespaces, expectedNamespaces)
     }
-    
+
     func testAutoNamespacesMultipleInlineChains() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
@@ -241,7 +241,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
         ]
         XCTAssertEqual(sessionNamespaces, expectedNamespaces)
     }
-    
+
     func testAutoNamespacesUnsupportedOptionalChains() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
@@ -294,7 +294,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
         ]
         XCTAssertEqual(sessionNamespaces, expectedNamespaces)
     }
-    
+
     func testAutoNamespacesPartiallySupportedOptionalChains() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
@@ -348,7 +348,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
         ]
         XCTAssertEqual(sessionNamespaces, expectedNamespaces)
     }
-    
+
     func testAutoNamespacesPartiallySupportedOptionalMethods() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
@@ -397,7 +397,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
         ]
         XCTAssertEqual(sessionNamespaces, expectedNamespaces)
     }
-    
+
     func testAutoNamespacesPartiallySupportedOptionalEvents() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
@@ -446,7 +446,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
         ]
         XCTAssertEqual(sessionNamespaces, expectedNamespaces)
     }
-    
+
     func testAutoNamespacesExtraSupportedChains() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
@@ -491,7 +491,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
                 chains: [Blockchain("eip155:1")!, Blockchain("eip155:2")!],
                 accounts: [
                     Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
-                    Account(blockchain: Blockchain("eip155:2")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
+                    Account(blockchain: Blockchain("eip155:2")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!
                 ],
                 methods: ["personal_sign", "eth_sendTransaction", "eth_signTransaction"],
                 events: ["chainChanged", "accountsChanged"]
@@ -499,7 +499,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
         ]
         XCTAssertEqual(sessionNamespaces, expectedNamespaces)
     }
-    
+
     func testAutoNamespacesMultipleNamespacesRequired() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
@@ -562,7 +562,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
         ]
         XCTAssertEqual(sessionNamespaces, expectedNamespaces)
     }
-    
+
     func testAutoNamespacesNoSupportedRequiredChains() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:5")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!
@@ -604,7 +604,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
             )
         )
     }
-    
+
     func testAutoNamespacesPartiallySupportedRequiredChains() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!,
@@ -647,7 +647,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
             )
         )
     }
-    
+
     func testAutoNamespacesNoSupportedRequiredMethods() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!
@@ -684,7 +684,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
             )
         )
     }
-    
+
     func testAutoNamespacesNoSupportedRequiredEvents() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:1")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!
@@ -721,7 +721,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
             )
         )
     }
-    
+
     func testAutoNamespacesNoAccountsForRequiredChain() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:2")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!
@@ -758,7 +758,7 @@ final class AutoNamespacesValidationTests: XCTestCase {
             )
         )
     }
-    
+
     func testAutoNamespacesPartialAccountsForRequiredChain() async {
         let accounts = [
             Account(blockchain: Blockchain("eip155:2")!, address: "0x57f48fAFeC1d76B27e3f29b8d277b6218CDE6092")!
diff --git a/Tests/WalletConnectSignTests/NamespaceValidationTests.swift b/Tests/WalletConnectSignTests/NamespaceValidationTests.swift
index 04ecf9206..a3b9511a1 100644
--- a/Tests/WalletConnectSignTests/NamespaceValidationTests.swift
+++ b/Tests/WalletConnectSignTests/NamespaceValidationTests.swift
@@ -28,7 +28,7 @@ final class NamespaceValidationTests: XCTestCase {
         ]
         XCTAssertNoThrow(try Namespace.validate(namespace))
     }
-    
+
     func testValidProposalNamespaceNoChains() {
         let namespace = [
             "eip155:1": ProposalNamespace(
@@ -38,7 +38,7 @@ final class NamespaceValidationTests: XCTestCase {
         ]
         XCTAssertNoThrow(try Namespace.validate(namespace))
     }
-    
+
     func testValidProposalNamespaceMixed() {
         let namespace = [
             "eip155:1": ProposalNamespace(
diff --git a/Tests/WalletConnectSignTests/WCResponseTests.swift b/Tests/WalletConnectSignTests/WCResponseTests.swift
index fc3be3ae9..607ce08be 100644
--- a/Tests/WalletConnectSignTests/WCResponseTests.swift
+++ b/Tests/WalletConnectSignTests/WCResponseTests.swift
@@ -8,7 +8,7 @@ final class RPCIDTests: XCTestCase {
         let request = RPCRequest(method: "method")
         let response = RPCResponse(matchingRequest: request, error: JSONRPCError(code: 0, message: "message"))
         let timestamp = Date(timeIntervalSince1970: TimeInterval(request.id!.right! / 1000 / 1000))
-        
+
         XCTAssertEqual(response.id!.right!.description.count, 16)
         XCTAssertEqual(response.id!.timestamp, timestamp)
         XCTAssertTrue(Calendar.current.isDateInToday(response.id!.timestamp))
diff --git a/Tests/Web3WalletTests/Mocks/AuthClientMock.swift b/Tests/Web3WalletTests/Mocks/AuthClientMock.swift
index 535ace60a..15f5e4b16 100644
--- a/Tests/Web3WalletTests/Mocks/AuthClientMock.swift
+++ b/Tests/Web3WalletTests/Mocks/AuthClientMock.swift
@@ -6,7 +6,7 @@ import Combine
 final class AuthClientMock: AuthClientProtocol {
     var respondCalled = false
     var rejectCalled = false
-    
+
     private var authRequest: AuthRequest {
         let requestParams = RequestParams(
             domain: "",
@@ -19,29 +19,29 @@ final class AuthClientMock: AuthClientProtocol {
             requestId: "",
             resources: nil
         )
-        
+
         return AuthRequest(
             id: .left(""),
             payload: AuthPayload(requestParams: requestParams, iat: "")
         )
     }
-    
+
     var authRequestPublisher: AnyPublisher<(request: AuthRequest, context: VerifyContext?), Never> {
         return Result.Publisher((authRequest, nil)).eraseToAnyPublisher()
     }
-    
+
     func formatMessage(payload: AuthPayload, address: String) throws -> String {
         return "formatted_message"
     }
-    
+
     func respond(requestId: JSONRPC.RPCID, signature: CacaoSignature, from account: WalletConnectUtils.Account) async throws {
         respondCalled = true
     }
-    
+
     func reject(requestId: JSONRPC.RPCID) async throws {
         rejectCalled = true
     }
-    
+
     func getPendingRequests() throws -> [AuthRequest] {
         return [authRequest]
     }
diff --git a/Tests/Web3WalletTests/Mocks/EchoClientMock.swift b/Tests/Web3WalletTests/Mocks/EchoClientMock.swift
index 2a43ee0e6..1502d4de9 100644
--- a/Tests/Web3WalletTests/Mocks/EchoClientMock.swift
+++ b/Tests/Web3WalletTests/Mocks/EchoClientMock.swift
@@ -5,11 +5,11 @@ import Combine
 
 final class EchoClientMock: EchoClientProtocol {
     var registedCalled = false
-    
+
     func register(deviceToken: Data) async throws {
         registedCalled = true
     }
-    
+
     func register(deviceToken: String) async throws {
         registedCalled = true
     }
diff --git a/Tests/Web3WalletTests/Mocks/PairingClientMock.swift b/Tests/Web3WalletTests/Mocks/PairingClientMock.swift
index 562e01ef5..ec0461c44 100644
--- a/Tests/Web3WalletTests/Mocks/PairingClientMock.swift
+++ b/Tests/Web3WalletTests/Mocks/PairingClientMock.swift
@@ -6,15 +6,15 @@ import Combine
 final class PairingClientMock: PairingClientProtocol {
     var pairCalled = false
     var disconnectPairingCalled = false
-    
+
     func pair(uri: WalletConnectUtils.WalletConnectURI) async throws {
         pairCalled = true
     }
-    
+
     func disconnect(topic: String) async throws {
         disconnectPairingCalled = true
     }
-    
+
     func getPairings() -> [Pairing] {
         return [Pairing(topic: "", peer: nil, expiryDate: Date())]
     }
diff --git a/Tests/Web3WalletTests/Mocks/SignClientMock.swift b/Tests/Web3WalletTests/Mocks/SignClientMock.swift
index 3a9b6336d..0714f6ede 100644
--- a/Tests/Web3WalletTests/Mocks/SignClientMock.swift
+++ b/Tests/Web3WalletTests/Mocks/SignClientMock.swift
@@ -13,11 +13,11 @@ final class SignClientMock: SignClientProtocol {
     var pairCalled = false
     var disconnectCalled = false
     var cleanupCalled = false
-    
+
     private let metadata = AppMetadata(name: "", description: "", url: "", icons: [])
     private let request = WalletConnectSign.Request(id: .left(""), topic: "", method: "", params: "", chainId: Blockchain("eip155:1")!, expiry: nil)
     private let response = WalletConnectSign.Response(id: RPCID(1234567890123456789), topic: "", chainId: "", result: .response(AnyCodable(any: "")))
-    
+
     var sessionProposalPublisher: AnyPublisher<(proposal: WalletConnectSign.Session.Proposal, context: VerifyContext?), Never> {
         let proposer = Participant(publicKey: "", metadata: metadata)
         let sessionProposal = WalletConnectSign.SessionProposal(
@@ -31,81 +31,81 @@ final class SignClientMock: SignClientProtocol {
         return Result.Publisher((sessionProposal, nil))
             .eraseToAnyPublisher()
     }
-    
+
     var sessionRequestPublisher: AnyPublisher<(request: WalletConnectSign.Request, context: VerifyContext?), Never> {
         return Result.Publisher((request, nil))
             .eraseToAnyPublisher()
     }
-    
+
     var sessionsPublisher: AnyPublisher<[WalletConnectSign.Session], Never> {
         return Result.Publisher([WalletConnectSign.Session(topic: "", pairingTopic: "", peer: metadata, namespaces: [:], expiryDate: Date())])
             .eraseToAnyPublisher()
     }
-    
+
     var socketConnectionStatusPublisher: AnyPublisher<WalletConnectRelay.SocketConnectionStatus, Never> {
         return Result.Publisher(.connected)
             .eraseToAnyPublisher()
     }
-    
+
     var sessionSettlePublisher: AnyPublisher<WalletConnectSign.Session, Never> {
         return Result.Publisher(Session(topic: "", pairingTopic: "", peer: metadata, namespaces: [:], expiryDate: Date()))
             .eraseToAnyPublisher()
     }
-    
+
     var sessionDeletePublisher: AnyPublisher<(String, WalletConnectNetworking.Reason), Never> {
         return Result.Publisher(("topic", ReasonMock()))
             .eraseToAnyPublisher()
     }
-    
+
     var sessionResponsePublisher: AnyPublisher<WalletConnectSign.Response, Never> {
         return Result.Publisher(.success(response))
             .eraseToAnyPublisher()
     }
-    
-    func approve(proposalId: String, namespaces: [String : WalletConnectSign.SessionNamespace]) async throws {
+
+    func approve(proposalId: String, namespaces: [String: WalletConnectSign.SessionNamespace]) async throws {
         approveCalled = true
     }
-    
+
     func reject(proposalId: String, reason: WalletConnectSign.RejectionReason) async throws {
         rejectCalled = true
     }
-    
-    func update(topic: String, namespaces: [String : WalletConnectSign.SessionNamespace]) async throws {
+
+    func update(topic: String, namespaces: [String: WalletConnectSign.SessionNamespace]) async throws {
         updateCalled = true
     }
-    
+
     func extend(topic: String) async throws {
         extendCalled = true
     }
-    
+
     func respond(topic: String, requestId: JSONRPC.RPCID, response: JSONRPC.RPCResult) async throws {
         respondCalled = true
     }
-    
+
     func emit(topic: String, event: WalletConnectSign.Session.Event, chainId: WalletConnectUtils.Blockchain) async throws {
         emitCalled = true
     }
-    
+
     func pair(uri: WalletConnectUtils.WalletConnectURI) async throws {
         pairCalled = true
     }
-    
+
     func disconnect(topic: String) async throws {
         disconnectCalled = true
     }
-    
+
     func getSessions() -> [WalletConnectSign.Session] {
         return [WalletConnectSign.Session(topic: "", pairingTopic: "", peer: metadata, namespaces: [:], expiryDate: Date())]
     }
-    
+
     func getPendingRequests(topic: String?) -> [WalletConnectSign.Request] {
         return [request]
     }
-    
+
     func getSessionRequestRecord(id: JSONRPC.RPCID) -> WalletConnectSign.Request? {
         return request
     }
-    
+
     func cleanup() async throws {
         cleanupCalled = true
     }
diff --git a/Tests/Web3WalletTests/Web3WalletTests.swift b/Tests/Web3WalletTests/Web3WalletTests.swift
index dc8489d73..4d5dc520c 100644
--- a/Tests/Web3WalletTests/Web3WalletTests.swift
+++ b/Tests/Web3WalletTests/Web3WalletTests.swift
@@ -12,13 +12,13 @@ final class Web3WalletTests: XCTestCase {
     var echoClient: EchoClientMock!
 
     private var disposeBag = Set<AnyCancellable>()
-    
+
     override func setUp() {
         authClient = AuthClientMock()
         signClient = SignClientMock()
         pairingClient = PairingClientMock()
         echoClient = EchoClientMock()
-        
+
         web3WalletClient = Web3WalletClientFactory.create(
             authClient: authClient,
             signClient: signClient,
@@ -26,152 +26,152 @@ final class Web3WalletTests: XCTestCase {
             echoClient: echoClient
         )
     }
-    
+
     func testSessionRequestCalled() {
         var success = false
-        web3WalletClient.sessionRequestPublisher.sink { value in
+        web3WalletClient.sessionRequestPublisher.sink { _ in
             success = true
             XCTAssertTrue(true)
         }
         .store(in: &disposeBag)
-        
+
         let expectation = expectation(description: "Fail after 0.1s timeout")
         let result = XCTWaiter.wait(for: [expectation], timeout: 0.1)
         if result == XCTWaiter.Result.timedOut && success == false {
             XCTFail()
         }
     }
-    
+
     func testAuthRequestCalled() {
         var success = false
-        web3WalletClient.authRequestPublisher.sink { value in
+        web3WalletClient.authRequestPublisher.sink { _ in
             success = true
             XCTAssertTrue(true)
         }
         .store(in: &disposeBag)
-        
+
         let expectation = expectation(description: "Fail after 0.1s timeout")
         let result = XCTWaiter.wait(for: [expectation], timeout: 0.1)
         if result == XCTWaiter.Result.timedOut && success == false {
             XCTFail()
         }
     }
-    
+
     func testSessionProposalCalled() {
         var success = false
-        web3WalletClient.sessionProposalPublisher.sink { value in
+        web3WalletClient.sessionProposalPublisher.sink { _ in
             success = true
             XCTAssertTrue(true)
         }
         .store(in: &disposeBag)
-        
+
         let expectation = expectation(description: "Fail after 0.1s timeout")
         let result = XCTWaiter.wait(for: [expectation], timeout: 0.1)
         if result == XCTWaiter.Result.timedOut && success == false {
             XCTFail()
         }
     }
-    
+
     func testSessionsCalled() {
         var success = false
-        web3WalletClient.sessionsPublisher.sink { value in
+        web3WalletClient.sessionsPublisher.sink { _ in
             success = true
             XCTAssertTrue(true)
         }
         .store(in: &disposeBag)
-        
+
         let expectation = expectation(description: "Fail after 0.1s timeout")
         let result = XCTWaiter.wait(for: [expectation], timeout: 0.1)
         if result == XCTWaiter.Result.timedOut && success == false {
             XCTFail()
         }
     }
-    
+
     func testSocketConnectionStatusCalled() {
         var success = false
-        web3WalletClient.socketConnectionStatusPublisher.sink { value in
+        web3WalletClient.socketConnectionStatusPublisher.sink { _ in
             success = true
             XCTAssertTrue(true)
         }
         .store(in: &disposeBag)
-        
+
         let expectation = expectation(description: "Fail after 0.1s timeout")
         let result = XCTWaiter.wait(for: [expectation], timeout: 0.1)
         if result == XCTWaiter.Result.timedOut && success == false {
             XCTFail()
         }
     }
-    
+
     func testSessionSettleCalled() {
         var success = false
-        web3WalletClient.sessionSettlePublisher.sink { value in
+        web3WalletClient.sessionSettlePublisher.sink { _ in
             success = true
             XCTAssertTrue(true)
         }
         .store(in: &disposeBag)
-        
+
         let expectation = expectation(description: "Fail after 0.1s timeout")
         let result = XCTWaiter.wait(for: [expectation], timeout: 0.1)
         if result == XCTWaiter.Result.timedOut && success == false {
             XCTFail()
         }
     }
-    
+
     func testSessionDeleteCalled() {
         var success = false
-        web3WalletClient.sessionDeletePublisher.sink { value in
+        web3WalletClient.sessionDeletePublisher.sink { _ in
             success = true
             XCTAssertTrue(true)
         }
         .store(in: &disposeBag)
-        
+
         let expectation = expectation(description: "Fail after 0.1s timeout")
         let result = XCTWaiter.wait(for: [expectation], timeout: 0.1)
         if result == XCTWaiter.Result.timedOut && success == false {
             XCTFail()
         }
     }
-    
+
     func testSessionResponseCalled() {
         var success = false
-        web3WalletClient.sessionResponsePublisher.sink { value in
+        web3WalletClient.sessionResponsePublisher.sink { _ in
             success = true
             XCTAssertTrue(true)
         }
         .store(in: &disposeBag)
-        
+
         let expectation = expectation(description: "Fail after 0.1s timeout")
         let result = XCTWaiter.wait(for: [expectation], timeout: 0.1)
         if result == XCTWaiter.Result.timedOut && success == false {
             XCTFail()
         }
     }
-    
+
     func testApproveCalled() async {
         try! await web3WalletClient.approve(proposalId: "", namespaces: [:])
         XCTAssertTrue(signClient.approveCalled)
     }
-    
+
     func testRejectSessionCalled() async {
         try! await web3WalletClient.reject(proposalId: "", reason: .userRejected)
         XCTAssertTrue(signClient.rejectCalled)
     }
-    
+
     func testRejectAuthRequestCalled() async {
         try! await web3WalletClient.reject(requestId: .left(""))
         XCTAssertTrue(authClient.rejectCalled)
     }
-    
+
     func testUpdateCalled() async {
         try! await web3WalletClient.update(topic: "", namespaces: [:])
         XCTAssertTrue(signClient.updateCalled)
     }
-    
+
     func testExtendCalled() async {
         try! await web3WalletClient.extend(topic: "")
         XCTAssertTrue(signClient.extendCalled)
     }
-    
+
     func testSignRespondCalled() async {
         try! await web3WalletClient.respond(
             topic: "",
@@ -180,7 +180,7 @@ final class Web3WalletTests: XCTestCase {
         )
         XCTAssertTrue(signClient.respondCalled)
     }
-    
+
     func testPairCalled() async {
         try! await web3WalletClient.pair(uri: WalletConnectURI(
             topic: "topic",
@@ -189,22 +189,22 @@ final class Web3WalletTests: XCTestCase {
         ))
         XCTAssertTrue(pairingClient.pairCalled)
     }
-    
+
     func testDisconnectPairingCalled() async {
         try! await web3WalletClient.disconnectPairing(topic: "topic")
         XCTAssertTrue(pairingClient.disconnectPairingCalled)
     }
-    
+
     func testDisconnectCalled() async {
         try! await web3WalletClient.disconnect(topic: "")
         XCTAssertTrue(signClient.disconnectCalled)
     }
-    
+
     func testGetSessionsCalledAndNotEmpty() {
         let sessions = web3WalletClient.getSessions()
         XCTAssertEqual(1, sessions.count)
     }
-    
+
     func testFormatMessageCalled() {
         let authPayload = AuthPayload(
             requestParams: RequestParams(
@@ -223,18 +223,18 @@ final class Web3WalletTests: XCTestCase {
             ),
             iat: "2021-09-30T16:25:24Z"
         )
-        
+
         let formattedMessage = try! web3WalletClient.formatMessage(
             payload: authPayload,
             address: ""
         )
         XCTAssertEqual("formatted_message", formattedMessage)
     }
-    
+
     func testAuthRespondCalled() async {
         let signature = CacaoSignature(t: .eip191, s: "0x438effc459956b57fcd9f3dac6c675f9cee88abf21acab7305e8e32aa0303a883b06dcbd956279a7a2ca21ffa882ff55cc22e8ab8ec0f3fe90ab45f306938cfa1b")
         let account = Account("eip155:56:0xe5EeF1368781911d265fDB6946613dA61915a501")!
-        
+
         try! await web3WalletClient.respond(
             requestId: .left(""),
             signature: signature,
@@ -242,31 +242,31 @@ final class Web3WalletTests: XCTestCase {
         )
         XCTAssertTrue(authClient.respondCalled)
     }
-    
+
     func testSignPendingRequestsCalledAndNotEmpty() async {
         let pendingRequests = web3WalletClient.getPendingRequests(topic: "")
         XCTAssertEqual(1, pendingRequests.count)
     }
-    
+
     func testSessionRequestRecordCalledAndNotNil() async {
         let sessionRequestRecord = web3WalletClient.getSessionRequestRecord(id: .left(""))
         XCTAssertNotNil(sessionRequestRecord)
     }
-    
+
     func testAuthPendingRequestsCalledAndNotEmpty() async {
         let pendingRequests = try! web3WalletClient.getPendingRequests()
         XCTAssertEqual(1, pendingRequests.count)
     }
-    
+
     func testCleanupCalled() async {
         try! await web3WalletClient.cleanup()
         XCTAssertTrue(signClient.cleanupCalled)
     }
-    
+
     func testGetPairingsNotEmpty() async {
         XCTAssertEqual(1, web3WalletClient.getPairings().count)
     }
-    
+
     func testEchoClientRegisterCalled() async {
         try! await echoClient.register(deviceToken: Data())
         XCTAssertTrue(echoClient.registedCalled)