cleaned up disabled behavior for margin mode selection

dydxprotocol · Jun 6, 2024 · 9c93ebe · 9c93ebe
1 parent 026174f
commit 9c93ebe
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Trade/Margin/dydxMarginModeViewBuilder.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Trade/Margin/dydxMarginModeViewBuilder.swift
@@ -76,8 +76,10 @@ private class dydxMarginModeViewPresenter: HostedViewPresenter<dydxMarginModeVie
         case .cross:
             crossItemViewModel.isSelected = true
             isolatedItemViewModel.isSelected = false
+            isolatedItemViewModel.isDisabled = tradeInput.options?.marginModeOptions == nil
         case .isolated:
             crossItemViewModel.isSelected = false
+            crossItemViewModel.isDisabled = tradeInput.options?.marginModeOptions == nil
             isolatedItemViewModel.isSelected = true
         default:
             assertionFailure("should have margin mode")

diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Trade/Margin/dydxTargetLeverageViewBuilder.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Trade/Margin/dydxTargetLeverageViewBuilder.swift
@@ -86,8 +86,6 @@ private class dydxTargetLeverageViewPresenter: HostedViewPresenter<dydxTargetLev
     override func start() {
         super.start()
 
-        // TODO: Fix...? tradeInput?.targetLeverage is nil for now
-
         Publishers.CombineLatest(AbacusStateManager.shared.state.configsAndAssetMap,
                        AbacusStateManager.shared.state.tradeInput)
             .compactMap { $0 }

diff --git a/dydx/dydxViews/dydxViews/_v4/Trade/Margin/dydxMarginModeView.swift b/dydx/dydxViews/dydxViews/_v4/Trade/Margin/dydxMarginModeView.swift
@@ -13,6 +13,7 @@ import Utilities
 public class dydxMarginModeItemViewModel: PlatformViewModel {
     @Published public var title: String?
     @Published public var detail: String?
+    @Published public var isDisabled: Bool = false
     @Published public var isSelected: Bool = false
     @Published public var selectedAction: (() -> Void)?
 
@@ -33,14 +34,16 @@ public class dydxMarginModeItemViewModel: PlatformViewModel {
                 HStack {
                     Text(self.title ?? "")
                         .themeFont(fontSize: .medium)
-                        .themeColor(foreground: .textPrimary)
+                        .themeColor(foreground: self.isDisabled ? .textTertiary : .textPrimary)
 
                     Spacer()
 
-                    if self.isSelected {
-                        self.createSelectedCheckmark(parentStyle: style)
-                    } else {
-                        self.createUnselectedCheckmark(parentStyle: style)
+                    if !self.isDisabled {
+                        if self.isSelected {
+                            self.createSelectedCheckmark(parentStyle: style)
+                        } else {
+                            self.createUnselectedCheckmark(parentStyle: style)
+                        }
                     }
                 }
 
@@ -52,18 +55,17 @@ public class dydxMarginModeItemViewModel: PlatformViewModel {
                 .padding(16)
                 .leftAligned()
                 .themeColor(background: self.isSelected ? ThemeColor.SemanticColor.layer1 : ThemeColor.SemanticColor.layer3)
-                .overlay(
-                    RoundedRectangle(cornerRadius: cornerRadius)
-                        .strokeBorder(self.isSelected ? ThemeColor.SemanticColor.colorPurple.color : ThemeColor.SemanticColor.textTertiary.color, lineWidth: 1)
-                )
-                .contentShape(RoundedRectangle(cornerRadius: cornerRadius))
+                .borderAndClip(style: .cornerRadius(8),
+                               borderColor: isSelected ? .colorPurple : isDisabled ? .textTertiary : .layer7,
+                               lineWidth: isSelected ? 2 : 1)
                 .wrappedViewModel
 
             return AnyView(
                 PlatformButtonViewModel(content: buttonContent,
                                         type: PlatformButtonType.iconType,
                                         action: self.selectedAction ?? {})
                     .createView(parentStyle: style)
+                    .disabled(isDisabled)
             )
         }
     }