Fix swap module bugs

horizontalsystems · Dec 7, 2023 · e10b258 · e10b258
1 parent 41ab77c
commit e10b258
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchDataSource.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/OneInch/OneInchDataSource.swift
@@ -8,7 +8,7 @@ import ThemeKit
 import UIKit
 
 class OneInchDataSource {
-    private static let levelColors: [UIColor] = [.themeRemus, .themeJacob, .themeLucian]
+    private static let levelColors: [UIColor] = [.themeRemus, .themeJacob, .themeLucian, .themeLucian]
 
     private let disposeBag = DisposeBag()
 

diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapModule.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapModule.swift
@@ -114,6 +114,15 @@ extension UniswapKit.Kit.TradeError: LocalizedError {
     }
 }
 
+extension UniswapKit.KitV3.TradeError: LocalizedError {
+    public var errorDescription: String? {
+        switch self {
+        case .tradeNotFound: return "swap.trade_error.not_found".localized
+        default: return nil
+        }
+    }
+}
+
 extension UniswapModule.TradeError: LocalizedError {
     public var errorDescription: String? {
         switch self {

diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/Uniswap/UniswapViewModel.swift
@@ -369,7 +369,7 @@ extension UniswapViewModel {
 
         switch trade.impactLevel {
         case .warning: impactWarnings = [UniswapModule.UniswapWarning.highPriceImpact]
-        case .forbidden: impactErrors = [UniswapModule.UniswapError.forbiddenPriceImpact(provider: "Uniswap")] // we can use url from dex
+        case .forbidden: impactErrors = [UniswapModule.UniswapError.forbiddenPriceImpact(provider: dexName)] // we can use url from dex
         default: ()
         }
         let sendEvmData = SendEvmData(

diff --git a/...oppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3DataSource.swift b/...oppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3DataSource.swift
@@ -8,7 +8,7 @@ import UIKit
 import UniswapKit
 
 class UniswapV3DataSource {
-    private static let levelColors: [UIColor] = [.themeRemus, .themeJacob, .themeLucian]
+    private static let levelColors: [UIColor] = [.themeRemus, .themeJacob, .themeLucian, .themeLucian]
 
     private let disposeBag = DisposeBag()
 

diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3ViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/Swap/Adapters/UniswapV3/UniswapV3ViewModel.swift
@@ -369,14 +369,16 @@ extension UniswapV3ViewModel {
         )
 
         var impactWarning = [Warning]()
+        var impactErrors = [Error]()
         switch trade.impactLevel {
         case .warning: impactWarning = [UniswapModule.UniswapWarning.highPriceImpact]
-        case .forbidden: impactWarning = [UniswapModule.UniswapWarning.forbiddenPriceImpact]
+        case .forbidden: impactErrors = [UniswapModule.UniswapError.forbiddenPriceImpact(provider: dexName)]
         default: ()
         }
         let sendEvmData = SendEvmData(
             transactionData: transactionData, additionalInfo: .uniswap(info: swapInfo),
-            warnings: impactWarning
+            warnings: impactWarning,
+            errors: impactErrors
         )
 
         openConfirmRelay.accept(sendEvmData)