TRA-849, TRA-872, TRA-871, TRA-857: Vault polishing (#294)

dydxprotocol · Nov 11, 2024 · 91afede · 91afede
1 parent c078fa1
commit 91afede
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/dydx/dydxFormatter/dydxFormatter/dydxFormatter.swift b/dydx/dydxFormatter/dydxFormatter/dydxFormatter.swift
@@ -229,7 +229,7 @@ public final class dydxFormatter: NSObject, SingletonProtocol {
             let postfix = ["", "K", "M", "B", "T"]
             var value = number.decimalValue
             var index = 0
-            while value.magnitude > 1000.0 && index < (postfix.count - 1) {
+            while value.magnitude >= 1000.0 && index < (postfix.count - 1) {
                 value = value / 1000.0
                 index += 1
             }

diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/Vault/Landing/dydxVaultViewBuilder.swift b/dydx/dydxPresenters/dydxPresenters/_v4/Vault/Landing/dydxVaultViewBuilder.swift
@@ -140,9 +140,9 @@ private class dydxVaultViewBuilderPresenter: HostedViewPresenter<dydxVaultViewMo
                 }
 
                 // only create new view model instance if it does not already exist
-                let side: SideTextViewModel.Side
+                let side: SideTextViewModel.Side?
                 if positionSize == 0 {
-                    side = .none
+                    side = nil
                 } else if positionSize > 0 {
                     side = .long
                 } else {

diff --git a/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioChartView.swift b/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioChartView.swift
@@ -81,6 +81,7 @@ public class dydxPortfolioChartViewModel: PlatformViewModel {
                     HStack {
                         Text(equity)
                             .themeFont(fontSize: .larger)
+                            .themeColor(foreground: .textPrimary)
 
                         Spacer()
 

diff --git a/dydx/dydxViews/dydxViews/_v4/Vault/Landing/dydxVaultChartViewModel.swift b/dydx/dydxViews/dydxViews/_v4/Vault/Landing/dydxVaultChartViewModel.swift
@@ -134,7 +134,7 @@ private struct dydxVaultChartView: View {
         .chartXAxis(.hidden)
         .chartYAxis {
             AxisMarks(values: .automatic) {
-                let value = dydxFormatter.shared.condensedDollar(number: $0.as(Double.self))
+                let value = dydxFormatter.shared.condensedDollar(number: $0.as(Double.self), digits: 1)
                 AxisValueLabel {
                     if let value {
                         Text(value)

diff --git a/dydx/dydxViews/dydxViews/_v4/Vault/Landing/dydxVaultPositionView.swift b/dydx/dydxViews/dydxViews/_v4/Vault/Landing/dydxVaultPositionView.swift
@@ -20,7 +20,7 @@ public class dydxVaultPositionViewModel: PlatformViewModel {
     @Published public var displayId: String
     @Published public var symbol: String?
     @Published public var iconType: PlatformIconViewModel.IconType = .init(url: nil, placeholderText: nil)
-    @Published public var side: SideTextViewModel.Side
+    @Published public var side: SideTextViewModel.Side?
     @Published public var leverage: Double?
     @Published public var equity: Double
     @Published public var notionalValue: Double
@@ -31,8 +31,8 @@ public class dydxVaultPositionViewModel: PlatformViewModel {
     @Published public var sparklineValues: [Double]?
 
     fileprivate var sideLeverageAttributedText: AttributedString {
-        let attributedSideText = AttributedString(text: side.text, urlString: nil)
-            .themeColor(foreground: side.color)
+        let attributedSideText = AttributedString(text: side?.text ?? "-", urlString: nil)
+            .themeColor(foreground: side?.color ?? ThemeColor.SemanticColor.textTertiary)
         if let leverage = leverage {
             let leverageText = dydxFormatter.shared.leverage(number: leverage) ?? "--"
             let attributedLeverageText = AttributedString(text: " @ " + leverageText, urlString: nil)
@@ -46,8 +46,8 @@ public class dydxVaultPositionViewModel: PlatformViewModel {
     }
 
     fileprivate var notionalValueText: String {
-        let size = dydxFormatter.shared.condensedDollar(number: notionalValue, digits: 0) ?? "--"
-        let equity = dydxFormatter.shared.condensedDollar(number: equity, digits: 0) ?? "--"
+        let size = dydxFormatter.shared.condensedDollar(number: notionalValue, digits: 2) ?? "--"
+        let equity = dydxFormatter.shared.condensedDollar(number: equity, digits: 2) ?? "--"
         return "\(size) / \(equity)"
     }
 
@@ -76,7 +76,7 @@ public class dydxVaultPositionViewModel: PlatformViewModel {
         displayId: String,
         symbol: String?,
         iconType: PlatformIconViewModel.IconType,
-        side: SideTextViewModel.Side,
+        side: SideTextViewModel.Side?,
         leverage: Double?,
         equity: Double,
         notionalValue: Double,

diff --git a/dydx/dydxViews/dydxViews/_v4/Vault/Landing/dydxVaultViewModel.swift b/dydx/dydxViews/dydxViews/_v4/Vault/Landing/dydxVaultViewModel.swift
@@ -155,7 +155,7 @@ private struct dydxVaultView: View {
             Spacer(minLength: 4)
             Text(dydxFormatter.shared.dollar(number: viewModel.vaultBalance) ?? "--")
                 .themeColor(foreground: .textPrimary)
-                .themeFont(fontType: .base, fontSize: .large)
+                .themeFont(fontType: .base, fontSize: .larger)
         }
         .leftAligned()
         .padding(.horizontal, 16)
@@ -171,7 +171,7 @@ private struct dydxVaultView: View {
             Spacer(minLength: 4)
             Text(dydxFormatter.shared.dollar(number: viewModel.allTimeReturnUsdc) ?? "--")
                 .themeColor(foreground: viewModel.allTimeReturnUsdc == nil ? .textPrimary : ThemeSettings.directionalColor(forValue: viewModel.allTimeReturnUsdc))
-                .themeFont(fontType: .base, fontSize: .large)
+                .themeFont(fontType: .base, fontSize: .larger)
         }
         .leftAligned()
         .padding(.horizontal, 16)
@@ -196,7 +196,7 @@ private struct dydxVaultView: View {
                 .themeFont(fontType: .base, fontSize: .small)
             Text(dydxFormatter.shared.percent(number: viewModel.thirtyDayReturnPercent, digits: 0) ?? "")
                 .themeColor(foreground: ThemeSettings.directionalColor(forValue: viewModel.thirtyDayReturnPercent))
-                .themeFont(fontType: .base, fontSize: .large)
+                .themeFont(fontType: .base, fontSize: .larger)
         }
     }
 
@@ -207,7 +207,7 @@ private struct dydxVaultView: View {
                 .themeFont(fontType: .base, fontSize: .small)
             Text(dydxFormatter.shared.dollar(number: viewModel.totalValueLocked, digits: 0) ?? "")
                 .themeColor(foreground: .textPrimary)
-                .themeFont(fontType: .base, fontSize: .large)
+                .themeFont(fontType: .base, fontSize: .larger)
         }
     }