From e9943bc6748a0cd795f774156ec034b7135c9c9a Mon Sep 17 00:00:00 2001
From: Bartosz Rozwarski <bartus000@gmail.com>
Date: Fri, 19 Aug 2022 11:42:40 +0200
Subject: [PATCH 1/4] add Auth instance

---
 Sources/Auth/Auth.swift | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 Sources/Auth/Auth.swift

diff --git a/Sources/Auth/Auth.swift b/Sources/Auth/Auth.swift
new file mode 100644
index 000000000..32e40c96c
--- /dev/null
+++ b/Sources/Auth/Auth.swift
@@ -0,0 +1,27 @@
+import Foundation
+import WalletConnectUtils
+import WalletConnectRelay
+import Combine
+
+public class Auth {
+
+    public static var instance: AuthClient = {
+        guard let metadata = Auth.metadata else {
+            fatalError("Error - you must call Sign.configure(_:) before accessing the shared instance.")
+        }
+        return AuthClientFactory.create(
+            metadata: metadata,
+            account: account,
+            relayClient: Relay.instance)
+    }()
+
+    private static var metadata: AppMetadata?
+    private static var account: Account?
+
+    private init() { }
+
+    static public func configure(metadata: AppMetadata, account: Account?) {
+        Auth.metadata = metadata
+        Auth.account = account
+    }
+}

From cc840720331635163df4bc22ce07738b845df5ae Mon Sep 17 00:00:00 2001
From: Bartosz Rozwarski <bartus000@gmail.com>
Date: Fri, 19 Aug 2022 11:43:20 +0200
Subject: [PATCH 2/4] remove unnecessary import

---
 Sources/Auth/Auth.swift | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Sources/Auth/Auth.swift b/Sources/Auth/Auth.swift
index 32e40c96c..da4f026de 100644
--- a/Sources/Auth/Auth.swift
+++ b/Sources/Auth/Auth.swift
@@ -1,5 +1,4 @@
 import Foundation
-import WalletConnectUtils
 import WalletConnectRelay
 import Combine
 

From 10a87cb68b82020b86810ae24ad5e417280bc547 Mon Sep 17 00:00:00 2001
From: Bartosz Rozwarski <bartus000@gmail.com>
Date: Fri, 19 Aug 2022 12:41:59 +0200
Subject: [PATCH 3/4] pr review improvements

---
 Sources/Auth/Auth.swift                                    | 2 +-
 Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Sources/Auth/Auth.swift b/Sources/Auth/Auth.swift
index da4f026de..70262bcd1 100644
--- a/Sources/Auth/Auth.swift
+++ b/Sources/Auth/Auth.swift
@@ -6,7 +6,7 @@ public class Auth {
 
     public static var instance: AuthClient = {
         guard let metadata = Auth.metadata else {
-            fatalError("Error - you must call Sign.configure(_:) before accessing the shared instance.")
+            fatalError("Error - you must call Auth.configure(_:) before accessing the shared instance.")
         }
         return AuthClientFactory.create(
             metadata: metadata,
diff --git a/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift b/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift
index 633f2c76d..aa5cdde47 100644
--- a/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift
+++ b/Sources/Auth/Services/Wallet/WalletRequestSubscriber.swift
@@ -19,9 +19,7 @@ class WalletRequestSubscriber {
         self.logger = logger
         self.address = address
         self.messageFormatter = messageFormatter
-        if address != nil {
-            subscribeForRequest()
-        }
+        subscribeForRequest()
     }
 
     private func subscribeForRequest() {

From 213736c77514c56dbfb6a56928bf60003a01a0a8 Mon Sep 17 00:00:00 2001
From: Bartosz Rozwarski <bartus000@gmail.com>
Date: Fri, 19 Aug 2022 12:51:26 +0200
Subject: [PATCH 4/4] add auth config

---
 Sources/Auth/Auth.swift       | 16 ++++++++--------
 Sources/Auth/AuthConfig.swift |  8 ++++++++
 2 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 Sources/Auth/AuthConfig.swift

diff --git a/Sources/Auth/Auth.swift b/Sources/Auth/Auth.swift
index 70262bcd1..ab10c1f39 100644
--- a/Sources/Auth/Auth.swift
+++ b/Sources/Auth/Auth.swift
@@ -5,22 +5,22 @@ import Combine
 public class Auth {
 
     public static var instance: AuthClient = {
-        guard let metadata = Auth.metadata else {
+        guard let config = Auth.config else {
             fatalError("Error - you must call Auth.configure(_:) before accessing the shared instance.")
         }
         return AuthClientFactory.create(
-            metadata: metadata,
-            account: account,
+            metadata: config.metadata,
+            account: config.account,
             relayClient: Relay.instance)
     }()
-
-    private static var metadata: AppMetadata?
-    private static var account: Account?
+    
+    private static var config: Config?
 
     private init() { }
 
     static public func configure(metadata: AppMetadata, account: Account?) {
-        Auth.metadata = metadata
-        Auth.account = account
+        Auth.config = Auth.Config(
+            metadata: metadata,
+            account: account)
     }
 }
diff --git a/Sources/Auth/AuthConfig.swift b/Sources/Auth/AuthConfig.swift
new file mode 100644
index 000000000..b364ec507
--- /dev/null
+++ b/Sources/Auth/AuthConfig.swift
@@ -0,0 +1,8 @@
+import Foundation
+
+extension Auth {
+    struct Config {
+        let metadata: AppMetadata
+        let account: Account?
+    }
+}