use displayid for market mode selector

dydxprotocol · Aug 19, 2024 · 892af07 · 892af07
1 parent 6707502
commit 892af07
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Trade/Margin/dydxMarginModeViewBuilder.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Trade/Margin/dydxMarginModeViewBuilder.swift
@@ -13,6 +13,7 @@ import ParticlesKit
 import PlatformUI
 import dydxStateManager
 import Abacus
+import Combine
 
 public class dydxMarginModeViewBuilder: NSObject, ObjectBuilderProtocol {
     public func build<T>() -> T? {
@@ -62,16 +63,31 @@ private class dydxMarginModeViewPresenter: HostedViewPresenter<dydxMarginModeVie
     override func start() {
         super.start()
 
+        Publishers
+            .CombineLatest(
+                AbacusStateManager.shared.state.tradeInput,
+                AbacusStateManager.shared.state.marketMap
+            )
+            .sink { [weak self] tradeInput, marketMap in
+                self?.updateMarketDisplayId(tradeInput: tradeInput, marketMap: marketMap)
+            }
+            .store(in: &subscriptions)
+
         AbacusStateManager.shared.state.tradeInput
             .compactMap { $0 }
             .sink {[weak self] input in
+                // call this in separate publisher so that market maps do not overwrite trade input
                 self?.update(tradeInput: input)
             }
             .store(in: &subscriptions)
     }
+
+    private func updateMarketDisplayId(tradeInput: Abacus.TradeInput?, marketMap: [String: PerpetualMarket]?) {
+        guard let marketDisplayId = marketMap?[tradeInput?.marketId ?? ""]?.displayId else { return }
+        viewModel?.marketDisplayId = marketDisplayId
+    }
 
     private func update(tradeInput: Abacus.TradeInput) {
-        viewModel?.market = tradeInput.marketId
         let isSelectionDisabled = tradeInput.options?.marginModeOptions == nil
         viewModel?.isDisabled = isSelectionDisabled
         switch tradeInput.marginMode {

diff --git a/dydx/dydxViews/dydxViews/_v4/Trade/Margin/dydxMarginModeView.swift b/dydx/dydxViews/dydxViews/_v4/Trade/Margin/dydxMarginModeView.swift
@@ -91,15 +91,15 @@ public class dydxMarginModeItemViewModel: PlatformViewModel {
 }
 
 public class dydxMarginModeViewModel: PlatformViewModel {
-    @Published public var market: String?
+    @Published public var marketDisplayId: String?
     @Published public var items: [dydxMarginModeItemViewModel] = []
     @Published public var isDisabled: Bool = false
 
     public init() { }
 
     public static var previewValue: dydxMarginModeViewModel {
         let vm = dydxMarginModeViewModel()
-        vm.market = "ETH-USD"
+        vm.marketDisplayId = "ETH-USD"
         return vm
     }
 
@@ -112,7 +112,7 @@ public class dydxMarginModeViewModel: PlatformViewModel {
                     Text(DataLocalizer.localize(path: "APP.GENERAL.MARGIN_MODE"))
                         .themeColor(foreground: .textPrimary)
 
-                    Text(self.market ?? "")
+                    Text(self.marketDisplayId ?? "")
                         .themeColor(foreground: .textSecondary)
 
                     Spacer()
@@ -127,7 +127,7 @@ public class dydxMarginModeViewModel: PlatformViewModel {
                 }
 
                 if self.isDisabled {
-                    InlineAlertViewModel(.init(title: nil, body: DataLocalizer.localize(path: "WARNINGS.TRADE_BOX.UNABLE_TO_CHANGE_MARGIN_MODE", params: ["MARKET": self.market ?? "--"]), level: .warning))
+                    InlineAlertViewModel(.init(title: nil, body: DataLocalizer.localize(path: "WARNINGS.TRADE_BOX.UNABLE_TO_CHANGE_MARGIN_MODE", params: ["MARKET": self.marketDisplayId ?? "--"]), level: .warning))
                         .createView()
                 }
                 Spacer()