fix roundings

dydxprotocol · Oct 22, 2024 · 9c956e8 · 9c956e8
1 parent 1940f01
commit 9c956e8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 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 > 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
@@ -89,7 +89,7 @@ private class dydxVaultViewBuilderPresenter: HostedViewPresenter<dydxVaultViewMo
         viewModel?.totalValueLocked = vault?.details?.totalValue?.doubleValue
         viewModel?.thirtyDayReturnPercent = vault?.details?.thirtyDayReturnPercent?.doubleValue
         viewModel?.vaultBalance = vault?.account?.balanceUsdc?.doubleValue
-        viewModel?.allTimeReturnUsdc = vault?.account?.allTimeReturnUsdc?.doubleValue
+        viewModel?.allTimeReturnUsdc = vault?.account?.allTimeReturnUsdc?.doubleValue.round(to: 2)
 
         viewModel?.positions = vault?.positions?.positions?.map { (position) -> dydxVaultPositionViewModel? in
             guard let leverage = position.currentLeverageMultiple?.doubleValue,

diff --git a/dydx/dydxViews/dydxViews/_v4/Vault/Landing/dydxVaultPositionView.swift b/dydx/dydxViews/dydxViews/_v4/Vault/Landing/dydxVaultPositionView.swift
@@ -37,8 +37,8 @@ public class dydxVaultPositionViewModel: PlatformViewModel {
     }
 
     fileprivate var notionalValueText: String {
-        let size = dydxFormatter.shared.condensedDollar(number: notionalValue) ?? "--"
-        let equity = dydxFormatter.shared.condensedDollar(number: equity) ?? "--"
+        let size = dydxFormatter.shared.condensedDollar(number: notionalValue, digits: 0) ?? "--"
+        let equity = dydxFormatter.shared.condensedDollar(number: equity, digits: 0) ?? "--"
         return "\(size) / \(equity)"
     }
 
@@ -55,7 +55,7 @@ public class dydxVaultPositionViewModel: PlatformViewModel {
     }
 
     fileprivate var pnlAmountText: String {
-        dydxFormatter.shared.dollar(number: pnlAmount, digits: 0) ?? "--"
+        dydxFormatter.shared.condensedDollar(number: pnlAmount, digits: 2) ?? "--"
     }
 
     fileprivate var pnlPercentageText: String {