remove wcm

Example/DApp/Modules/Sign/SignPresenter.swift

@@ -2,7 +2,6 @@ import UIKit
 import Combine
 
 import ReownAppKit
-import WalletConnectModal
 import WalletConnectSign
 
 final class SignPresenter: ObservableObject {
@@ -53,14 +52,6 @@ final class SignPresenter: ObservableObject {
         AppKit.present(from: nil)
     }
 
-    func connectWalletWithWCM() {
-        WalletConnectModal.set(sessionParams: .init(
-            requiredNamespaces: Proposal.requiredNamespaces,
-            optionalNamespaces: Proposal.optionalNamespaces
-        ))
-        WalletConnectModal.present(from: nil)
-    }
-
     @MainActor
     func connectWalletWithSessionPropose() {
         Task {

Example/DApp/Modules/Sign/SignView.swift

@@ -78,18 +78,6 @@ struct SignView: View {
                                         .background(Color(red: 95/255, green: 159/255, blue: 248/255))
                                         .cornerRadius(16)
                                 }
-
-                                Button {
-                                    presenter.connectWalletWithWCM()
-                                } label: {
-                                    Text("Connect with WalletConnectModal")
-                                        .font(.system(size: 16, weight: .semibold))
-                                        .foregroundColor(.white)
-                                        .padding(.horizontal, 16)
-                                        .padding(.vertical, 10)
-                                        .background(Color(red: 95/255, green: 159/255, blue: 248/255))
-                                        .cornerRadius(16)
-                                }
                             }
                             .padding(.top, 10)
                         }

Example/DApp/SceneDelegate.swift

@@ -1,7 +1,6 @@
 import UIKit
 
 import ReownAppKit
-import WalletConnectModal
 import WalletConnectRelay
 import WalletConnectNetworking
 import Combine
@@ -149,11 +148,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             }
         }.store(in: &publishers)
 
-        WalletConnectModal.configure(
-            projectId: InputConfig.projectId,
-            metadata: metadata
-        )
-
         Sign.instance.logger.setLogging(level: .debug)
         Networking.instance.setLogging(level: .debug)
 

Example/WalletApp/PresentationLayer/Wallet/AuthRequest/AuthRequestPresenter.swift

@@ -2,7 +2,7 @@ import UIKit
 import Combine
 
 import ReownWalletKit
-import WalletConnectRouter
+import ReownRouter
 
 final class AuthRequestPresenter: ObservableObject {
     enum Errors: Error {
@@ -63,7 +63,7 @@ final class AuthRequestPresenter: ObservableObject {
             ActivityIndicatorManager.shared.stop()
             /* Redirect */
             if let uri = request.requester.redirect?.native {
-                WalletConnectRouter.goBack(uri: uri)
+                ReownRouter.goBack(uri: uri)
                 router.dismiss()
             } else {
                 showSignedSheet.toggle()
@@ -87,7 +87,7 @@ final class AuthRequestPresenter: ObservableObject {
 
             /* Redirect */
             if let uri = request.requester.redirect?.native {
-                WalletConnectRouter.goBack(uri: uri)
+                ReownRouter.goBack(uri: uri)
                 router.dismiss()
             } else {
                 showSignedSheet.toggle()
@@ -108,7 +108,7 @@ final class AuthRequestPresenter: ObservableObject {
 
             /* Redirect */
             if let uri = request.requester.redirect?.native {
-                WalletConnectRouter.goBack(uri: uri)
+                ReownRouter.goBack(uri: uri)
             }
             ActivityIndicatorManager.shared.stop()
 

Example/WalletApp/PresentationLayer/Wallet/SessionProposal/SessionProposalInteractor.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 import ReownWalletKit
-import WalletConnectRouter
+import ReownRouter
 
 final class SessionProposalInteractor {
     func approve(proposal: Session.Proposal, account: Account) async throws -> Bool {
@@ -42,7 +42,7 @@ final class SessionProposalInteractor {
         }
         _ = try await WalletKit.instance.approve(proposalId: proposal.id, namespaces: sessionNamespaces, sessionProperties: proposal.sessionProperties)
         if let uri = proposal.proposer.redirect?.native {
-            WalletConnectRouter.goBack(uri: uri)
+            ReownRouter.goBack(uri: uri)
             return false
         } else {
             return true
@@ -53,7 +53,7 @@ final class SessionProposalInteractor {
         try await WalletKit.instance.rejectSession(proposalId: proposal.id, reason: .userRejected)
         /* Redirect */
         if let uri = proposal.proposer.redirect?.native {
-            WalletConnectRouter.goBack(uri: uri)
+            ReownRouter.goBack(uri: uri)
         }
     }
 }

Example/WalletApp/PresentationLayer/Wallet/SessionRequest/SessionRequestInteractor.swift

@@ -1,7 +1,7 @@
 import Foundation
 
 import ReownWalletKit
-import WalletConnectRouter
+import ReownRouter
 
 final class SessionRequestInteractor {
     func respondSessionRequest(sessionRequest: Request, importAccount: ImportAccount) async throws -> Bool {
@@ -15,7 +15,7 @@ final class SessionRequestInteractor {
             /* Redirect */
             let session = getSession(topic: sessionRequest.topic)
             if let uri = session?.peer.redirect?.native {
-                WalletConnectRouter.goBack(uri: uri)
+                ReownRouter.goBack(uri: uri)
                 return false
             } else {
                 return true
@@ -35,7 +35,7 @@ final class SessionRequestInteractor {
         /* Redirect */
         let session = getSession(topic: sessionRequest.topic)
         if let uri = session?.peer.redirect?.native {
-            WalletConnectRouter.goBack(uri: uri)
+            ReownRouter.goBack(uri: uri)
         }
     }
 

Example/WalletConnect-Package.xctestplan

@@ -68,13 +68,6 @@
         "name" : "WalletConnectUtilsTests"
       }
     },
-    {
-      "target" : {
-        "containerPath" : "container:",
-        "identifier" : "WalletConnectModalTests",
-        "name" : "WalletConnectModalTests"
-      }
-    },
     {
       "target" : {
         "containerPath" : "container:",

Package.swift

@@ -26,17 +26,14 @@ let package = Package(
             name: "WalletConnectPush",
             targets: ["WalletConnectPush"]),
         .library(
-            name: "WalletConnectRouter",
-            targets: ["WalletConnectRouter", "WalletConnectRouterLegacy"]),
+            name: "ReownRouter",
+            targets: ["ReownRouter", "WalletConnectRouterLegacy"]),
         .library(
             name: "WalletConnectNetworking",
             targets: ["WalletConnectNetworking"]),
         .library(
             name: "WalletConnectVerify",
             targets: ["WalletConnectVerify"]),
-        .library(
-            name: "WalletConnectModal",
-            targets: ["WalletConnectModal"]),
         .library(
             name: "WalletConnectIdentity",
             targets: ["WalletConnectIdentity"]),
@@ -116,11 +113,11 @@ let package = Package(
         .target(
             name: "WalletConnectRouterLegacy",
             dependencies: [],
-            path: "Sources/WalletConnectRouter/RouterLegacy"),
+            path: "Sources/ReownRouter/RouterLegacy"),
         .target(
-            name: "WalletConnectRouter",
+            name: "ReownRouter",
             dependencies: ["WalletConnectRouterLegacy"],
-            path: "Sources/WalletConnectRouter/Router"),
+            path: "Sources/ReownRouter/Router"),
         .target(
             name: "WalletConnectVerify",
             dependencies: ["WalletConnectUtils", "WalletConnectNetworking", "WalletConnectJWT"],
@@ -131,16 +128,6 @@ let package = Package(
         .target(
             name: "Events",
             dependencies: ["WalletConnectUtils", "WalletConnectNetworking"]),
-        .target(
-            name: "WalletConnectModal",
-            dependencies: ["QRCode", "WalletConnectSign"],
-            exclude: ["Secrets/secrets.json.sample"],
-            resources: [
-                .copy("Secrets/secrets.json"),
-                .copy("Resources/Assets.xcassets"),
-                .process("Resources/PrivacyInfo.xcprivacy"),
-            ]
-        ),
         .target(
             name: "ReownAppKit",
             dependencies: [
@@ -201,9 +188,6 @@ let package = Package(
         .testTarget(
             name: "CommonsTests",
             dependencies: ["Commons", "TestingUtils"]),
-        .testTarget(
-            name: "WalletConnectModalTests",
-            dependencies: ["WalletConnectModal", "TestingUtils"]),
         .testTarget(
             name: "EventsTests",
             dependencies: ["Events"]),

README.md

@@ -15,7 +15,7 @@ Swift implementation of WalletKit and AppKit for native iOS applications.
 - [Beginner guide to WalletConnect v2.0 for iOS Developers](https://medium.com/walletconnect/beginner-guide-to-walletconnect-v2-0-for-swift-developers-4534b0975218)
 - [Protocol Documentation](https://github.com/WalletConnect/walletconnect-specs)
 - [Glossary](https://docs.walletconnect.com/2.0/introduction/glossary)
-- [Migration guide to AppKit](https://github.com/WalletConnect/walletconnect-docs/blob/main/docs/swift/guides/web3wallet-migration.md)
+- [Migration guide to AppKit](https://gist.github.com/llbartekll/a6fb18b48af837bcc46bb75b3eeaa781)
 - [Migration guide to WalletKit](https://github.com/WalletConnect/walletconnect-docs/blob/main/docs/swift/guides/web3wallet-migration.md)
 
 

Sources/WalletConnectRouter/Router/Router.swift → Sources/ReownRouter/Router/Router.swift

@@ -1,6 +1,6 @@
 #if os(iOS)
 import UIKit
-public struct WalletConnectRouter {
+public struct ReownRouter {
     public static func goBack(uri: String) {
         if #available(iOS 17, *) {
             DispatchQueue.main.async {

Sources/ReownRouter/Router/RouterImports.swift

@@ -0,0 +1,3 @@
+#if !CocoaPods
+@_exported import ReownRouter
+#endif

Sources/ReownRouter/RouterLegacy/include/module.modulemap

@@ -0,0 +1,3 @@
+module ReownRouter {
+    header "Router.h"
+}