Show saved plans on dashboard

Author: adarshaacharya

Sources/SajiloApp/Core/Planner/DashboardUpNext.swift

@@ -38,12 +38,12 @@ struct DashboardUpNext: Equatable, Sendable {
             return Self(kind: .plan(upcomingPlan), todayFestival: todayFestival, destination: .today)
         }
 
-        if let todayFestival {
-            return Self(kind: .festival(todayFestival), todayFestival: todayFestival, destination: .today)
+        if let untimedPlan = DayPlan.ordered(plans).first(where: { $0.time == nil }) {
+            return Self(kind: .plan(untimedPlan), todayFestival: todayFestival, destination: .today)
         }
 
-        if let untimedPlan = DayPlan.ordered(plans).first(where: { $0.time == nil }) {
-            return Self(kind: .plan(untimedPlan), todayFestival: nil, destination: .today)
+        if let todayFestival {
+            return Self(kind: .festival(todayFestival), todayFestival: todayFestival, destination: .today)
         }
 
         if let nextFestival {

Tests/SajiloAppTests/DashboardUpNextTests.swift

@@ -55,6 +55,17 @@ struct DashboardUpNextTests {
         #expect(summary?.destination == .today)
     }
 
+    @Test func usesAnUntimedPlanBeforeAFestivalToday() {
+        let plan = DayPlan(date: NepaliDate(year: 2083, month: 4, day: 31), title: "Call home")
+        let festival = event(name: "नाग पञ्चमी", daysAway: 0)
+
+        let summary = DashboardUpNext.make(plans: [plan], events: [festival], now: now)
+
+        #expect(summary?.kind == .plan(plan))
+        #expect(summary?.todayFestival == festival)
+        #expect(summary?.destination == .today)
+    }
+
     private func event(name: String, daysAway: Int) -> UpcomingEvent {
         UpcomingEvent(
             date: NepaliDate(year: 2083, month: 4, day: 31),