Merge pull request #1110 from WalletConnect/switch-to-notify-prod-url

Switch to notify prod url
WalletConnect · Sep 18, 2023 · c6a7448 · c6a7448
2 parents 4931ecd + 25869f5
commit c6a7448
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/Example/IntegrationTests/Push/NotifyTests.swift b/Example/IntegrationTests/Push/NotifyTests.swift
@@ -16,7 +16,7 @@ final class NotifyTests: XCTestCase {
 
     var walletNotifyClientA: NotifyClient!
 
-    let gmDappDomain = "dev.gm.walletconnect.com"
+    let gmDappDomain = "gm.walletconnect.com"
 
     let pk = try! EthereumPrivateKey()
 

diff --git a/Example/WalletApp/PresentationLayer/Wallet/Notifications/Models/ListingViewModel.swift b/Example/WalletApp/PresentationLayer/Wallet/Notifications/Models/ListingViewModel.swift
@@ -21,8 +21,7 @@ struct ListingViewModel: Identifiable {
     }
 
     var appDomain: String? {
-        // TODO: Remove after gm release
-        let url = listing.homepage == "https://notify.gm.walletconnect.com" ? "https://dev.gm.walletconnect.com" : listing.homepage
+        let url = listing.homepage
         return URL(string: url)?.host
     }
 }
diff --git a/NotifyTests.xctestplan b/NotifyTests.xctestplan
@@ -41,6 +41,11 @@
   "testTargets" : [
     {
       "selectedTests" : [
+        "NotifyTests\/testNotifyServerSubscribeAndNotifies()",
+        "NotifyTests\/testNotifySubscriptionChanged()",
+        "NotifyTests\/testNotifyWatchSubscriptions()",
+        "NotifyTests\/testWalletCreatesAndUpdatesSubscription()",
+        "NotifyTests\/testWalletCreatesSubscription()",
         "PushTests\/testNotifyServerSubscribeAndNotifies()",
         "PushTests\/testWalletCreatesAndUpdatesSubscription()"
       ],

diff --git a/...Wallet/ProtocolEngine/wc_notifyWatchSubscriptions/NotifyWatchSubscriptionsRequester.swift b/...Wallet/ProtocolEngine/wc_notifyWatchSubscriptions/NotifyWatchSubscriptionsRequester.swift
@@ -9,7 +9,7 @@ class NotifyWatchSubscriptionsRequester {
     private let kms: KeyManagementService
     private let logger: ConsoleLogging
     private let webDidResolver: NotifyWebDidResolver
-    private let notifyServerUrl = "dev.notify.walletconnect.com"
+    private let notifyServerUrl = "notify.walletconnect.com"
     private var account: Account?
     private var publishers = Set<AnyCancellable>()
 

diff --git a/Sources/Web3Inbox/NotifyClientProxy/NotifyClientProxy.swift b/Sources/Web3Inbox/NotifyClientProxy/NotifyClientProxy.swift
@@ -25,8 +25,6 @@ final class NotifyClientProxy {
             try await respond(request: request)
         case .subscribe:
             let params = try parse(SubscribeRequest.self, params: request.params)
-            // TODO: Remove after
-            let appDomain = params.appDomain == "notify.gm.walletconnect.com" ? "dev.gm.walletconnect.com" : params.appDomain
             try await client.subscribe(appDomain: appDomain, account: params.account)
             try await respond(request: request)
         case .getActiveSubscriptions: 
@@ -46,8 +44,6 @@ final class NotifyClientProxy {
             try await respond(request: request)
         case .register:
             let params = try parse(RegisterRequest.self, params: request.params)
-            // TODO: Remove after
-            let appDomain = params.domain == "notify.gm.walletconnect.com" ? "dev.gm.walletconnect.com" : params.domain
             try await client.register(account: params.account, domain: params.domain, isLimited: params.isLimited, onSign: onSign)
             try await respond(request: request)
         }