format good til as a time. do "-" if created at is unavailable

dydxprotocol · Nov 7, 2023 · 57d9cff · 57d9cff
1 parent de2ae90
commit 57d9cff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/dydx/dydxFormatter/dydxFormatter/dydxFormatter.swift b/dydx/dydxFormatter/dydxFormatter/dydxFormatter.swift
@@ -571,6 +571,9 @@ public final class dydxFormatter: NSObject, SingletonProtocol {
         }
     }
 
+    /// returns a formatted date in the form `M/D/YY, H:MM PM/AM`
+    ///
+    /// e.g. `12/5/23, 6:02 PM`
     public func dateAndTime(date: Date?) -> String? {
         if let date = date {
             return datetimeFormatter.string(from: date)

diff --git a/dydx/dydxPresenters/dydxPresenters/_v4/OrderDetails/dydxOrderDetailsViewBuilder.swift b/dydx/dydxPresenters/dydxPresenters/_v4/OrderDetails/dydxOrderDetailsViewBuilder.swift
@@ -132,19 +132,21 @@ private class dydxOrderDetailsViewPresenter: HostedViewPresenter<dydxOrderDetail
         }
 
         var timePlaced: dydxOrderDetailsViewModel.Item? {
+            let itemValue: dydxOrderDetailsViewModel.Item.ItemValue?
             if let createdAtMilliseconds = order.createdAtMilliseconds?.doubleValue {
-                let text = dydxFormatter.shared.dateAndTime(date: Date(milliseconds: createdAtMilliseconds))
-                return dydxOrderDetailsViewModel.Item(title: DataLocalizer.localize(path: "APP.TRADE.PLACED"),
-                                                      value: .string(text))
+                itemValue = .string(dydxFormatter.shared.dateAndTime(date: Date(milliseconds: createdAtMilliseconds)))
+            } else {
+                itemValue = .none
             }
-            return nil
+            return dydxOrderDetailsViewModel.Item(title: DataLocalizer.localize(path: "APP.GENERAL.CREATED_AT"),
+                                                  value: itemValue)
         }
 
         var goodTil: dydxOrderDetailsViewModel.Item? {
             if order.timeInForce == .gtt,
                let expiresAtMilliseconds = order.expiresAtMilliseconds?.doubleValue {
-                let text = dydxFormatter.shared.interval(time: Date(milliseconds: expiresAtMilliseconds))
-                return dydxOrderDetailsViewModel.Item(title: DataLocalizer.localize(path: "APP.TRADE.GOOD_TIL"),
+                let text = dydxFormatter.shared.dateAndTime(date: Date(milliseconds: expiresAtMilliseconds))
+                return dydxOrderDetailsViewModel.Item(title: DataLocalizer.localize(path: "APP.TRADE.GOOD_TIL_TIME"),
                                                       value: .string(text))
             }
             return nil