Add NavigationOpenLink and simplify code

gemwalletcom · Sep 10, 2024 · dda3a23 · dda3a23
1 parent 3ecc552
commit dda3a23
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 25 deletions.
diff --git a/Gem/Asset/AssetScene.swift b/Gem/Asset/AssetScene.swift
@@ -179,10 +179,6 @@ extension AssetScene {
 
     @MainActor
     private func onOpenLink(_ url: URL) {
-        // TODO: - find issue why we can't use @Environment(\.openURL) private var openURL here
-        // once we add native env url openning, we go to recursion on NavigationLink(value: model.assetModel.asset) { }
-        // AssetSceneViewModel recreates infinitly
-        guard UIApplication.shared.canOpenURL(url) else { return }
         UIApplication.shared.open(url)
     }
 

diff --git a/Gem/Assets/Scenes/AddTokenScene.swift b/Gem/Assets/Scenes/AddTokenScene.swift
@@ -95,9 +95,7 @@ extension AddTokenScene {
                 }
                 if let url = asset.explorerUrl {
                     Section {
-                        NavigationCustomLink(with: ListItemView(title: asset.explorerText)) {
-                            UIApplication.shared.open(url)
-                        }
+                        NavigationOpenLink(url: url, with: ListItemView(title: asset.explorerText))
                     }
                 }
             case .error(let error):

diff --git a/Gem/Charts/Scenes/ChartScene.swift b/Gem/Charts/Scenes/ChartScene.swift
@@ -76,9 +76,10 @@ struct ChartScene: View {
                 }
                 Section(Localized.Social.links) {
                     ForEach(details.socialUrls) { link in
-                        NavigationCustomLink(with: ListItemView(title: link.type.name, image: link.type.image)) {
-                            UIApplication.shared.open(link.url)
-                        }
+                        NavigationOpenLink(
+                            url: link.url,
+                            with: ListItemView(title: link.type.name, image: link.type.image)
+                        )
                     }
                 }
             }

diff --git a/Gem/Fiat/Scenes/BuyAssetScene.swift b/Gem/Fiat/Scenes/BuyAssetScene.swift
@@ -177,8 +177,6 @@ extension BuyAssetScene {
         guard let quote = model.input.quote,
               let url = URL(string: quote.redirectUrl) else { return }
 
-        // TODO: - use new @Environment(\.openURL) var openURL, insead use UIKit UIApplication
-        // currently impossible to use due navigation issues in nav stack
         UIApplication.shared.open(url, options: [:])
     }
 

diff --git a/Gem/Settings/Scenes/SettingsScene.swift b/Gem/Settings/Scenes/SettingsScene.swift
@@ -112,16 +112,15 @@ extension SettingsScene {
 
     private var aboutSection: some View {
         Section {
-
-            ListItemView(
+            NavigationOpenLink(url: model.helpCenterURL, with: ListItemView(
                 title: model.helpCenterTitle,
                 image: model.helpCenterImage
-            )
+            ))
 
-            ListItemView(
+            NavigationOpenLink(url: model.supportURL, with: ListItemView(
                 title: model.supportTitle,
                 image: model.supportImage
-            )
+            ))
 
             NavigationLink(value: Scenes.AboutUs()) {
                 ListItemView(

diff --git a/Gem/Settings/ViewModels/SettingsViewModel.swift b/Gem/Settings/ViewModels/SettingsViewModel.swift
@@ -89,9 +89,11 @@ class SettingsViewModel: ObservableObject {
 
     var helpCenterTitle: String { Localized.Settings.helpCenter }
     var helpCenterImage: Image { Image(.settingsHelpCenter) }
+    var helpCenterURL: URL { Docs.url(.start) }
 
     var supportTitle: String { Localized.Settings.support }
     var supportImage: Image { Image(.settingsSupport) }
+    var supportURL: URL { PublicConstants.url(.support) }
 
     var developerModeTitle: String { Localized.Settings.developer }
     var developerModeImage: Image { Image(.settingsDeveloper) }

diff --git a/Gem/Transactions/Scenes/TransactionScene.swift b/Gem/Transactions/Scenes/TransactionScene.swift
@@ -96,14 +96,11 @@ struct TransactionScene: View {
                 }
 
                 Section {
-                    Button(role: .none) {
-                        UIApplication.shared.open(model.transactionExplorerUrl)
-                    } label: {
-                        HStack {
-                            Text(model.transactionExplorerText)
-                                .tint(Colors.black)
-                        }
-                    }
+                    NavigationOpenLink(
+                        url: model.transactionExplorerUrl,
+                        with: Text(model.transactionExplorerText)
+                            .tint(Colors.black)
+                    )
                 }
             }
         }

diff --git a/Packages/Components/Sources/NavigationOpenLink.swift b/Packages/Components/Sources/NavigationOpenLink.swift
@@ -0,0 +1,23 @@
+// Copyright (c). Gem Wallet. All rights reserved.
+
+import Foundation
+import SwiftUI
+
+public struct NavigationOpenLink<Content: View>: View {
+    private let url: URL
+    private let content: Content
+
+    public init(
+        url: URL,
+        with content: Content
+    ) {
+        self.url = url
+        self.content = content
+    }
+
+    public var body: some View {
+        NavigationCustomLink(with: content) {
+            UIApplication.shared.open(url)
+        }
+    }
+}