Remove relative dates

Author: golson

WMFComponents/Sources/WMFComponents/Components/Developer Settings/WMFDeveloperSettingsViewModel.swift

@@ -45,7 +45,6 @@ import WMFData
         let enableYiRVLoginExperimentControl = WMFFormItemSelectViewModel(title: "Force Year in Review Login Experiment Control", isSelected: WMFDeveloperSettingsDataController.shared.enableYiRLoginExperimentControl)
         let enableYiRVLoginExperimentB = WMFFormItemSelectViewModel(title: "Force Year in Review Login Experiment B", isSelected: WMFDeveloperSettingsDataController.shared.enableYiRLoginExperimentB)
         let forceHcaptchaChallenge = WMFFormItemSelectViewModel(title: "Force hCaptcha Challenge", isSelected: WMFDeveloperSettingsDataController.shared.forceHCaptchaChallenge)
-        let readingChallengeDatesRelativeToToday = WMFFormItemSelectViewModel(title: "Reading Challenge: Use Relative Dates", isSelected: WMFDeveloperSettingsDataController.shared.readingChallengeDatesRelativeToToday)
         let rcForceEnabled = WMFFormItemSelectViewModel(title: "Force Reading Challenge State: ON", isSelected: WMFDeveloperSettingsDataController.shared.devForceReadingChallengeEnabled)
 
         // Reading Challenge force state (exclusive)
@@ -70,7 +69,6 @@ import WMFData
                 enableYiRVLoginExperimentControl,
                 enableYiRVLoginExperimentB,
                 forceHcaptchaChallenge,
-                readingChallengeDatesRelativeToToday,
                 rcForceEnabled
             ], selectType: .multi),
             WMFFormSectionSelectViewModel(header: "Force Reading Challenge State", items: [
@@ -121,10 +119,6 @@ import WMFData
         forceHcaptchaChallenge.$isSelected
             .sink { isSelected in WMFDeveloperSettingsDataController.shared.forceHCaptchaChallenge = isSelected }
             .store(in: &subscribers)
-        
-        readingChallengeDatesRelativeToToday.$isSelected
-            .sink { isSelected in WMFDeveloperSettingsDataController.shared.readingChallengeDatesRelativeToToday = isSelected }
-            .store(in: &subscribers)
 
         rcForceEnabled.$isSelected
             .sink { isSelected in WMFDeveloperSettingsDataController.shared.devForceReadingChallengeEnabled = isSelected }

WMFData/Sources/WMFData/Data Controllers/Activity Tab/WMFActivityTabDataController.swift

@@ -276,11 +276,6 @@ public actor WMFActivityTabDataController {
         hasEnrolledInReadingChallenge2026 = value
     }
     public func shouldShowReadingChallengeAnnouncement(isLoggedIn: Bool) -> Bool {
-        // Developer override: always show when relative dates flag is enabled (for testing, except after having seen)
-        if WMFDeveloperSettingsDataController.shared.readingChallengeDatesRelativeToToday {
-            guard !hasSeenFullPageReadingChallengeAnnouncement2026 else { return false }
-            return isLoggedIn && !hasEnrolledInReadingChallenge2026
-        }
         guard isLoggedIn else { return false }
         guard !hasEnrolledInReadingChallenge2026 else { return false }
         guard !hasSeenFullPageReadingChallengeAnnouncement2026 else { return false }
@@ -638,3 +633,4 @@ extension TimelineItem {
         )
     }
 }
+

WMFData/Sources/WMFData/Data Controllers/Developer Settings/WMFDeveloperSettingsDataController.swift

@@ -7,7 +7,6 @@ public protocol WMFDeveloperSettingsDataControlling: AnyObject {
     var showYiRV3: Bool { get }
     var enableYiRLoginExperimentControl: Bool { get }
     var enableYiRLoginExperimentB: Bool { get }
-    var readingChallengeDatesRelativeToToday: Bool { get }
     var devForceReadingChallengeEnabled: Bool { get set }
     var devForceReadingChallengeStreakCount: Int { get set }
     var devForceReadingChallengeCompletedFullStreak: Bool { get set }
@@ -101,11 +100,6 @@ public protocol WMFDeveloperSettingsDataControlling: AnyObject {
         set { try? userDefaultsStore?.save(key: WMFUserDefaultsKey.forceHCaptchaChallenge.rawValue, value: newValue) }
     }
 
-    public var readingChallengeDatesRelativeToToday: Bool {
-        get { (try? userDefaultsStore?.load(key: WMFUserDefaultsKey.developerSettingsReadingChallengeDatesRelativeToToday.rawValue)) ?? false }
-        set { try? userDefaultsStore?.save(key: WMFUserDefaultsKey.developerSettingsReadingChallengeDatesRelativeToToday.rawValue, value: newValue) }
-    }
-
     // MARK: - Reading Challenge Forced States
 
     private var sharedDefaults: UserDefaults? { UserDefaults(suiteName: "group.org.wikimedia.wikipedia") }

WMFData/Sources/WMFData/Models/Widget/ReadingChallengeState.swift

@@ -14,23 +14,14 @@ public enum ReadingChallengeState: Equatable {
 
 public enum ReadingChallengeStateConfig {
     public static var startDate: Date {
-        if WMFDeveloperSettingsDataController.shared.readingChallengeDatesRelativeToToday {
-            return Calendar.current.date(byAdding: .day, value: -5, to: Date()) ?? Date()
-        }
         return DateComponents(calendar: .current, year: 2026, month: 5, day: 1).date
             ?? Date(timeIntervalSince1970: 1777593600)
     }
     public static var endDate: Date {
-        if WMFDeveloperSettingsDataController.shared.readingChallengeDatesRelativeToToday {
-            return Calendar.current.date(byAdding: .day, value: 20, to: Date()) ?? Date()
-        }
         return DateComponents(calendar: .current, year: 2026, month: 5, day: 31, hour: 23, minute: 59, second: 59).date
             ?? Date(timeIntervalSince1970: 1780271999)
     }
     public static var removeDate: Date {
-        if WMFDeveloperSettingsDataController.shared.readingChallengeDatesRelativeToToday {
-            return Calendar.current.date(byAdding: .day, value: 50, to: Date()) ?? Date()
-        }
         return DateComponents(calendar: .current, year: 2026, month: 7, day: 10).date
             ?? Date(timeIntervalSince1970: 1783987200)
     }

WMFData/Sources/WMFData/Store/WMFUserDefaultsKey.swift

@@ -44,7 +44,6 @@ public enum WMFUserDefaultsKey: String {
     case hasEnrolledInReadingChallenge2026 = "has-enrolled-in-reading-challenge-2026"
     case hasSeenFullPageReadingChallengeAnnouncement2026 = "has-seen-full-page-reading-challenge-announcement-2026"
     case hasSeenWidgetReadingChallengeAnnouncement2026 = "has-seen-widget-reading-challenge-announcement-2026"
-    case developerSettingsReadingChallengeDatesRelativeToToday = "dev-settings-reading-challenge-dates-relative-to-today"
     case devForceReadingChallengeCompletedFullStreak = "dev-force-reading-challenge-completed-full-streak"
     case devForceReadingChallengeCompletedIncompleteStreak = "dev-force-reading-challenge-completed-incomplete-streak"
     case devForceReadingChallengeCompletedNoStreak = "dev-force-reading-challenge-completed-no-streak"