add entry price and oracle price receipt area

dydxprotocol · Apr 1, 2024 · aa2ecfb · aa2ecfb
1 parent 8dd656d
commit aa2ecfb
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 15 deletions.
diff --git a/dydx/dydxPresenters/dydxPresenters/_Features/routing_swiftui.json b/dydx/dydxPresenters/dydxPresenters/_Features/routing_swiftui.json
@@ -303,7 +303,7 @@
                     "destination":"dydxPresenters.dydxClosePositionInputViewBuilder",
                     "presentation":"half"
                 },
-                "/trade/take_proft_stop_loss":{
+                "/trade/take_profit_stop_loss":{
                     "destination":"dydxPresenters.dydxTakeProfitStopLossViewBuilder",
                     "presentation":"half"
                 },

diff --git a/...Presenters/dydxPresenters/_v4/MarketInfo/Components/dydxMarketPositionViewPresenter.swift b/...Presenters/dydxPresenters/_v4/MarketInfo/Components/dydxMarketPositionViewPresenter.swift
@@ -32,7 +32,7 @@ class dydxMarketPositionViewPresenter: HostedViewPresenter<dydxMarketPositionVie
         #if DEBUG
         viewModel?.takeProfitStopLossAction = {[weak self] in
             if let assetId = self?.position?.assetId {
-                Router.shared?.navigate(to: RoutingRequest(path: "/trade/take_proft_stop_loss", params: ["marketId": "\(assetId)-USD"]), animated: true, completion: nil)
+                Router.shared?.navigate(to: RoutingRequest(path: "/trade/take_profit_stop_loss", params: ["marketId": "\(assetId)-USD"]), animated: true, completion: nil)
             }
         }
         #endif

diff --git a/...resenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift b/...resenters/dydxPresenters/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewPresenter.swift
@@ -14,6 +14,7 @@ import RoutingKit
 import Utilities
 import PlatformRouting
 import PanModal
+import Combine
 
 public class dydxTakeProfitStopLossViewBuilder: NSObject, ObjectBuilderProtocol {
     public func build<T>() -> T? {
@@ -25,8 +26,9 @@ public class dydxTakeProfitStopLossViewBuilder: NSObject, ObjectBuilderProtocol
 
 private class dydxTakeProfitStopLossViewController: HostingViewController<PlatformView, dydxTakeProfitStopLossViewModel> {
     override public func arrive(to request: RoutingRequest?, animated: Bool) -> Bool {
-        if request?.path == "/trade/take_proft_stop_loss", let marketId = parser.asString(request?.params?["marketId"]) {
+        if request?.path == "/trade/take_profit_stop_loss", let marketId = parser.asString(request?.params?["marketId"]), let presenter = presenter as? dydxTakeProfitStopLossViewPresenter {
             AbacusStateManager.shared.setMarket(market: marketId)
+            presenter.marketId = marketId
             return true
         }
         return false
@@ -38,6 +40,25 @@ private protocol dydxTakeProfitStopLossViewPresenterProtocol: HostedViewPresente
 }
 
 private class dydxTakeProfitStopLossViewPresenter: HostedViewPresenter<dydxTakeProfitStopLossViewModel>, dydxTakeProfitStopLossViewPresenterProtocol {
+    fileprivate var marketId: String?
+
+    override func start() {
+        super.start()
+
+        guard let marketId = marketId else { return }
+
+        Publishers
+            .CombineLatest(AbacusStateManager.shared.state.selectedSubaccountPositions,
+                            AbacusStateManager.shared.state.market(of: marketId))
+            .sink { [weak self] subaccountPositions, market in
+                let position = subaccountPositions.first { subaccountPosition in
+                    subaccountPosition.id == self?.marketId
+                }
+                self?.viewModel?.entryPrice = position?.entryPrice?.current?.doubleValue
+                self?.viewModel?.oraclePrice = market?.oraclePrice?.doubleValue
+            }
+            .store(in: &subscriptions)
+    }
 
     override init() {
         let viewModel = dydxTakeProfitStopLossViewModel()

diff --git a/dydx/dydxViews/dydxViews/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewModel.swift b/dydx/dydxViews/dydxViews/_v4/TakeProfitStopLoss/dydxTakeProfitStopLossViewModel.swift
@@ -9,32 +9,63 @@ import PlatformUI
 import SwiftUI
 import Utilities
 import Introspect
+import dydxFormatter
 
 public class dydxTakeProfitStopLossViewModel: PlatformViewModel {
 
+    @Published public var entryPrice: Double?
+    @Published public var oraclePrice: Double?
+
     public init() {}
 
     public static var previewValue: dydxTakeProfitStopLossViewModel {
         let vm = dydxTakeProfitStopLossViewModel()
         return vm
     }
 
+    private func createHeader() -> some View {
+        VStack(alignment: .leading, spacing: 6) {
+            Text(localizerPathKey: "APP.TRIGGERS_MODAL.PRICE_TRIGGERS")
+                .themeFont(fontType: .plus, fontSize: .larger)
+                .themeColor(foreground: .textPrimary)
+                .frame(maxWidth: .infinity, alignment: .leading)
+            Text(localizerPathKey: "APP.TRIGGERS_MODAL.PRICE_TRIGGERS_DESCRIPTION")
+                .themeFont(fontType: .base, fontSize: .small)
+                .themeColor(foreground: .textTertiary)
+                .frame(maxWidth: .infinity, alignment: .leading)
+        }
+        .frame(maxWidth: .infinity)
+    }
+
+    private func createReceipt() -> some View {
+        VStack(spacing: 12) {
+            createReceiptLine(titleLocalizerPathKey: "APP.TRIGGERS_MODAL.AVG_ENTRY_PRICE", dollarValue: entryPrice)
+            createReceiptLine(titleLocalizerPathKey: "APP.TRADE.ORACLE_PRICE", dollarValue: oraclePrice)
+        }
+        .padding(.all, 12)
+        .themeColor(background: .layer2)
+        .clipShape(.rect(cornerRadius: 8))
+    }
+
+    private func createReceiptLine(titleLocalizerPathKey: String, dollarValue: Double?) -> some View {
+        HStack(alignment: .center, spacing: 0) {
+            Text(localizerPathKey: titleLocalizerPathKey)
+                .themeFont(fontType: .base, fontSize: .small)
+                .themeColor(foreground: .textTertiary)
+            Spacer()
+            Text(dydxFormatter.shared.dollar(number: dollarValue, digits: 2) ?? "")
+                .themeFont(fontType: .number, fontSize: .small)
+                .themeColor(foreground: .textPrimary)
+        }
+    }
+
     override public func createView(parentStyle: ThemeStyle = ThemeStyle.defaultStyle, styleKey: String? = nil) -> PlatformUI.PlatformView {
         PlatformView(viewModel: self, parentStyle: parentStyle, styleKey: styleKey) { [weak self] _ in
             guard let self = self else { return AnyView(PlatformView.nilView) }
 
-            let view = VStack {
-                VStack(alignment: .leading, spacing: 6) {
-                    Text(localizerPathKey: "APP.TRIGGERS_MODAL.PRICE_TRIGGERS")
-                        .themeFont(fontType: .plus, fontSize: .larger)
-                        .themeColor(foreground: .textPrimary)
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                    Text(localizerPathKey: "APP.TRIGGERS_MODAL.PRICE_TRIGGERS_DESCRIPTION")
-                        .themeFont(fontType: .base, fontSize: .small)
-                        .themeColor(foreground: .textTertiary)
-                        .frame(maxWidth: .infinity, alignment: .leading)
-                }
-                .frame(maxWidth: .infinity)
+            let view = VStack(spacing: 18) {
+                self.createHeader()
+                self.createReceipt()
                 HStack(alignment: .center, spacing: 8) {
                     Text(localizerPathKey: "APP.GENERAL.ADVANCED")
                     Rectangle()