Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MOB-1676 Fix custom url links from dApps #361

Merged
merged 2 commits into from
Jan 24, 2024
Merged

MOB-1676 Fix custom url links from dApps #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61388a7
updated prefix to 'unstoppabledomains'
rommex Jan 23, 2024
b2e07e1
parsing native links with wc url
rommex Jan 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions unstoppable-ios-app/Dev-Env-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<string>com.unstoppabledomains.manager</string>
<key>CFBundleURLSchemes</key>
<array>
<string>unstoppable</string>
<string>unstoppabledomains</string>
</array>
</dict>
<dict>
Expand All @@ -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>
Expand Down
7 changes: 7 additions & 0 deletions unstoppable-ios-app/domains-manager-ios/Extensions/String.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
4 changes: 2 additions & 2 deletions unstoppable-ios-app/domains-manager-ios/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<string>com.unstoppabledomains.manager</string>
<key>CFBundleURLSchemes</key>
<array>
<string>unstoppable</string>
<string>unstoppabledomains</string>
</array>
</dict>
<dict>
Expand Down Expand Up @@ -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>
Expand Down
11 changes: 8 additions & 3 deletions unstoppable-ios-app/domains-manager-ios/Services/DeepLinksService/DeepLinksService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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),
Expand All @@ -172,7 +177,7 @@ private extension DeepLinksService {
}
return nil
}

func handleWCDeepLink(_ incomingURL: URL, receivedState: ExternalEventReceivedState) {
externalEventsService.receiveEvent(.wcDeepLink(incomingURL), receivedState: receivedState)
}
Expand Down