diff --git a/FuelBoard/BestValueIntroView.swift b/FuelBoard/BestValueIntroView.swift index b71a79f..a400ffc 100644 --- a/FuelBoard/BestValueIntroView.swift +++ b/FuelBoard/BestValueIntroView.swift @@ -17,12 +17,12 @@ import SwiftUI struct BestValueIntroContent: View { @Binding var settings: FuelSavingsSettings - /// What the host's primary button should say. Declining is a first-class - /// answer: "Not now" reads as a decision where "Continue" reads as a skip. - static func primaryTitle(for settings: FuelSavingsSettings) -> String { - settings.enabled - ? String(localized: "Continue", comment: "Best Value continue button") - : String(localized: "Not now", comment: "Best Value declined button") + /// What the host's primary button says. ONE label for both answers: the + /// toggle already shows whether Best Value is being switched on, so a + /// separate "Not now" for the declined case was second-guessing a choice the + /// user could see on screen. + static var primaryTitle: String { + String(localized: "Continue", comment: "Best Value continue button") } var body: some View { @@ -214,7 +214,7 @@ struct BestValueIntroView: View { VStack(spacing: 0) { BestValueIntroContent(settings: $settings) - OnboardingPrimaryButton(title: BestValueIntroContent.primaryTitle(for: settings), + OnboardingPrimaryButton(title: BestValueIntroContent.primaryTitle, action: finish) .padding(.horizontal, 20) .padding(.bottom, 24) diff --git a/FuelBoard/OnboardingView.swift b/FuelBoard/OnboardingView.swift index eb5bec1..8e51b43 100644 --- a/FuelBoard/OnboardingView.swift +++ b/FuelBoard/OnboardingView.swift @@ -286,11 +286,9 @@ struct OnboardingView: View { // No permission on this page — prices need none. Straight on. primaryButton(String(localized: "Continue", comment: "Onboarding continue button")) { page = 4 } case 4: - // Best Value: the button states the answer the toggle is showing, so - // declining reads as a decision rather than a skip. Either way the - // settings were saved when the toggle moved, so a swipe past this - // page keeps the choice. - primaryButton(BestValueIntroContent.primaryTitle(for: fuelSavings)) { page = 5 } + // Best Value: the settings were saved when the toggle moved, so a + // swipe past this page keeps the choice. + primaryButton(BestValueIntroContent.primaryTitle) { page = 5 } default: primaryButton(String(localized: "Start Using FuelBoard", comment: "Finish onboarding button")) { finish() } }