Merge branch 'refs/heads/master' into version/0.40

# Conflicts: # UnstoppableWallet/UnstoppableWallet.xcodeproj/project.pbxproj
horizontalsystems · Sep 6, 2024 · 7bc9026 · 7bc9026
2 parents d52a604 + baeec1c
commit 7bc9026
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/MultiSwap/MultiSwapQuotesView.swift b/UnstoppableWallet/UnstoppableWallet/Modules/MultiSwap/MultiSwapQuotesView.swift
@@ -22,9 +22,9 @@ struct MultiSwapQuotesView: View {
                                 VStack(alignment: .leading, spacing: 1) {
                                     Text(quote.provider.name).textSubhead2(color: .themeLeah)
 
-                                    if quote.provider.id == viewModel.bestQuote?.provider.id {
-                                        Text("swap.quotes.best_price".localized).textSubhead2(color: .themeRemus)
-                                    }
+                                    // if quote.provider.id == viewModel.bestQuote?.provider.id {
+                                    //     Text("swap.quotes.best_price".localized).textSubhead2(color: .themeRemus)
+                                    // }
                                 }
 
                                 Spacer()

diff --git a/UnstoppableWallet/UnstoppableWallet/Modules/MultiSwap/MultiSwapViewModel.swift b/UnstoppableWallet/UnstoppableWallet/Modules/MultiSwap/MultiSwapViewModel.swift
@@ -253,7 +253,12 @@ class MultiSwapViewModel: ObservableObject {
 
     @Published var quotes: [Quote] = [] {
         didSet {
-            bestQuote = quotes.max { $0.quote.amountOut < $1.quote.amountOut }
+            if let featuredQuote = quotes.first(where: { $0.provider is OneInchMultiSwapProvider }) {
+                bestQuote = featuredQuote
+            } else {
+                bestQuote = quotes.max { $0.quote.amountOut < $1.quote.amountOut }
+            }
+
             syncCurrentQuote()
 
             timer?.invalidate()