fix: Fix time formatting

bastiaanv · Sep 30, 2024 · 54d7fe2 · 54d7fe2
1 parent e858bfd
commit 54d7fe2
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Dependencies/DanaKit/DanaKitUI/ViewModels/DanaKitSettingsViewModel.swift b/Dependencies/DanaKit/DanaKitUI/ViewModels/DanaKitSettingsViewModel.swift
@@ -374,10 +374,12 @@ class DanaKitSettingsViewModel : ObservableObject {
     }
 
     private func formatDateToDayHour(_ date: Date) -> String {
-        let day = String(format: "%.0f", floor(-date.timeIntervalSinceNow / .days(1)))
-        let hour = String(format: "%.0f", (-date.timeIntervalSinceNow.truncatingRemainder(dividingBy: .days(1))) / .hours(1))
+        let components = Calendar.current.dateComponents([.day, .hour, .minute, .second], from: date, to: Date.now)
+        if let days = components.day, let hours = components.hour {
+            return "\(days)d \(hours)h"
+        }
 
-        return "\(day)d \(hour)h"
+        return "?d ?h"
     }
 }