File tree 2 files changed +18
-3
lines changed
2 files changed +18
-3
lines changed Original file line number Diff line number Diff line change @@ -40,6 +40,8 @@ Requires macOS 12.0 and higher. Further releases and feature requests may make t
40
40
- Refactor portions of the ` softwareupdate ` logic to reduce potential errors
41
41
- Fixed errors when moving to Swift 5.10
42
42
- Fixed wrong ` requiredInstallationDate ` calculations when using [ Non-Gregorian calendars] ( https://github.com/macadmins/nudge/issues/509 )
43
+ - Fixed UI logic when requiredInstallationDate is under an hour and ` allowLaterDeferralButton ` is set to false
44
+ - Issue [ 475] ( https://github.com/macadmins/nudge/issues/475 )
43
45
44
46
### Added
45
47
- To artificially change the ` requredInstallationDate ` thereby giving your users a default grace period for all Nudge events updates, please configure the ` nudgeEventLaunchDelay ` key under ` userExperience `
Original file line number Diff line number Diff line change @@ -14,8 +14,15 @@ struct QuitButtons: View {
14
14
var body : some View {
15
15
HStack {
16
16
if shouldShowSecondaryQuitButton {
17
- secondaryQuitButton
18
- . frame ( maxWidth: 215 , maxHeight: 30 )
17
+ if UserExperienceVariables . allowLaterDeferralButton {
18
+ secondaryQuitButton
19
+ . frame ( maxWidth: 215 , maxHeight: 30 )
20
+ } else {
21
+ if appState. secondsRemaining > 3600 {
22
+ secondaryQuitButton
23
+ . frame ( maxWidth: 215 , maxHeight: 30 )
24
+ }
25
+ }
19
26
Spacer ( )
20
27
}
21
28
if shouldShowPrimaryQuitButton {
@@ -76,7 +83,13 @@ struct QuitButtons: View {
76
83
private var primaryQuitButton : some View {
77
84
Group {
78
85
if UserExperienceVariables . allowUserQuitDeferrals {
79
- deferralMenu
86
+ if UserExperienceVariables . allowLaterDeferralButton {
87
+ deferralMenu
88
+ } else {
89
+ if appState. secondsRemaining > 3600 {
90
+ deferralMenu
91
+ }
92
+ }
80
93
} else {
81
94
standardQuitButton
82
95
}
You can’t perform that action at this time.
0 commit comments