Clean up

dydxprotocol · Apr 22, 2024 · 6ad7541 · 6ad7541
1 parent 3c16f80
commit 6ad7541
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/...c/main/java/exchange/dydx/trading/feature/trade/trigger/DydxTriggerOrderInputViewModel.kt b/...c/main/java/exchange/dydx/trading/feature/trade/trigger/DydxTriggerOrderInputViewModel.kt
@@ -88,7 +88,6 @@ class DydxTriggerOrderInputViewModel @Inject constructor(
         val firstError = errors?.firstOrNull { it.type == ErrorType.error }
         val firstWarning = errors?.firstOrNull { it.type == ErrorType.warning }
         val fieldString = firstError?.fields?.firstOrNull() ?: firstWarning?.fields?.firstOrNull()
-        print("fieldString: $fieldString")
         val field: TriggerOrdersInputField? = fieldString?.let {
             TriggerOrdersInputField.invoke(it)
         }

diff --git a/...eature/trade/trigger/components/inputfields/gainloss/DydxTriggerOrderGainLossViewModel.kt b/...eature/trade/trigger/components/inputfields/gainloss/DydxTriggerOrderGainLossViewModel.kt
@@ -83,7 +83,7 @@ open class DydxTriggerOrderGainLossViewModel(
     ): DydxTriggerOrderGainLossView.ViewState {
         val marketConfigs = configsAndAsset?.configs
         val tickSize = marketConfigs?.displayTickSizeDecimals ?: 0
-        val firstError = validationErrors?.firstOrNull { it.type == ErrorType.error }
+        val firstErrorOrWarning = validationErrors?.firstOrNull { it.type == ErrorType.error }
             ?: validationErrors?.firstOrNull { it.type == ErrorType.warning }
 
         fun formatOrder(orderPrice: TriggerPrice) =
@@ -130,19 +130,19 @@ open class DydxTriggerOrderGainLossViewModel(
                 },
                 alertState = when (inputType) {
                     DydxTriggerOrderInputType.TakeProfit ->
-                        if (firstError?.fields?.contains(TriggerOrdersInputField.takeProfitPercentDiff.rawValue) == true ||
-                            firstError?.fields?.contains(TriggerOrdersInputField.takeProfitUsdcDiff.rawValue) == true
+                        if (firstErrorOrWarning?.fields?.contains(TriggerOrdersInputField.takeProfitPercentDiff.rawValue) == true ||
+                            firstErrorOrWarning?.fields?.contains(TriggerOrdersInputField.takeProfitUsdcDiff.rawValue) == true
                         ) {
-                            firstError.alertState
+                            firstErrorOrWarning.alertState
                         } else {
                             PlatformInputAlertState.None
                         }
 
                     DydxTriggerOrderInputType.StopLoss ->
-                        if (firstError?.fields?.contains(TriggerOrdersInputField.stopLossPercentDiff.rawValue) == true ||
-                            firstError?.fields?.contains(TriggerOrdersInputField.stopLossUsdcDiff.rawValue) == true
+                        if (firstErrorOrWarning?.fields?.contains(TriggerOrdersInputField.stopLossPercentDiff.rawValue) == true ||
+                            firstErrorOrWarning?.fields?.contains(TriggerOrdersInputField.stopLossUsdcDiff.rawValue) == true
                         ) {
-                            firstError.alertState
+                            firstErrorOrWarning.alertState
                         } else {
                             PlatformInputAlertState.None
                         }

diff --git a/...ding/feature/trade/trigger/components/inputfields/price/DydxTriggerOrderPriceViewModel.kt b/...ding/feature/trade/trigger/components/inputfields/price/DydxTriggerOrderPriceViewModel.kt
@@ -93,7 +93,7 @@ open class DydxTriggerOrderPriceViewModel(
     ): DydxTriggerOrderPriceView.ViewState {
         val marketConfigs = configsAndAsset?.configs
         val tickSize = marketConfigs?.displayTickSizeDecimals ?: 0
-        val firstError = validationErrors?.firstOrNull { it.type == ErrorType.error }
+        val firstErrorOrWarning = validationErrors?.firstOrNull { it.type == ErrorType.error }
             ?: validationErrors?.firstOrNull { it.type == ErrorType.warning }
 
         val state = DydxTriggerOrderPriceView.ViewState(
@@ -128,8 +128,8 @@ open class DydxTriggerOrderPriceViewModel(
                         tickSize,
                     )
                 },
-                alertState = if (firstError?.fields?.contains(inputType.abacusInputField.rawValue) == true) {
-                    firstError.alertState
+                alertState = if (firstErrorOrWarning?.fields?.contains(inputType.abacusInputField.rawValue) == true) {
+                    firstErrorOrWarning.alertState
                 } else {
                     PlatformInputAlertState.None
                 },

diff --git a/...rading/feature/trade/trigger/components/inputfields/size/DydxTriggerOrderSizeViewModel.kt b/...rading/feature/trade/trigger/components/inputfields/size/DydxTriggerOrderSizeViewModel.kt
@@ -69,7 +69,7 @@ class DydxTriggerOrderSizeViewModel @Inject constructor(
         } else {
             0.0
         }
-        val firstError = validationErrors?.firstOrNull { it.type == ErrorType.error }
+        val firstErrorOrWarning = validationErrors?.firstOrNull { it.type == ErrorType.error }
             ?: validationErrors?.firstOrNull { it.type == ErrorType.warning }
 
         return DydxTriggerOrderSizeView.ViewState(
@@ -89,8 +89,8 @@ class DydxTriggerOrderSizeViewModel @Inject constructor(
                 label = localizer.localize("APP.GENERAL.AMOUNT"),
                 token = configsAndAsset?.asset?.id,
                 value = formatter.decimalLocaleAgnostic(size, size = stepSize),
-                alertState = if (firstError?.fields?.contains(TriggerOrdersInputField.size.rawValue) == true) {
-                    firstError.alertState
+                alertState = if (firstErrorOrWarning?.fields?.contains(TriggerOrdersInputField.size.rawValue) == true) {
+                    firstErrorOrWarning.alertState
                 } else {
                     PlatformInputAlertState.None
                 },