From 77324a875ec1c536dec9fd2dd792a1890802984d Mon Sep 17 00:00:00 2001
From: Rui <rui@dydx.exchange>
Date: Wed, 4 Dec 2024 09:41:47 -0800
Subject: [PATCH 1/2] Fix UI display of token name in trade screens.

---
 .../dydxClosePositionInputEditPresenter.swift |  2 +-
 .../dydxTakeProfitStopLossViewPresenter.swift | 22 +++++++++++--------
 .../dydxTradeInputEditPresenter.swift         |  2 +-
 .../dydxTradeStatusViewBuilder.swift          |  4 ++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/ClosePosition/Components/dydxClosePositionInputEditPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/ClosePosition/Components/dydxClosePositionInputEditPresenter.swift
index 122b1c228..3ba47d112 100644
--- a/dydx/dydxPresenters/dydxPresenters/_v4/ClosePosition/Components/dydxClosePositionInputEditPresenter.swift
+++ b/dydx/dydxPresenters/dydxPresenters/_v4/ClosePosition/Components/dydxClosePositionInputEditPresenter.swift
@@ -90,7 +90,7 @@ class dydxClosePositionInputEditViewPresenter: HostedViewPresenter<dydxClosePosi
         } else {
             sizeViewModel.usdcSize = nil
         }
-        sizeViewModel.tokenSymbol = asset?.id ?? configsAndAsset?.assetId
+        sizeViewModel.tokenSymbol = asset?.displayableAssetId ?? configsAndAsset?.assetId
         visible.append(sizeViewModel)
 
         if parser.asNumber(percentViewModel.value)?.doubleValue != closePositionInput.size?.percent?.doubleValue {
diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
index 4d52aeeb9..3c96ece65 100644
--- a/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
+++ b/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
@@ -195,10 +195,13 @@ private class dydxTakeProfitStopLossViewPresenter: HostedViewPresenter<dydxTakeP
             }
             .store(in: &subscriptions)
 
-        AbacusStateManager.shared.state.market(of: marketId)
-            .compactMap { $0 }
-            .sink { [weak self] market in
-                self?.update(market: market)
+        Publishers
+            .CombineLatest(
+                AbacusStateManager.shared.state.market(of: marketId).compactMap { $0 },
+                AbacusStateManager.shared.state.configsAndAssetMap
+            )
+            .sink { [weak self] market, configsMap in
+                self?.update(market: market, configsMap: configsMap)
             }
             .store(in: &subscriptions)
 
@@ -250,12 +253,13 @@ private class dydxTakeProfitStopLossViewPresenter: HostedViewPresenter<dydxTakeP
         }
     }
 
-    private func update(market: PerpetualMarket?) {
-        viewModel?.oraclePrice = dydxFormatter.shared.dollar(number: market?.oraclePrice?.doubleValue, digits: market?.configs?.displayTickSizeDecimals?.intValue ?? 2)
-        viewModel?.customAmountViewModel?.sliderTextInput.accessoryTitle = market?.assetId
-        viewModel?.customAmountViewModel?.sliderTextInput.minValue = market?.configs?.minOrderSize?.doubleValue.magnitude ?? 0
+    private func update(market: PerpetualMarket, configsMap: [String: MarketConfigsAndAsset]) {
+        let configs = configsMap[market.assetId]
+        viewModel?.oraclePrice = dydxFormatter.shared.dollar(number: market.oraclePrice?.doubleValue, digits: market.configs?.displayTickSizeDecimals?.intValue ?? 2)
+        viewModel?.customAmountViewModel?.sliderTextInput.accessoryTitle = configs?.asset?.displayableAssetId
+        viewModel?.customAmountViewModel?.sliderTextInput.minValue = market.configs?.minOrderSize?.doubleValue.magnitude ?? 0
         // abacus stepSizeDecimals is not accurate for 10/100/1000 precision
-        if let stepSize = market?.configs?.stepSize?.doubleValue, stepSize > 0 {
+        if let stepSize = market.configs?.stepSize?.doubleValue, stepSize > 0 {
             viewModel?.customAmountViewModel?.sliderTextInput.numberFormatter.fractionDigits = Int(-log10(stepSize))
         }
     }
diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Trade/TradeInput/Components/TradeInputFields/dydxTradeInputEditPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Trade/TradeInput/Components/TradeInputFields/dydxTradeInputEditPresenter.swift
index 8b3ef4994..e21a07cf2 100644
--- a/dydx/dydxPresenters/dydxPresenters/_v4/Trade/TradeInput/Components/TradeInputFields/dydxTradeInputEditPresenter.swift
+++ b/dydx/dydxPresenters/dydxPresenters/_v4/Trade/TradeInput/Components/TradeInputFields/dydxTradeInputEditPresenter.swift
@@ -156,7 +156,7 @@ internal class dydxTradeInputEditViewPresenter: HostedViewPresenter<dydxTradeInp
             } else {
                 sizeViewModel.usdcSize = nil
             }
-            sizeViewModel.tokenSymbol = asset?.id ?? configsAndAsset?.assetId
+            sizeViewModel.tokenSymbol = configsAndAsset?.asset?.displayableAssetId ?? asset?.id
             visible.append(sizeViewModel)
 
             if tradeInput.options?.needsLeverage ?? false {
diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Trade/TradeStatus/dydxTradeStatusViewBuilder.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Trade/TradeStatus/dydxTradeStatusViewBuilder.swift
index c6e6e4d20..cbbbd75e2 100644
--- a/dydx/dydxPresenters/dydxPresenters/_v4/Trade/TradeStatus/dydxTradeStatusViewBuilder.swift
+++ b/dydx/dydxPresenters/dydxPresenters/_v4/Trade/TradeStatus/dydxTradeStatusViewBuilder.swift
@@ -201,7 +201,7 @@ private class dydxTradeStatusViewPresenter: HostedViewPresenter<dydxTradeStatusV
         if let size = tradeInput.summary?.size {
             viewModel?.orderViewModel.size = dydxFormatter.shared.localFormatted(number: size, digits: configs?.stepSizeDecimals?.intValue ?? 1)
         }
-        if let token = asset?.id ?? configsAndAsset?.assetId {
+        if let token = asset?.displayableAssetId ?? configsAndAsset?.assetId {
             viewModel?.orderViewModel.token?.symbol = token
         }
 
@@ -236,7 +236,7 @@ private class dydxTradeStatusViewPresenter: HostedViewPresenter<dydxTradeStatusV
 
         viewModel?.orderViewModel.type = DataLocalizer.localize(path: "APP.GENERAL.MARKET")
         viewModel?.orderViewModel.size = dydxFormatter.shared.localFormatted(number: closePositionInput.summary?.size, digits: configs?.stepSizeDecimals?.intValue ?? 1)
-        if let token = asset?.id ?? configsAndAsset?.assetId {
+        if let token = asset?.displayableAssetId ?? configsAndAsset?.assetId {
             viewModel?.orderViewModel.token?.symbol = token
         }
         viewModel?.orderViewModel.date = submissionDate

From b2ad3eb55d32694270a5061b2cf72766a9897760 Mon Sep 17 00:00:00 2001
From: Rui <rui@dydx.exchange>
Date: Wed, 4 Dec 2024 10:16:01 -0800
Subject: [PATCH 2/2] Clean up

---
 .../dydxTakeProfitStopLossViewPresenter.swift                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift b/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
index 3c96ece65..08795a654 100644
--- a/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
+++ b/dydx/dydxPresenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
@@ -254,7 +254,7 @@ private class dydxTakeProfitStopLossViewPresenter: HostedViewPresenter<dydxTakeP
     }
 
     private func update(market: PerpetualMarket, configsMap: [String: MarketConfigsAndAsset]) {
-        let configs = configsMap[market.assetId]
+        let configs = configsMap[market.id]
         viewModel?.oraclePrice = dydxFormatter.shared.dollar(number: market.oraclePrice?.doubleValue, digits: market.configs?.displayTickSizeDecimals?.intValue ?? 2)
         viewModel?.customAmountViewModel?.sliderTextInput.accessoryTitle = configs?.asset?.displayableAssetId
         viewModel?.customAmountViewModel?.sliderTextInput.minValue = market.configs?.minOrderSize?.doubleValue.magnitude ?? 0