Monorepo

.swiftpm/xcode/xcshareddata/xcschemes/RelayerTests.xcscheme

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "RelayerTests"
+               BuildableName = "RelayerTests"
+               BlueprintName = "RelayerTests"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

.swiftpm/xcode/xcshareddata/xcschemes/Web3Modal.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1540"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "Web3Modal"
+               BuildableName = "Web3Modal"
+               BlueprintName = "Web3Modal"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "Web3Modal"
+            BuildableName = "Web3Modal"
+            BlueprintName = "Web3Modal"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Example/DApp/Modules/Sign/SignPresenter.swift

@@ -1,8 +1,7 @@
 import UIKit
 import Combine
 
-import Web3Modal
-import WalletConnectModal
+import ReownAppKit
 import WalletConnectSign
 
 final class SignPresenter: ObservableObject {
@@ -45,22 +44,14 @@ final class SignPresenter: ObservableObject {
 
     func connectWalletWithW3M() {
         Task {
-            Web3Modal.set(sessionParams: .init(
+            AppKit.set(sessionParams: .init(
                 requiredNamespaces: Proposal.requiredNamespaces,
                 optionalNamespaces: Proposal.optionalNamespaces
             ))
         }
-        Web3Modal.present(from: nil)
+        AppKit.present(from: nil)
     }
 
-    func connectWalletWithWCM() {
-        WalletConnectModal.set(sessionParams: .init(
-            requiredNamespaces: Proposal.requiredNamespaces,
-            optionalNamespaces: Proposal.optionalNamespaces
-        ))
-        WalletConnectModal.present(from: nil)
-    }
-
     @MainActor
     func connectWalletWithSessionPropose() {
         Task {
@@ -203,7 +194,7 @@ extension SignPresenter {
             }
             .store(in: &subscriptions)
 
-        Web3Modal.instance.SIWEAuthenticationPublisher
+        AppKit.instance.SIWEAuthenticationPublisher
             .receive(on: DispatchQueue.main)
             .sink { [unowned self] result in
                 switch result {

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 Web3Modal
-import WalletConnectModal
+import ReownAppKit
 import WalletConnectRelay
 import WalletConnectNetworking
 import Combine
@@ -104,11 +103,12 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             redirect: try! AppMetadata.Redirect(native: "wcdapp://", universal: "https://lab.web3modal.com/dapp", linkMode: true)
         )
 
-        Web3Modal.configure(
+        AppKit.configure(
             projectId: InputConfig.projectId,
             metadata: metadata,
             crypto: DefaultCryptoProvider(),
-            authRequestParams: .stub(), customWallets: [
+            authRequestParams: .stub(), // set to nil for non SIWE
+            customWallets: [
                 .init(
                     id: "swift-sample",
                     name: "Swift Sample Wallet",
@@ -128,18 +128,18 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
                     linkMode: "https://lab.web3modal.com/rn_walletkit"
                 ),
                 .init(
-                    id: "flutter-sample",
-                    name: "Flutter Sample Wallet",
+                    id: "flutter-sample-internal",
+                    name: "FL Sample Wallet (internal)",
                     homepage: "https://walletconnect.com/",
                     imageUrl: "https://avatars.githubusercontent.com/u/37784886?s=200&v=4",
                     order: 1,
-                    mobileLink: "wcflutterwallet://",
-                    linkMode: "https://lab.web3modal.com/walletkit_flutter"
+                    mobileLink: "wcflutterwallet-internal://",
+                    linkMode: "https://dev.lab.web3modal.com/flutter_walletkit_internal"
                 ),
             ]
         )
 
-        Web3Modal.instance.authResponsePublisher.sink { (id, result) in
+        AppKit.instance.authResponsePublisher.sink { (id, result) in
             switch result {
             case .success((_, _)):
                 AlertPresenter.present(message: "User Authenticted with SIWE", type: .success)
@@ -148,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)
 
@@ -173,6 +168,6 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
             }
         }.store(in: &publishers)
 
-        Web3Modal.instance.disableAnalytics()
+        AppKit.instance.disableAnalytics()
     }
 }