Group workflow package environment values into WorkflowPackageContext

Replaces the two separate workflowContextPackage and workflowOnPackageSelected
environment keys with a single WorkflowPackageContext struct. The struct also
includes a fallbackPackage field so the upcoming singleStepFallbackId PR can
populate it rather than adding a fourth key.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: facumenzella

RevenueCatUI/Modifiers/EnvironmentValues+Workflow.swift

@@ -28,6 +28,23 @@ struct WorkflowPageTransitionContext {
 
 }
 
+/// Package-related state injected by `WorkflowPaywallView` into each `PaywallsV2View` page.
+@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
+struct WorkflowPackageContext {
+
+    /// Package selected on the previous workflow step, forwarded to the current step as its
+    /// initial selection (forward-only — back navigation does not set this).
+    var contextPackage: Package?
+
+    /// Default package from the workflow's `singleStepFallbackId` step, used by packageless
+    /// screens to resolve price/period template variables.
+    var fallbackPackage: Package?
+
+    /// Called when the user's selected package changes inside a workflow paywall step.
+    var onPackageSelected: ((Package?) -> Void)?
+
+}
+
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
 private struct WorkflowTriggerActionKey: EnvironmentKey {
     static let defaultValue: ((String) -> Bool)? = nil
@@ -45,15 +62,8 @@ private struct IsWorkflowHeaderKey: EnvironmentKey {
 }
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-private struct WorkflowContextPackageKey: EnvironmentKey {
-    /// Package selected on the previous workflow step, forwarded to the current step's initial selection.
-    static let defaultValue: Package? = nil
-}
-
-@available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
-private struct WorkflowOnPackageSelectedKey: EnvironmentKey {
-    /// Called when the user's selected package changes inside a workflow paywall step.
-    static let defaultValue: ((Package?) -> Void)? = nil
+private struct WorkflowPackageContextKey: EnvironmentKey {
+    static let defaultValue = WorkflowPackageContext()
 }
 
 @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
@@ -76,14 +86,9 @@ extension EnvironmentValues {
         set { self[IsWorkflowHeaderKey.self] = newValue }
     }
 
-    var workflowContextPackage: Package? {
-        get { self[WorkflowContextPackageKey.self] }
-        set { self[WorkflowContextPackageKey.self] = newValue }
-    }
-
-    var workflowOnPackageSelected: ((Package?) -> Void)? {
-        get { self[WorkflowOnPackageSelectedKey.self] }
-        set { self[WorkflowOnPackageSelectedKey.self] = newValue }
+    var workflowPackageContext: WorkflowPackageContext {
+        get { self[WorkflowPackageContextKey.self] }
+        set { self[WorkflowPackageContextKey.self] = newValue }
     }
 }
 

RevenueCatUI/Templates/V2/PaywallsV2View.swift

@@ -48,11 +48,8 @@ struct PaywallsV2View: View {
     @Environment(\.paywallSource)
     private var paywallSource
 
-    @Environment(\.workflowContextPackage)
-    private var workflowContextPackage
-
-    @Environment(\.workflowOnPackageSelected)
-    private var workflowOnPackageSelected
+    @Environment(\.workflowPackageContext)
+    private var workflowPackageContext
 
     @StateObject
     private var introOfferEligibilityContext: IntroOfferEligibilityContext
@@ -299,16 +296,16 @@ struct PaywallsV2View: View {
 
                 self.dismissAfterPurchaseCompletionCallbacks()
             }
-            .task(id: self.workflowContextPackage?.identifier) {
+            .task(id: self.workflowPackageContext.contextPackage?.identifier) {
                 guard case let .success(paywallState) = self.paywallStateManager.state,
                       let resolved = Self.validatedContextPackage(
-                          self.workflowContextPackage,
+                          self.workflowPackageContext.contextPackage,
                           in: paywallState.packages
                       ) else { return }
                 self.selectedPackageContext.package = resolved
             }
             .onReceive(selectedPackageContext.$package) { package in
-                self.workflowOnPackageSelected?(package)
+                self.workflowPackageContext.onPackageSelected?(package)
             }
 
     }

RevenueCatUI/Templates/V2/WorkflowPaywallView.swift

@@ -255,11 +255,13 @@ struct WorkflowPaywallView: View {
             colorScheme: self.colorScheme,
             promoOfferCache: self.promoOfferCache
         )
-        .environment(\.workflowContextPackage, page.contextPackage)
-        .environment(\.workflowOnPackageSelected, { package in
-            guard let package else { return }
-            self.currentSelectedPackage = package
-        })
+        .environment(\.workflowPackageContext, WorkflowPackageContext(
+            contextPackage: page.contextPackage,
+            onPackageSelected: { package in
+                guard let package else { return }
+                self.currentSelectedPackage = package
+            }
+        ))
         .environment(\.workflowTriggerAction, { componentId in
             return self.handleTriggeredNavigation(componentId: componentId)
         })