Fix overdue time showing when not supposed to

pakerwreah · Oct 13, 2024 · 0949b3e · 0949b3e
1 parent 9de7fa0
commit 0949b3e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Calendr/Events/EventList/EventViewModel.swift b/Calendr/Events/EventList/EventViewModel.swift
@@ -177,7 +177,7 @@ class EventViewModel {
         let isPast: Observable<Bool>
         let clock: Observable<Void>
 
-        if secondsToEnd > 0 {
+        if isTodaySelected, !event.isAllDay, secondsToEnd > 0, event.type != .reminder(completed: true) {
 
             isPast = Observable<Int>.timer(.seconds(secondsToEnd), scheduler: scheduler)
                 .map(true)
@@ -206,8 +206,10 @@ class EventViewModel {
             dateFormatter.unitsStyle = .abbreviated
             dateFormatter.allowedUnits = [.hour, .minute]
 
-            relativeDuration = clock.map {
-                Strings.Formatter.Date.Relative.ago(
+            relativeDuration = clock.compactMap {
+                guard event.start.distance(to: dateProvider.now) > 60 else { return nil }
+
+                return Strings.Formatter.Date.Relative.ago(
                     dateFormatter.string(from: event.start, to: dateProvider.now) ?? ""
                 )
             }