Skip to content

Commit baf2956

Browse files
committed
Moves data formatting to presenter
1 parent b205747 commit baf2956

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

ios/dydx/dydxPresenters/dydxPresenters/_v4/Portfolio/Components/dydxPortfolioFillsViewPresenter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class dydxPortfolioFillsViewPresenter: HostedViewPresenter<dydxPortfolioFillsVie
8080
item.type = DataLocalizer.localize(path: fill.resources.typeStringKey ?? "-")
8181
item.size = dydxFormatter.shared.localFormatted(number: fill.size, digits: configs.displayStepSizeDecimals?.intValue ?? 1)
8282
item.token?.symbol = asset.displayableAssetId
83-
item.date = Date(milliseconds: fill.createdAtMilliseconds)
83+
item.date = Date(milliseconds: fill.createdAtMilliseconds).englishDatetimeString
8484
if let tickSize = configs.displayTickSizeDecimals?.intValue {
8585
item.price = dydxFormatter.shared.dollar(number: fill.price, digits: tickSize)
8686
item.fee = dydxFormatter.shared.dollar(number: fill.fee, digits: tickSize)

ios/dydx/dydxPresenters/dydxPresenters/_v4/Portfolio/Components/dydxPortfolioFundingViewPresenter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class dydxPortfolioFundingViewPresenter: HostedViewPresenter<dydxPortfolioFundin
6868
let item = cache[funding] ?? dydxPortfolioFundingItemViewModel()
6969
cache[funding] = item
7070

71-
item.time = Date(milliseconds: funding.createdAtMilliseconds)
71+
item.time = Date(milliseconds: funding.createdAtMilliseconds).englishDatetimeString
7272
let amount = dydxFormatter.shared.dollar(number: abs(funding.payment), size: "0.0001")
7373
if funding.payment >= 0.0 {
7474
item.amount = SignedAmountViewModel(text: amount, sign: .plus, coloringOption: .signOnly)

ios/dydx/dydxPresenters/dydxPresenters/_v4/Trade/TradeStatus/dydxTradeStatusViewBuilder.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ private class dydxTradeStatusViewPresenter: HostedViewPresenter<dydxTradeStatusV
171171
viewModel?.orderViewModel.size = dydxFormatter.shared.localFormatted(number: lastOrder.size, digits: configs.stepSizeDecimals?.intValue ?? 1)
172172
viewModel?.orderViewModel.token?.symbol = asset.displayableAssetId
173173
if let createdAt = lastOrder.createdAtMilliseconds?.uint64Value {
174-
viewModel?.orderViewModel.date = Date(milliseconds: createdAt)
174+
viewModel?.orderViewModel.date = Date(milliseconds: createdAt).englishDatetimeString
175175
}
176176
if let tickSize = configs.tickSizeDecimals?.intValue {
177177
viewModel?.orderViewModel.price = dydxFormatter.shared.dollar(number: lastOrder.price, digits: tickSize)
@@ -205,7 +205,7 @@ private class dydxTradeStatusViewPresenter: HostedViewPresenter<dydxTradeStatusV
205205
viewModel?.orderViewModel.token?.symbol = token
206206
}
207207

208-
viewModel?.orderViewModel.date = submissionDate
208+
viewModel?.orderViewModel.date = submissionDate?.englishDatetimeString
209209
if let tickSize = configs?.tickSizeDecimals?.intValue {
210210
if let price = tradeInput.summary?.price {
211211
viewModel?.orderViewModel.price = dydxFormatter.shared.dollar(number: price, digits: tickSize)
@@ -239,7 +239,7 @@ private class dydxTradeStatusViewPresenter: HostedViewPresenter<dydxTradeStatusV
239239
if let token = asset?.displayableAssetId ?? configsAndAsset?.assetId {
240240
viewModel?.orderViewModel.token?.symbol = token
241241
}
242-
viewModel?.orderViewModel.date = submissionDate
242+
viewModel?.orderViewModel.date = submissionDate?.englishDatetimeString
243243
if let tickSize = configs?.tickSizeDecimals?.intValue {
244244
viewModel?.orderViewModel.price = dydxFormatter.shared.dollar(number: closePositionInput.summary?.price, digits: tickSize)
245245
viewModel?.orderViewModel.fee = dydxFormatter.shared.dollar(number: closePositionInput.summary?.fee, digits: tickSize)

ios/dydx/dydxViews/dydxViews/_v4/Portfolio/Components/Sections/dydxPortfolioFundingView.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public enum FundingStatus {
4444

4545
public class dydxPortfolioFundingItemViewModel: PlatformViewModel {
4646

47-
public init(amount: SignedAmountViewModel? = nil, rate: SignedAmountViewModel? = nil, time: Date? = nil, sideText: SideTextViewModel = SideTextViewModel(), status: FundingStatus = .paid, position: String? = nil, token: TokenTextViewModel? = TokenTextViewModel(), logoUrl: URL? = nil, onTapAction: (() -> Void)? = nil) {
47+
public init(amount: SignedAmountViewModel? = nil, rate: SignedAmountViewModel? = nil, time: String? = nil, sideText: SideTextViewModel = SideTextViewModel(), status: FundingStatus = .paid, position: String? = nil, token: TokenTextViewModel? = TokenTextViewModel(), logoUrl: URL? = nil, onTapAction: (() -> Void)? = nil) {
4848
self.amount = amount
4949
self.rate = rate
5050
self.time = time
@@ -58,7 +58,7 @@ public class dydxPortfolioFundingItemViewModel: PlatformViewModel {
5858

5959
public var amount: SignedAmountViewModel?
6060
public var rate: SignedAmountViewModel?
61-
public var time: Date?
61+
public var time: String?
6262
public var sideText = SideTextViewModel()
6363
public var status: FundingStatus = .paid
6464
public var position: String?
@@ -69,7 +69,7 @@ public class dydxPortfolioFundingItemViewModel: PlatformViewModel {
6969
public static var previewValue: dydxPortfolioFundingItemViewModel {
7070
let item = dydxPortfolioFundingItemViewModel(amount: .previewValue,
7171
rate: .previewValue,
72-
time: Date(),
72+
time: Date().englishDatetimeString,
7373
sideText: .previewValue,
7474
status: .paid,
7575
position: "$2300.0",
@@ -120,7 +120,7 @@ public class dydxPortfolioFundingItemViewModel: PlatformViewModel {
120120
.themeFont(fontSize: .medium)
121121
sideText.createView(parentStyle: parentStyle.themeFont(fontSize: .medium))
122122
}
123-
Text(time?.englishDatetimeString ?? "")
123+
Text(time ?? "")
124124
.themeColor(foreground: .textTertiary)
125125
.themeFont(fontSize: .smallest)
126126
}

ios/dydx/dydxViews/dydxViews/_v4/Portfolio/Shared/SharedFillView.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class SharedFillViewModel: PlatformViewModel {
2121
public var onTapAction: (() -> Void)?
2222
}
2323

24-
public init(type: String? = nil, amount: String? = nil, date: Date? = nil, price: String? = nil, fee: String? = nil, feeLiquidity: String? = nil, sideText: SideTextViewModel = SideTextViewModel(), token: TokenTextViewModel? = TokenTextViewModel(), logoUrl: URL? = nil, onTapAction: (() -> Void)? = nil) {
24+
public init(type: String? = nil, amount: String? = nil, date: String? = nil, price: String? = nil, fee: String? = nil, feeLiquidity: String? = nil, sideText: SideTextViewModel = SideTextViewModel(), token: TokenTextViewModel? = TokenTextViewModel(), logoUrl: URL? = nil, onTapAction: (() -> Void)? = nil) {
2525
self.type = type
2626
self.size = amount
2727
self.date = date
@@ -36,7 +36,7 @@ public class SharedFillViewModel: PlatformViewModel {
3636

3737
@Published public var type: String?
3838
@Published public var size: String?
39-
@Published public var date: Date?
39+
@Published public var date: String?
4040
@Published public var price: String?
4141
@Published public var fee: String?
4242
@Published public var feeLiquidity: String?
@@ -50,7 +50,7 @@ public class SharedFillViewModel: PlatformViewModel {
5050
public static var previewValue: SharedFillViewModel {
5151
let vm = SharedFillViewModel(type: "Market Order",
5252
amount: "0.017 ETH",
53-
date: Date(),
53+
date: Date().englishDatetimeString,
5454
price: "$1,203.8",
5555
fee: "$0.0",
5656
feeLiquidity: "Taker",
@@ -108,7 +108,7 @@ public class SharedFillViewModel: PlatformViewModel {
108108
.themeColor(foreground: .textPrimary)
109109
.themeFont(fontSize: .medium)
110110
}
111-
Text(date?.englishDatetimeString ?? "")
111+
Text(date ?? "")
112112
.themeColor(foreground: .textTertiary)
113113
.themeFont(fontSize: .smallest)
114114
}

0 commit comments

Comments
 (0)