Merge branch 'develop' into bugfix/IOS-7062_hide_dash_if_no_balance

Tangem/App/Services/ExpressDestinationService/CommonExpressDestinationService.swift

@@ -28,46 +28,6 @@ struct CommonExpressDestinationService {
 // MARK: - ExpressDestinationService
 
 extension CommonExpressDestinationService: ExpressDestinationService {
- func canBeSwapped(wallet: WalletModel) async -> Bool {
- let isAvailable = swapAvailabilityProvider.canSwap(tokenItem: wallet.tokenItem)
-
- guard isAvailable, !wallet.isCustom else {
- AppLog.shared.debug("[Express] \(self) has checked that wallet: \(wallet.name) can not be swapped")
- return false
- }
-
- do {
- try await expressRepository.updatePairs(for: wallet)
- } catch {
- return false
- }
-
- let hasBalance = (wallet.balanceValue ?? 0) > 0
- let pairsFrom = await expressRepository.getPairs(from: wallet)
-
- // If we can swap as source
- if hasBalance, !pairsFrom.isEmpty {
- AppLog.shared.debug("[Express] \(self) has checked that wallet: \(wallet.name) can be swapped as source")
- return true
- }
-
- // Otherwise we try to find a source wallet with balance and swap on `wallet` as destination
- let pairsTo = await expressRepository.getPairs(to: wallet)
- let walletModelsWithPositiveBalance = walletModelsManager.walletModels.filter { !$0.isZeroAmount }
-
- let hasSourceWithBalance = walletModelsWithPositiveBalance.contains { wallet in
- pairsTo.contains(where: { $0.source == wallet.expressCurrency })
- }
-
- if hasSourceWithBalance {
- AppLog.shared.debug("[Express] \(self) has checked that wallet: \(wallet.name) can be swapped as destination")
- return true
- }
-
- AppLog.shared.debug("[Express] \(self) has checked that wallet: \(wallet.name) can not be swapped")
- return false
- }
-
  func getDestination(source: WalletModel) async throws -> WalletModel {
  let availablePairs = await expressRepository.getPairs(from: source)
  let searchableWalletModels = walletModelsManager.walletModels.filter { wallet in

Tangem/App/Services/ExpressDestinationService/ExpressDestinationService.swift

@@ -9,7 +9,6 @@
 import Foundation
 
 protocol ExpressDestinationService {
- func canBeSwapped(wallet: WalletModel) async -> Bool
  func getDestination(source: WalletModel) async throws -> WalletModel
 }
 

TangemExpress/Factory/TangemExpressFactory.swift

@@ -42,6 +42,24 @@ public struct TangemExpressFactory {
  )
  }
 
+ public func makeOnrampManager(
+ expressAPIProvider: ExpressAPIProvider,
+ allowanceProvider: ExpressAllowanceProvider,
+ feeProvider: FeeProvider,
+ expressRepository: ExpressRepository,
+ logger: Logger? = nil,
+ analyticsLogger: ExpressAnalyticsLogger? = nil
+ ) -> OnrampManager {
+ let logger: Logger = logger ?? CommonLogger()
+ let repository = CommonOnrampRepository(provider: expressAPIProvider)
+
+ return CommonOnrampManager(
+ provider: expressAPIProvider,
+ onrampRepository: repository,
+ logger: logger
+ )
+ }
+
  public func makeExpressAPIProvider(
  credential: ExpressAPICredential,
  deviceInfo: ExpressDeviceInfo,

TangemExpress/Manager/OnrampManager/CommonOnrampManager.swift

@@ -0,0 +1,62 @@
+//
+// CommonOnrampManager.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 02.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+public actor CommonOnrampManager {
+ private let provider: ExpressAPIProvider
+ private let onrampRepository: OnrampRepository
+ private let logger: Logger
+
+ private var _providers: [OnrampProvider] = []
+
+ public init(
+ provider: ExpressAPIProvider,
+ onrampRepository: OnrampRepository,
+ logger: Logger
+ ) {
+ self.provider = provider
+ self.onrampRepository = onrampRepository
+ self.logger = logger
+ }
+}
+
+// MARK: - OnrampManager
+
+extension CommonOnrampManager: OnrampManager {
+ public func updateCountry() async throws -> OnrampCountry {
+ // Define country by ip or get from repository
+ // https://tangem.atlassian.net/browse/IOS-8267
+
+ throw OnrampManagerError.notImplement
+ }
+
+ public func updatePaymentMethod() async throws -> OnrampPaymentMethod {
+ // Load payment methods
+ // Or get it from repository (?)
+ throw OnrampManagerError.notImplement
+ }
+
+ public func update(pair: OnrampPair) async throws -> [OnrampProvider] {
+ // Load providers from API
+ // Make provides
+ // Save providers
+ throw OnrampManagerError.notImplement
+ }
+
+ public func update(amount: Decimal) async throws -> [OnrampProvider] {
+ for provider in _providers {
+ _ = await provider.manager.update(amount: amount)
+ }
+
+ return _providers
+ }
+
+ public func loadOnrampData(request: OnrampQuotesRequest) async throws -> OnrampRedirectData {
+ // Load data from API
+ throw OnrampManagerError.notImplement
+ }
+}

TangemExpress/Manager/OnrampManager/OnrampManager.swift

@@ -0,0 +1,28 @@
+//
+// OnrampManager.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 02.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+public protocol OnrampManager {
+ // Load country by IP or get from repository
+ func updateCountry() async throws -> OnrampCountry
+
+ // Load methods
+ func updatePaymentMethod() async throws -> OnrampPaymentMethod
+
+ // User did choose country. We prepare providers
+ func update(pair: OnrampPair) async throws -> [OnrampProvider]
+
+ // User did change amount. We load quotes providers
+ func update(amount: Decimal) async throws -> [OnrampProvider]
+
+ // load data to make onramp
+ func loadOnrampData(request: OnrampQuotesRequest) async throws -> OnrampRedirectData
+}
+
+public enum OnrampManagerError: LocalizedError {
+ case notImplement
+}

TangemExpress/Manager/OnrampProviderManager/OnrampProviderManager.swift

@@ -0,0 +1,23 @@
+//
+// OnrampProviderManager.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 14.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+// For every onramp provider
+public protocol OnrampProviderManager: Actor {
+ // Update quotes for amount
+ func update(amount: Decimal) async -> OnrampProviderManagerState
+
+ // Get actual state
+ func state() -> OnrampProviderManagerState
+}
+
+public enum OnrampProviderManagerState: Hashable {
+ case created
+ case loading
+ case failed(error: String)
+ case loaded(quote: OnrampQuote)
+}

TangemExpress/Manager/OnrampRepository/CommonOnrampRepository.swift

@@ -0,0 +1,28 @@
+//
+// CommonOnrampRepository.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 14.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+class CommonOnrampRepository {
+ let provider: ExpressAPIProvider
+
+ init(provider: ExpressAPIProvider) {
+ self.provider = provider
+ }
+}
+
+// MARK: - OnrampRepository
+
+// TODO: https://tangem.atlassian.net/browse/IOS-8268
+// Add method to save values which user chose
+extension CommonOnrampRepository: OnrampRepository {
+ var savedCountry: OnrampCountry? { nil }
+ var savedPaymentMethod: OnrampPaymentMethod? { nil }
+
+ func save(country: OnrampCountry) throws {}
+
+ func save(paymentMethod: OnrampPaymentMethod) throws {}
+}

TangemExpress/Manager/OnrampRepository/OnrampRepository.swift

@@ -0,0 +1,15 @@
+//
+// OnrampRepository.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 02.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+public protocol OnrampRepository {
+ var savedCountry: OnrampCountry? { get }
+ var savedPaymentMethod: OnrampPaymentMethod? { get }
+
+ func save(country: OnrampCountry) throws
+ func save(paymentMethod: OnrampPaymentMethod) throws
+}

TangemExpress/Models/Onramp/OnrampCountry.swift

@@ -0,0 +1,19 @@
+//
+// OnrampCountry.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 02.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+public struct OnrampCountry: Hashable {
+ public let identity: OnrampIdentity
+ public let currency: OnrampCurrency
+ public let onrampAvailable: Bool
+
+ public init(identity: OnrampIdentity, currency: OnrampCurrency, onrampAvailable: Bool) {
+ self.identity = identity
+ self.currency = currency
+ self.onrampAvailable = onrampAvailable
+ }
+}

TangemExpress/Models/Onramp/OnrampCurrency.swift

@@ -0,0 +1,15 @@
+//
+// OnrampCurrency.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 02.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+public struct OnrampCurrency: Hashable {
+ public let identity: OnrampIdentity
+
+ public init(identity: OnrampIdentity) {
+ self.identity = identity
+ }
+}

TangemExpress/Models/Onramp/OnrampIdentity.swift

@@ -0,0 +1,19 @@
+//
+// OnrampIdentity.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 02.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+public struct OnrampIdentity: Hashable {
+ public let name: String
+ public let code: String
+ public let image: URL
+
+ public init(name: String, code: String, image: URL) {
+ self.name = name
+ self.code = code
+ self.image = image
+ }
+}

TangemExpress/Models/Onramp/OnrampPair.swift

@@ -0,0 +1,30 @@
+//
+// OnrampPair.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 02.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+public struct OnrampPair {
+ public let item: ExpressWallet
+ public let currency: OnrampCurrency
+
+ public init(item: ExpressWallet, currency: OnrampCurrency) {
+ self.item = item
+ self.currency = currency
+ }
+}
+
+// MARK: - Hashable
+
+extension OnrampPair: Hashable {
+ public static func == (lhs: OnrampPair, rhs: OnrampPair) -> Bool {
+ lhs.hashValue == rhs.hashValue
+ }
+
+ public func hash(into hasher: inout Hasher) {
+ hasher.combine(item.expressCurrency)
+ hasher.combine(currency)
+ }
+}

TangemExpress/Models/Onramp/OnrampPaymentMethod.swift

@@ -0,0 +1,9 @@
+//
+// OnrampPaymentMethod.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 14.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+public struct OnrampPaymentMethod: Hashable {}

TangemExpress/Models/Onramp/OnrampProvider.swift

@@ -0,0 +1,11 @@
+//
+// OnrampProvider.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 14.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+public struct OnrampProvider {
+ public let manager: OnrampProviderManager
+}

TangemExpress/Models/Onramp/OnrampQuote.swift

@@ -0,0 +1,9 @@
+//
+// OnrampQuote.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 14.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+public struct OnrampQuote: Hashable {}

TangemExpress/Models/Onramp/OnrampQuotesRequest.swift

@@ -0,0 +1,26 @@
+//
+// OnrampQuotesRequest.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 14.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+public struct OnrampQuotesRequest: Hashable {
+ public let pair: OnrampPair
+ public let providerId: String
+ public let paymentMethod: OnrampPaymentMethod
+ public let amount: Decimal
+
+ public init(
+ pair: OnrampPair,
+ providerId: String,
+ paymentMethod: OnrampPaymentMethod,
+ amount: Decimal
+ ) {
+ self.pair = pair
+ self.providerId = providerId
+ self.paymentMethod = paymentMethod
+ self.amount = amount
+ }
+}

TangemExpress/Models/Onramp/OnrampRedirectData.swift

@@ -0,0 +1,11 @@
+//
+// OnrampRedirectData.swift
+// TangemApp
+//
+// Created by Sergey Balashov on 14.10.2024.
+// Copyright © 2024 Tangem AG. All rights reserved.
+//
+
+public struct OnrampRedirectData: Hashable {
+ let successURL: URL
+}