Merge pull request #1228 from WalletConnect/feature/notification-tap

[Sample] Notify notification tap
WalletConnect · Nov 14, 2023 · 175b995 · 175b995
2 parents d2180ed + b1437e2
commit 175b995
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 20 deletions.
diff --git a/Example/IntegrationTests/Push/NotifyTests.swift b/Example/IntegrationTests/Push/NotifyTests.swift
@@ -95,6 +95,7 @@ final class NotifyTests: XCTestCase {
     override func setUp() {
         pk = try! EthereumPrivateKey()
         walletNotifyClientA = makeWalletClient()
+        publishers.removeAll()
     }
 
     func testWalletCreatesSubscription() async throws {

diff --git a/Example/PNDecryptionService/NotificationService.swift b/Example/PNDecryptionService/NotificationService.swift
@@ -22,6 +22,7 @@ class NotificationService: UNNotificationServiceExtension {
 
                 let mutableContent = updatedContent.mutableCopy() as! UNMutableNotificationContent
                 mutableContent.title = pushMessage.title
+                mutableContent.subtitle = pushMessage.url
                 mutableContent.body = pushMessage.body
 
                 contentHandler(mutableContent)

diff --git a/Example/WalletApp/ApplicationLayer/SceneDelegate.swift b/Example/WalletApp/ApplicationLayer/SceneDelegate.swift
@@ -1,8 +1,9 @@
 import Auth
+import SafariServices
 import UIKit
 import WalletConnectPairing
 
-final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
+final class SceneDelegate: UIResponder, UIWindowSceneDelegate, UNUserNotificationCenterDelegate {
     var window: UIWindow?
 
     private let app = Application()
@@ -32,17 +33,43 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate {
         app.requestSent = (connectionOptions.urlContexts.first?.url.absoluteString.replacingOccurrences(of: "walletapp://wc?", with: "") == "requestSent")
 
         configurators.configure()
+
+        UNUserNotificationCenter.current().delegate = self
     }
 
     func scene(_ scene: UIScene, openURLContexts URLContexts: Set<UIOpenURLContext>) {
         guard let context = URLContexts.first else { return }
 
-		let uri = WalletConnectURI(urlContext: context)
-
-		if let uri {
-			Task {
-				try await Pair.instance.pair(uri: uri)
-			}
-		}
+        let uri = WalletConnectURI(urlContext: context)
+
+        if let uri {
+            Task {
+                try await Pair.instance.pair(uri: uri)
+            }
+        }
+    }
+
+    func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification) async -> UNNotificationPresentationOptions {
+        open(notification: notification)
+        return [.sound, .banner, .badge]
+    }
+
+    func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse) async {
+        open(notification: response.notification)
+    }
+}
+
+private extension SceneDelegate {
+
+    func open(notification: UNNotification) {
+        let popupTag: Int = 1020
+        if let url = URL(string: notification.request.content.subtitle),
+           let topController = window?.rootViewController?.topController, topController.view.tag != popupTag
+        {
+            let safari = SFSafariViewController(url: url)
+            safari.modalPresentationStyle = .formSheet
+            safari.view.tag = popupTag
+            window?.rootViewController?.topController.present(safari, animated: true)
+        }
     }
 }
diff --git a/Example/WalletApp/Other/Info.plist b/Example/WalletApp/Other/Info.plist
@@ -2,10 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>NSUserActivityTypes</key>
-    <array>
-        <string>INSendMessageIntent</string>
-    </array>
 	<key>CFBundleIconName</key>
 	<string>AppIcon</string>
 	<key>CFBundleURLTypes</key>
@@ -23,19 +19,21 @@
 	<string>$(CONFIGURATION)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
+	<key>MIXPANEL_TOKEN</key>
+	<string>$(MIXPANEL_TOKEN)</string>
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSUserActivityTypes</key>
+	<array>
+		<string>INSendMessageIntent</string>
+	</array>
 	<key>PROJECT_ID</key>
 	<string>$(PROJECT_ID)</string>
-	<key>WALLETAPP_SENTRY_DSN</key>
-	<string>$(WALLETAPP_SENTRY_DSN)</string>
 	<key>SIMULATOR_IDENTIFIER</key>
 	<string>$(SIMULATOR_IDENTIFIER)</string>
-	<key>MIXPANEL_TOKEN</key>
-	<string>$(MIXPANEL_TOKEN)</string>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
@@ -53,9 +51,7 @@
 			</array>
 		</dict>
 	</dict>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>remote-notification</string>
-	</array>
+	<key>WALLETAPP_SENTRY_DSN</key>
+	<string>$(WALLETAPP_SENTRY_DSN)</string>
 </dict>
 </plist>