Skip to content

Commit

Permalink
Bump Abacus (#166)
Browse files Browse the repository at this point in the history
  • Loading branch information
ruixhuang authored and mike-dydx committed Aug 20, 2024
1 parent 4bb397e commit 31477db
Show file tree
Hide file tree
Showing 11 changed files with 84 additions and 85 deletions.
4 changes: 2 additions & 2 deletions dydx/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- Abacus (1.7.10)
- Abacus (1.7.13)
- Amplitude-iOS (4.10.0)
- AppsFlyerFramework (6.14.3):
- AppsFlyerFramework/Main (= 6.14.3)
Expand Down Expand Up @@ -386,7 +386,7 @@ CHECKOUT OPTIONS:
:git: https://github.com/dydxprotocol/Charts.git

SPEC CHECKSUMS:
Abacus: bcf76cf80ac1a71d0150ad62719c94fffcf2a7b2
Abacus: 3904e8e0e60b6d8c37a1564f1fddf25cfe9eaed0
Amplitude-iOS: 7d8cdc3408ba35c2e68368fc7c692cd104606b94
AppsFlyerFramework: 0a68f5b72bbbadfa71d4ae3eaf040e82d62e8518
Atributika: ecedf5259e4aa3c6278d840b6c18d60c1a8b6ca0
Expand Down
6 changes: 3 additions & 3 deletions dydx/Pods/Local Podspecs/abacus.podspec.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dydx/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

100 changes: 50 additions & 50 deletions dydx/Pods/Pods.xcodeproj/project.pbxproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ class dydxMarketPositionViewPresenter: HostedViewPresenter<dydxMarketPositionVie

viewModel?.unrealizedPNLAmount = sharedOrderViewModel.unrealizedPnl
viewModel?.unrealizedPNLPercent = sharedOrderViewModel.unrealizedPnlPercent
viewModel?.realizedPNLAmount = SignedAmountViewModel(amount: position.realizedPnl?.current?.doubleValue, displayType: .dollar, coloringOption: .allText)
viewModel?.liquidationPrice = dydxFormatter.shared.dollar(number: position.liquidationPrice?.current?.doubleValue, digits: configs.displayTickSizeDecimals?.intValue ?? 0)
viewModel?.realizedPNLAmount = SignedAmountViewModel(amount: position.realizedPnl.current?.doubleValue, displayType: .dollar, coloringOption: .allText)
viewModel?.liquidationPrice = dydxFormatter.shared.dollar(number: position.liquidationPrice.current?.doubleValue, digits: configs.displayTickSizeDecimals?.intValue ?? 0)

viewModel?.leverage = sharedOrderViewModel.leverage
viewModel?.leverageIcon = sharedOrderViewModel.leverageIcon
Expand All @@ -71,9 +71,9 @@ class dydxMarketPositionViewPresenter: HostedViewPresenter<dydxMarketPositionVie
viewModel?.logoUrl = sharedOrderViewModel.logoUrl
viewModel?.gradientType = sharedOrderViewModel.gradientType

viewModel?.amount = dydxFormatter.shared.dollar(number: position.valueTotal?.current?.doubleValue, digits: 2)
viewModel?.amount = dydxFormatter.shared.dollar(number: position.valueTotal.current?.doubleValue, digits: 2)

viewModel?.openPrice = dydxFormatter.shared.dollar(number: position.entryPrice?.current?.doubleValue, digits: configs.displayTickSizeDecimals?.intValue ?? 0)
viewModel?.openPrice = dydxFormatter.shared.dollar(number: position.entryPrice.current?.doubleValue, digits: configs.displayTickSizeDecimals?.intValue ?? 0)
viewModel?.closePrice = dydxFormatter.shared.dollar(number: position.exitPrice?.doubleValue, digits: configs.displayTickSizeDecimals?.intValue ?? 0)

viewModel?.funding = SignedAmountViewModel(amount: position.netFunding?.doubleValue, displayType: .dollar, coloringOption: .allText)
Expand Down Expand Up @@ -110,7 +110,7 @@ class dydxMarketPositionViewPresenter: HostedViewPresenter<dydxMarketPositionVie
triggerSide: .takeProfit,
triggerPriceText: DataLocalizer.shared?.localize(path: "APP.TRADE.MULTIPLE_ARROW", params: nil),
action: routeToOrdersAction)
} else if let takeProfitOrder = takeProfitOrders.first, let positionSize = position.size?.current?.doubleValue.magnitude {
} else if let takeProfitOrder = takeProfitOrders.first, let positionSize = position.size.current?.doubleValue.magnitude {
let orderSize = takeProfitOrder.size.magnitude
viewModel?.takeProfitStatusViewModel = .init(
triggerSide: .takeProfit,
Expand All @@ -129,7 +129,7 @@ class dydxMarketPositionViewPresenter: HostedViewPresenter<dydxMarketPositionVie
triggerSide: .stopLoss,
triggerPriceText: DataLocalizer.shared?.localize(path: "APP.TRADE.MULTIPLE_ARROW", params: nil),
action: routeToOrdersAction)
} else if let stopLossOrder = stopLossOrders.first, let positionSize = position.size?.current?.doubleValue.magnitude {
} else if let stopLossOrder = stopLossOrders.first, let positionSize = position.size.current?.doubleValue.magnitude {
let orderSize = stopLossOrder.size.magnitude
viewModel?.stopLossStatusViewModel = .init(
triggerSide: .stopLoss,
Expand Down
Loading

0 comments on commit 31477db

Please sign in to comment.