MOB-1676 Fix custom url links from dApps (#361)

unstoppabledomains · Jan 24, 2024 · 55f6e64 · 55f6e64
1 parent e04d0b4
commit 55f6e64
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/unstoppable-ios-app/Dev-Env-Info.plist b/unstoppable-ios-app/Dev-Env-Info.plist
@@ -27,7 +27,7 @@
 			<string>com.unstoppabledomains.manager</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>unstoppable</string>
+				<string>unstoppabledomains</string>
 			</array>
 		</dict>
 		<dict>
@@ -53,7 +53,7 @@
 		<string>kleverwallet</string>
 		<string>mathwallet</string>
 		<string>metamask</string>
-        <string>rainbow</string>
+		<string>rainbow</string>
 		<string>okex</string>
 		<string>celo</string>
 		<string>zel</string>

diff --git a/unstoppable-ios-app/domains-manager-ios/Extensions/String.swift b/unstoppable-ios-app/domains-manager-ios/Extensions/String.swift
@@ -118,3 +118,10 @@ extension String {
         return self
     }
 }
+
+extension String {
+    func deletingPrefix(_ prefix: String) -> String? {
+        guard self.hasPrefix(prefix) else { return nil }
+        return String(self.dropFirst(prefix.count))
+    }
+}
diff --git a/unstoppable-ios-app/domains-manager-ios/Info.plist b/unstoppable-ios-app/domains-manager-ios/Info.plist
@@ -27,7 +27,7 @@
 			<string>com.unstoppabledomains.manager</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>unstoppable</string>
+				<string>unstoppabledomains</string>
 			</array>
 		</dict>
 		<dict>
@@ -56,7 +56,7 @@
 		<string>mathwallet</string>
 		<string>metamask</string>
 		<string>rainbow</string>
-        <string>okex</string>
+		<string>okex</string>
 		<string>celo</string>
 		<string>zel</string>
 		<string>fuse.cash</string>

diff --git a/unstoppable-ios-app/domains-manager-ios/Services/DeepLinksService/DeepLinksService.swift b/unstoppable-ios-app/domains-manager-ios/Services/DeepLinksService/DeepLinksService.swift
@@ -14,6 +14,7 @@ final class DeepLinksService {
     private var listeners: [DeepLinkListenerHolder] = []
     private let deepLinkPath = "/mobile"
     private let wcScheme = "wc"
+    private let customURLScheme = "unstoppabledomains"
     private var isExpectingWCInteraction = false
 
     init(externalEventsService: ExternalEventsServiceProtocol,
@@ -158,12 +159,16 @@ private extension DeepLinksService {
     func isWCDeepLinkUrl(from components: NSURLComponents) -> Bool {
         (components.path == deepLinkPath) ||
         (components.path == (deepLinkPath + "/" + wcScheme)) ||
-        (components.scheme == wcScheme)
+        (components.scheme == wcScheme) || (components.scheme == customURLScheme)
     }
 
     func parseWalletConnectURL(from components: NSURLComponents, in url: URL) -> URL? {
-        if components.scheme == wcScheme {
+        if components.scheme == wcScheme{
             return url
+        } else if (components.scheme == customURLScheme),
+                  let query = components.query,
+                  let urlExtracted = query.deletingPrefix("uri=") {
+            return URL(string: urlExtracted)
         } else if isWCDeepLinkUrl(from: components),
                   let params = components.queryItems,
                   let uri = params.findValue(forDeepLinkKey: DeepLinksParameterKey.uri),
@@ -172,7 +177,7 @@ private extension DeepLinksService {
         }
         return nil
     }
-     
+
     func handleWCDeepLink(_ incomingURL: URL, receivedState: ExternalEventReceivedState) {
         externalEventsService.receiveEvent(.wcDeepLink(incomingURL), receivedState: receivedState)
     }