From e80617f657e54b036168347effe8db304481352d Mon Sep 17 00:00:00 2001
From: mike-dydx <mike@dydx.exchange>
Date: Fri, 3 May 2024 12:13:13 -0400
Subject: [PATCH 1/5] clean up

---
 .../dydxTakeProfitStopLossViewPresenter.swift | 25 +------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
index 7ea57af36..1474177c6 100644
--- a/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
+++ b/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
@@ -79,28 +79,6 @@ private class dydxTakeProfitStopLossViewPresenter: HostedViewPresenter<dydxTakeP
             )
             .compactMap { $0 }
             .sink { [weak self] subaccountPositions, triggerOrdersInput, errors, configsMap in
-                #if DEBUG
-                if let triggerOrdersInput {
-                    Console.shared.log("\nmmm marketId: \(triggerOrdersInput.marketId)")
-                    Console.shared.log("mmm size: \(triggerOrdersInput.size)")
-                    Console.shared.log("mmm stopLossOrder?.orderId: \(triggerOrdersInput.stopLossOrder?.orderId)")
-                    Console.shared.log("mmm stopLossOrder?.size: \(triggerOrdersInput.stopLossOrder?.size?.doubleValue)")
-                    Console.shared.log("mmm stopLossOrder?.side: \(triggerOrdersInput.stopLossOrder?.side?.rawValue)")
-                    Console.shared.log("mmm stopLossOrder?.type: \(triggerOrdersInput.stopLossOrder?.type?.rawValue)\n")
-                    Console.shared.log("mmm stopLossOrder?.price?.triggerPrice: \(triggerOrdersInput.stopLossOrder?.price?.triggerPrice)")
-                    Console.shared.log("mmm stopLossOrder?.price?.limitPrice: \(triggerOrdersInput.stopLossOrder?.price?.limitPrice)")
-                    Console.shared.log("mmm stopLossOrder?.price?.percentDiff: \(triggerOrdersInput.stopLossOrder?.price?.percentDiff)")
-                    Console.shared.log("mmm stopLossOrder?.price?.usdcDiff: \(triggerOrdersInput.stopLossOrder?.price?.usdcDiff)")
-                    Console.shared.log("mmm takeProfitOrder?.orderId: \(triggerOrdersInput.takeProfitOrder?.orderId)")
-                    Console.shared.log("mmm takeProfitOrder?.size: \(triggerOrdersInput.takeProfitOrder?.size?.doubleValue)")
-                    Console.shared.log("mmm takeProfitOrder?.side: \(triggerOrdersInput.takeProfitOrder?.side?.rawValue)\n")
-                    Console.shared.log("mmm takeProfitOrder?.type: \(triggerOrdersInput.takeProfitOrder?.type?.rawValue)\n")
-                    Console.shared.log("mmm takeProfitOrder?.price?.triggerPrice: \(triggerOrdersInput.takeProfitOrder?.price?.triggerPrice)")
-                    Console.shared.log("mmm takeProfitOrder?.price?.limitPrice: \(triggerOrdersInput.takeProfitOrder?.price?.limitPrice)\n")
-                    Console.shared.log("mmm takeProfitOrder?.price?.percentDiff: \(triggerOrdersInput.takeProfitOrder?.price?.percentDiff)")
-                    Console.shared.log("mmm takeProfitOrder?.price?.usdcDiff: \(triggerOrdersInput.takeProfitOrder?.price?.usdcDiff)\n")
-                }
-                #endif
                 self?.update(subaccountPositions: subaccountPositions, triggerOrdersInput: triggerOrdersInput, errors: errors, configsMap: configsMap)
             }
             .store(in: &subscriptions)
@@ -397,9 +375,8 @@ private class dydxTakeProfitStopLossViewPresenter: HostedViewPresenter<dydxTakeP
                     if let pendingOrders = self?.pendingOrders, pendingOrders <= 0 {
                         Router.shared?.navigate(to: .init(path: "/action/dismiss"), animated: true, completion: nil)
                     }
-                case .failed(let error):
+                case .failed:
                     self?.pendingOrders = nil
-                    // TODO: how to handle errors?
                     self?.viewModel?.submissionReadiness = .fixErrors(cta: DataLocalizer.shared?.localize(path: "APP.GENERAL.UNKNOWN_ERROR", params: nil))
                 }
             }

From 6c0954da4b2f00fa014c07370893fe51b40f52ef Mon Sep 17 00:00:00 2001
From: mike-dydx <mike@dydx.exchange>
Date: Fri, 3 May 2024 12:43:59 -0400
Subject: [PATCH 2/5] default to classic_dark instead of dark

---
 .../dydxPresenters/_v4/KeyValueStoreProtocolStore+Ext.swift     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/KeyValueStoreProtocolStore+Ext.swift b/dydx/dydxPresenters/dydxPresenters/_v4/KeyValueStoreProtocolStore+Ext.swift
index 2f218898a..349a08861 100644
--- a/dydx/dydxPresenters/dydxPresenters/_v4/KeyValueStoreProtocolStore+Ext.swift
+++ b/dydx/dydxPresenters/dydxPresenters/_v4/KeyValueStoreProtocolStore+Ext.swift
@@ -18,7 +18,7 @@ public enum dydxSettingsStoreKey: String, CaseIterable {
     public var defaultValue: Any? {
         switch self {
         case .language: return DataLocalizer.shared?.language
-        case .v4Theme: return dydxThemeType.dark.rawValue
+        case .v4Theme: return dydxThemeType.classicDark.rawValue
         case .directionColorPreference: return "green_is_up"
         case .shouldDisplayInAppNotifications: return true
         }

From 1d12e6ec466f155bb67c04165e09efb7f218b298 Mon Sep 17 00:00:00 2001
From: mike-dydx <mike@dydx.exchange>
Date: Fri, 3 May 2024 12:51:55 -0400
Subject: [PATCH 3/5] display oracle price and entry price as dollar formatted
 values

---
 .../dydxTakeProfitStopLossViewPresenter.swift                 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
index 1474177c6..e4e422d4c 100644
--- a/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
+++ b/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
@@ -112,7 +112,7 @@ private class dydxTakeProfitStopLossViewPresenter: HostedViewPresenter<dydxTakeP
     }
 
     private func update(market: PerpetualMarket?) {
-        viewModel?.oraclePrice = dydxFormatter.shared.raw(number: market?.oraclePrice?.doubleValue, digits: market?.configs?.displayTickSizeDecimals?.intValue ?? 2)
+        viewModel?.oraclePrice = dydxFormatter.shared.dollar(number: market?.oraclePrice?.doubleValue, digits: market?.configs?.displayTickSizeDecimals?.intValue ?? 2)
         viewModel?.customAmountViewModel?.assetId = market?.assetId
         viewModel?.customAmountViewModel?.stepSize = market?.configs?.stepSize?.stringValue
         viewModel?.customAmountViewModel?.minimumValue = market?.configs?.minOrderSize?.floatValue
@@ -218,7 +218,7 @@ private class dydxTakeProfitStopLossViewPresenter: HostedViewPresenter<dydxTakeP
             && order.side.opposite == position?.side.current
         }
 
-        viewModel?.entryPrice = dydxFormatter.shared.raw(number: position?.entryPrice?.current?.doubleValue,
+        viewModel?.entryPrice = dydxFormatter.shared.dollar(number: position?.entryPrice?.current?.doubleValue,
                                                          digits: marketConfig.displayTickSizeDecimals?.intValue ?? 2)
 
         viewModel?.takeProfitStopLossInputAreaViewModel?.numOpenTakeProfitOrders = takeProfitOrders.count

From 7dd664f58c73d2725ef0dbb8545c58d3e3509007 Mon Sep 17 00:00:00 2001
From: mike-dydx <mike@dydx.exchange>
Date: Fri, 3 May 2024 13:23:19 -0400
Subject: [PATCH 4/5] handle pendingOrders == 0

---
 .../dydxTakeProfitStopLossViewPresenter.swift                 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
index e4e422d4c..3c991bf5c 100644
--- a/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
+++ b/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
@@ -380,6 +380,10 @@ private class dydxTakeProfitStopLossViewPresenter: HostedViewPresenter<dydxTakeP
                     self?.viewModel?.submissionReadiness = .fixErrors(cta: DataLocalizer.shared?.localize(path: "APP.GENERAL.UNKNOWN_ERROR", params: nil))
                 }
             }
+            // dismiss immediately if no changes
+            if (self?.pendingOrders ?? 0) == 0 {
+                Router.shared?.navigate(to: .init(path: "/action/dismiss"), animated: true, completion: nil)
+            }
         }
 
         self.viewModel = viewModel

From e5fb250a2211ae809e3d2d27f50b1bf7728eb70b Mon Sep 17 00:00:00 2001
From: mike-dydx <mike@dydx.exchange>
Date: Fri, 3 May 2024 13:23:32 -0400
Subject: [PATCH 5/5] call on edited only when focused

---
 .../Components/dydxGainLossInputViewModel.swift                  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dydx/dydxViews/dydxViews/_v4/TakeProfitStopLoss/Components/dydxGainLossInputViewModel.swift b/dydx/dydxViews/dydxViews/_v4/TakeProfitStopLoss/Components/dydxGainLossInputViewModel.swift
index a8e05a422..3fb9bafe9 100644
--- a/dydx/dydxViews/dydxViews/_v4/TakeProfitStopLoss/Components/dydxGainLossInputViewModel.swift
+++ b/dydx/dydxViews/dydxViews/_v4/TakeProfitStopLoss/Components/dydxGainLossInputViewModel.swift
@@ -125,6 +125,7 @@ struct dydxGainLossInputView: View {
     }
 
     private func displayTextOnChange(newValue: String) {
+        guard isFocused else { return }
         viewModel.onEdited?(newValue, viewModel.curUnit)
     }