Remove AssetImageFormatter and Chain .main factory property

gemwalletcom · Jun 5, 2024 · d8c134f · d8c134f
1 parent af279eb
commit d8c134f
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/Gem/App-Configuration.swift b/Gem/App-Configuration.swift
@@ -8,14 +8,6 @@ import BigInt
 import WalletConnector
 import GemstoneSwift
 
-extension AssetImageFormatter {
-    static let main = AssetImageFormatter(endpoint: PublicConstants.url(.assets))
-}
-
-extension Chain {
-    static let main = Asset.main.chain
-}
-
 extension Asset {
     static let main = Asset.bitcoin
     static let ethereum = Asset(id: Chain.ethereum.assetId, name: "Ethereum", symbol: "ETH", decimals: 18, type: .native)

diff --git a/Gem/Assets/ViewModels/AssetIdViewModel.swift b/Gem/Assets/ViewModels/AssetIdViewModel.swift
@@ -11,7 +11,7 @@ struct AssetIdViewModel {
 
     init(
         assetId: AssetId,
-        assetFormatter: AssetImageFormatter = .main
+        assetFormatter: AssetImageFormatter = AssetImageFormatter()
     ) {
         self.assetId = assetId
         self.assetFormatter = assetFormatter

diff --git a/Gem/Stake/ViewModels/StakeDelegationViewModel.swift b/Gem/Stake/ViewModels/StakeDelegationViewModel.swift
@@ -11,7 +11,7 @@ struct StakeDelegationViewModel {
     let delegation: Delegation
 
     private let formatter = ValueFormatter(style: .medium)
-    private let validatorImageFormatter = AssetImageFormatter.main
+    private let validatorImageFormatter = AssetImageFormatter()
 
     private static let dateFormatterDefault: DateComponentsFormatter = {
         let formatter = DateComponentsFormatter()

diff --git a/Gem/Stake/Views/ValidatorImageView.swift b/Gem/Stake/Views/ValidatorImageView.swift
@@ -7,7 +7,7 @@ import Primitives
 struct ValidatorImageView: View {
 
     let validator: DelegationValidator
-    private let formatter = AssetImageFormatter.main
+    private let formatter = AssetImageFormatter()
 
     var body: some View {
         AsyncImageView(

diff --git a/Packages/Primitives/Sources/AssetImageFormatter.swift b/Packages/Primitives/Sources/AssetImageFormatter.swift
@@ -1,11 +1,15 @@
+
 import Foundation
+import Gemstone
 
 public struct AssetImageFormatter {
 
+    public static let defaultEndpoint = URL(string: Config().getPublicUrl(item: .assets))!
+
     let endpoint: URL
 
     public init(
-        endpoint: URL
+        endpoint: URL = Self.defaultEndpoint
     ) {
         self.endpoint = endpoint
     }