fix logic in gracePeriodInstallDelay

Author: erikng

Nudge/UI/Defaults.swift

@@ -97,6 +97,7 @@ class AppState: ObservableObject {
     @Published var deferViewIsPresented = false
     @Published var additionalInfoViewIsPresented = false
     @Published var differentiateWithoutColor = NSWorkspace.shared.accessibilityDisplayShouldDifferentiateWithoutColor
+    @Published var hasUpdatedDueToDracePeriodInstallDelay = false
 }
 
 class DNDConfig {

Nudge/UI/Main.swift

@@ -239,6 +239,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {
                         requiredInstallationDate = selectedOS!.releaseDate?.addingTimeInterval(slaExtension) ?? DateManager().getCurrentDate().addingTimeInterval(TimeInterval(90 * 86400))
                         LogManager.notice("Extending requiredInstallationDate to \(requiredInstallationDate)", logger: sofaLog)
                     }
+                    if nudgePrimaryState.hasUpdatedDueToDracePeriodInstallDelay {
+                        requiredInstallationDate = requiredInstallationDate.addingTimeInterval(slaExtension)
+                        LogManager.notice("Extending requiredInstallationDate to \(requiredInstallationDate)", logger: sofaLog)
+                    }
                     LogManager.notice("SOFA Matched OS Version: \(selectedOS!.productVersion)", logger: sofaLog)
                     LogManager.notice("SOFA Assets: \(selectedOS!.supportedDevices)", logger: sofaLog)
                     LogManager.notice("SOFA CVEs: \(selectedOS!.cves)", logger: sofaLog)

Nudge/Utilities/Utils.swift

@@ -102,6 +102,7 @@ struct AppStateManager {
             if UserExperienceVariables.gracePeriodInstallDelay > gracePeriodPathCreationTimeInHours {
                 requiredInstallationDate = gracePeriodPathCreationDate.addingTimeInterval(Double(combinedGracePeriod) * 3600)
                 LogManager.notice("Device permitted for gracePeriods - setting date to: \(requiredInstallationDate)", logger: uiLog)
+                nudgePrimaryState.hasUpdatedDueToDracePeriodInstallDelay = true
                 return requiredInstallationDate
             }
         }