From 475cca74d391473855a48ae46913b1bbbc85cfbc Mon Sep 17 00:00:00 2001
From: mike-dydx <mike@dydx.exchange>
Date: Thu, 2 May 2024 16:04:39 -0400
Subject: [PATCH] fix custom amount issue

---
 .../dydxTakeProfitStopLossViewPresenter.swift                | 5 +++--
 .../Components/dydxCustomAmountViewModel.swift               | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
index 779250772..7ea57af36 100644
--- a/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
+++ b/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
@@ -188,8 +188,9 @@ private class dydxTakeProfitStopLossViewPresenter: HostedViewPresenter<dydxTakeP
         viewModel?.takeProfitStopLossInputAreaViewModel?.lossInputViewModel?.set(value: formattedStopLossUsdcDiff, forUnit: .dollars)
         viewModel?.takeProfitStopLossInputAreaViewModel?.lossInputViewModel?.set(value: formattedStopLossUsdcPercentage, forUnit: .percentage)
 
-        // logic primarily to pre-populate custom amount. need to account 3 situations: 1 take profit order or 1 stop loss order or both
-        if let customSize = triggerOrdersInput?.size?.doubleValue.magnitude, customSize != position?.size?.current?.doubleValue.magnitude {
+        // logic primarily to pre-populate custom amount.
+        // we do not want to turn on custom amount if it is not already on and the order size is the same amount as the position size. The custom amount may already be on if user manually turned it on, or a pre-existing custom amount exists that is less than the position size
+        if let customSize = triggerOrdersInput?.size?.doubleValue.magnitude, customSize != position?.size?.current?.doubleValue.magnitude || viewModel?.customAmountViewModel?.isOn == true {
             let formattedSize = dydxFormatter.shared.raw(number: customSize, digits: marketConfig.displayStepSizeDecimals?.intValue ?? 2)
             viewModel?.customAmountViewModel?.programmaticallySet(newValue: formattedSize)
         }
diff --git a/dydx/dydxViews/dydxViews/_v4/TakeProfitStopLoss/Components/dydxCustomAmountViewModel.swift b/dydx/dydxViews/dydxViews/_v4/TakeProfitStopLoss/Components/dydxCustomAmountViewModel.swift
index dedfc8841..6146c873f 100644
--- a/dydx/dydxViews/dydxViews/_v4/TakeProfitStopLoss/Components/dydxCustomAmountViewModel.swift
+++ b/dydx/dydxViews/dydxViews/_v4/TakeProfitStopLoss/Components/dydxCustomAmountViewModel.swift
@@ -13,7 +13,7 @@ import Utilities
 
 public class dydxCustomAmountViewModel: PlatformTextInputViewModel {
 
-    @Published private var isOn: Bool = false
+    @Published private (set) public var isOn: Bool = false
     @Published public var toggleAction: ((Bool) -> Void)?
 
     @Published public var assetId: String? {