[W3M] UI + Sign integration

Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportPresenter.swift

@@ -15,6 +15,11 @@ final class ImportPresenter: ObservableObject {
         self.router = router
     }
 
+    @MainActor
+    func didPressWeb3Modal() async throws {
+        router.presentWeb3Modal()
+    }
+
     @MainActor
     func didPressImport() async throws {
         guard let importAccount = ImportAccount(input: input)

Example/Showcase/Classes/PresentationLayer/Chat/Import/ImportRouter.swift

@@ -1,4 +1,6 @@
 import UIKit
+import Web3Modal
+import WalletConnectPairing
 
 final class ImportRouter {
 
@@ -9,6 +11,19 @@ final class ImportRouter {
     init(app: Application) {
         self.app = app
     }
+
+    func presentWeb3Modal() {
+        Web3ModalSheetController(
+            projectId: InputConfig.projectId,
+            metadata: AppMetadata(
+                name: "Showcase App",
+                description: "Showcase description",
+                url: "example.wallet",
+                icons: ["https://avatars.githubusercontent.com/u/37784886"]
+            ),
+            webSocketFactory: DefaultSocketFactory()
+        ).present(from: viewController)
+    }
 
     func presentChat(importAccount: ImportAccount) {
         MainModule.create(app: app, importAccount: importAccount).present()

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

@@ -15,8 +15,15 @@ struct ImportView: View {
 
             Spacer()
 
-            BrandButton(title: "Ok, done" ) {
-                try await presenter.didPressImport()
+            VStack {
+
+//                BrandButton(title: "Web3Modal") {
+//                    try await presenter.didPressWeb3Modal()
+//                }
+
+                BrandButton(title: "Ok, done" ) {
+                    try await presenter.didPressImport()
+                }
             }
             .padding(16.0)
         }

Package.swift

@@ -120,7 +120,7 @@ let package = Package(
             dependencies: ["WalletConnectUtils", "WalletConnectNetworking"]),
         .target(
             name: "Web3Modal",
-            dependencies: ["QRCode"]),
+            dependencies: ["QRCode", "WalletConnectSign"]),
         .testTarget(
             name: "WalletConnectSignTests",
             dependencies: ["WalletConnectSign", "WalletConnectUtils", "TestingUtils", "WalletConnectVerify"]),

Sources/WalletConnectRelay/BundleFinder.swift

@@ -15,7 +15,16 @@ extension Foundation.Bundle {
             Bundle(for: BundleFinder.self).resourceURL,
 
             // For command-line tools.
-            Bundle.main.bundleURL
+            Bundle.main.bundleURL,
+
+            // One of these should be used when building SwiftUI Previews
+            Bundle(for: BundleFinder.self).resourceURL?
+                .deletingLastPathComponent()
+                .deletingLastPathComponent()
+                .deletingLastPathComponent(),
+            Bundle(for: BundleFinder.self).resourceURL?
+                .deletingLastPathComponent()
+                .deletingLastPathComponent()
         ]
 
         for candidate in candidates {

Sources/Web3Modal/Extensions/View+RoundedCorners.swift

@@ -0,0 +1,18 @@
+import SwiftUI
+
+extension View {
+    func cornerRadius(_ radius: CGFloat, corners: UIRectCorner) -> some View {
+        clipShape( RoundedCorner(radius: radius, corners: corners) )
+    }
+}
+
+struct RoundedCorner: Shape {
+
+    var radius: CGFloat = .infinity
+    var corners: UIRectCorner = .allCorners
+
+    func path(in rect: CGRect) -> Path {
+        let path = UIBezierPath(roundedRect: rect, byRoundingCorners: corners, cornerRadii: CGSize(width: radius, height: radius))
+        return Path(path.cgPath)
+    }
+}

Sources/Web3Modal/Web3ModalContainerView.swift → Sources/Web3Modal/Modal/ModalContainerView.swift

@@ -1,36 +1,51 @@
 import SwiftUI
+import WalletConnectPairing
 
-public struct Web3ModalContainerView: View {
-        
+public struct ModalContainerView: View {
+
     @Environment(\.presentationMode) var presentationMode
 
     @State var showModal: Bool = false
 
-    public init() {
-
+    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.black.opacity(0.3)
+            Color.thickOverlay
+                .colorScheme(.light)
                 .onTapGesture {
                     withAnimation {
                         showModal = false
                     }
                 }
 
             if showModal {
-                Web3ModalSheet(destination: .welcome, isShown: $showModal)
+                ModalSheet(
+                    viewModel: .init(
+                        isShown: $showModal,
+                        projectId: projectId,
+                        interactor: .init(projectId: projectId, metadata: metadata, webSocketFactory: webSocketFactory)
+                    ))
                     .transition(.move(edge: .bottom))
                     .animation(.spring(), value: showModal)
             }
         }
         .edgesIgnoringSafeArea(.all)
         .onChangeBackported(of: showModal, perform: { newValue in
             if newValue == false {
-                dismiss()
+                withAnimation {
+                    dismiss()
+                }
             }
         })
         .onAppear {
@@ -47,5 +62,3 @@ public struct Web3ModalContainerView: View {
         }
     }
 }
-
-

Sources/Web3Modal/Modal/ModalInteractor.swift

@@ -0,0 +1,47 @@
+import WalletConnectPairing
+import WalletConnectSign
+import Combine
+import WalletConnectNetworking
+
+extension ModalSheet {
+    final class Interactor {
+        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] = [
+                "eip155": ProposalNamespace(
+                    chains: blockchains,
+                    methods: methods,
+                    events: []
+                )
+            ]
+
+            try await Sign.instance.connect(requiredNamespaces: namespaces, topic: uri.topic)
+
+            return uri
+        }
+    }
+}

Sources/Web3Modal/Modal/ModalSheet+Previews.swift

@@ -0,0 +1,51 @@
+#if DEBUG
+
+import SwiftUI
+import WalletConnectPairing
+
+class WebSocketMock: WebSocketConnecting {
+    var request: URLRequest = .init(url: URL(string: "wss://relay.walletconnect.com")!)
+
+    var onText: ((String) -> Void)?
+    var onConnect: (() -> Void)?
+    var onDisconnect: ((Error?) -> Void)?
+    var sendCallCount: Int = 0
+    var isConnected: Bool = false
+
+    func connect() {}
+    func disconnect() {}
+    func write(string: String, completion: (() -> Void)?) {}
+}
+
+class WebSocketFactoryMock: WebSocketFactory {
+    func create(with url: URL) -> WebSocketConnecting {
+        WebSocketMock()
+    }
+}
+
+struct ModalSheet_Previews: PreviewProvider {
+    static let projectId = "9bfe94c9cbf74aaa0597094ef561f703"
+    static let metadata = AppMetadata(
+        name: "Showcase App",
+        description: "Showcase description",
+        url: "example.wallet",
+        icons: ["https://avatars.githubusercontent.com/u/37784886"]
+    )
+
+    static var previews: some View {
+        ModalSheet(
+            viewModel: .init(
+                isShown: .constant(true),
+                projectId: projectId,
+                interactor: .init(
+                    projectId: projectId,
+                    metadata: metadata,
+                    webSocketFactory: WebSocketFactoryMock()
+                )
+            )
+        )
+        .previewLayout(.sizeThatFits)
+    }
+}
+
+#endif