Pass along style config from MPE to FC

Author: mats-stripe

Example/FinancialConnections Example/FinancialConnections Example/Playground/PlaygroundViewModel.swift

@@ -647,6 +647,12 @@ private func PresentPaymentSheet(
     configuration.allowsDelayedPaymentMethods = true
     configuration.defaultBillingDetails.email = config.email
     configuration.defaultBillingDetails.phone = config.phone
+    
+    switch config.style {
+    case .automatic: configuration.style = .automatic
+    case .alwaysLight: configuration.style = .alwaysLight
+    case .alwaysDark: configuration.style = .alwaysDark
+    }
 
     let isUITest = (ProcessInfo.processInfo.environment["UITesting"] != nil)
     // disable app-to-app for UI tests

StripeCore/StripeCore/Source/Connections Bindings/ElementsSessionContext.swift

@@ -44,13 +44,22 @@ import Foundation
         }
     }
 
+    /// Intermediary object between `PaymentSheet.Configuration.UserInterfaceStyle`
+    /// and `FinancialConnectionsSheet.Configuration.UserInterfaceStyle`.
+    @_spi(STP) @frozen public enum StyleConfig {
+        case automatic
+        case alwaysLight
+        case alwaysDark
+    }
+
     @_spi(STP) public let amount: Int?
     @_spi(STP) public let currency: String?
     @_spi(STP) public let prefillDetails: PrefillDetails?
     @_spi(STP) public let intentId: IntentID?
     @_spi(STP) public let linkMode: LinkMode?
     @_spi(STP) public let billingDetails: BillingDetails?
     @_spi(STP) public let eligibleForIncentive: Bool
+    @_spi(STP) public let styleConfig: StyleConfig?
 
     @_spi(STP) public var billingAddress: BillingAddress? {
         BillingAddress(from: billingDetails)
@@ -70,7 +79,8 @@ import Foundation
         intentId: IntentID? = nil,
         linkMode: LinkMode? = nil,
         billingDetails: BillingDetails? = nil,
-        eligibleForIncentive: Bool = false
+        eligibleForIncentive: Bool = false,
+        styleConfig: StyleConfig? = nil
     ) {
         self.amount = amount
         self.currency = currency
@@ -79,6 +89,7 @@ import Foundation
         self.linkMode = linkMode
         self.billingDetails = billingDetails
         self.eligibleForIncentive = eligibleForIncentive
+        self.styleConfig = styleConfig
     }
 }
 

StripeFinancialConnections/StripeFinancialConnections/Source/FinancialConnectionsSDK/FinancialConnectionsSDKImplementation.swift

@@ -32,6 +32,16 @@ public class FinancialConnectionsSDKImplementation: FinancialConnectionsSDKInter
         financialConnectionsSheet.apiClient = apiClient
         financialConnectionsSheet.elementsSessionContext = elementsSessionContext
         financialConnectionsSheet.onEvent = onEvent
+        
+        var configuration = FinancialConnectionsSheet.Configuration()
+        if let styleConfig = elementsSessionContext?.styleConfig {
+            switch styleConfig {
+            case .automatic: configuration.style = .automatic
+            case .alwaysLight: configuration.style = .alwaysLight
+            case .alwaysDark: configuration.style = .alwaysDark
+            }
+        }
+        financialConnectionsSheet.configuration = configuration
         // Captures self explicitly until the callback is invoked
         financialConnectionsSheet.present(
             from: presentingViewController,

StripeFinancialConnections/StripeFinancialConnections/Source/FinancialConnectionsSheet.swift

@@ -50,8 +50,10 @@ final public class FinancialConnectionsSheet {
         @_spi(STP) @frozen public enum UserInterfaceStyle {
             /// (default) Financial Connections will automatically switch between light and dark mode compatible colors based on device settings.
             case automatic
+
             /// Financial Connections will always use colors appropriate for light mode UI.
             case alwaysLight
+
             /// Financial Connections will always use colors appropriate for dark mode UI.
             case alwaysDark
 

StripeFinancialConnections/StripeFinancialConnectionsTests/FinancialConnectionsSheetTests.swift

@@ -52,8 +52,9 @@ class FinancialConnectionsSheetTests: XCTestCase {
             apiClient: mockApiClient,
             analyticsClientV1: mockAnalyticsClient,
             clientSecret: "test",
-            elementsSessionContext: nil,
             returnURL: nil,
+            configuration: .init(),
+            elementsSessionContext: nil,
             publishableKey: "test",
             stripeAccount: nil
         )

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/Link/LinkPaymentController.swift

@@ -313,6 +313,14 @@ import UIKit
                 state: defaultBillingDetails.address.state
             )
         )
+        
+        let styleConfig: ElementsSessionContext.StyleConfig = {
+            switch configuration.style {
+            case .automatic: return .automatic
+            case .alwaysLight: return .alwaysLight
+            case .alwaysDark: return .alwaysDark
+            }
+        }()
 
         return ElementsSessionContext(
             amount: mode.amount,
@@ -321,7 +329,8 @@ import UIKit
             intentId: nil,
             linkMode: nil,
             billingDetails: billingDetails,
-            eligibleForIncentive: false
+            eligibleForIncentive: false,
+            styleConfig: styleConfig
         )
     }
 

StripePaymentSheet/StripePaymentSheet/Source/PaymentSheet/ViewControllers/PaymentMethodFormViewController.swift

@@ -264,6 +264,13 @@ extension PaymentMethodFormViewController {
         )
         let linkMode = elementsSession.linkSettings?.linkMode
         let billingDetails = instantDebitsFormElement?.billingDetails
+        let styleConfig: ElementsSessionContext.StyleConfig = {
+            switch configuration.style {
+            case .automatic: return .automatic
+            case .alwaysLight: return .alwaysLight
+            case .alwaysDark: return .alwaysDark
+            }
+        }()
 
         return ElementsSessionContext(
             amount: intent.amount,
@@ -272,7 +279,8 @@ extension PaymentMethodFormViewController {
             intentId: intentId,
             linkMode: linkMode,
             billingDetails: billingDetails,
-            eligibleForIncentive: instantDebitsFormElement?.incentive != nil
+            eligibleForIncentive: instantDebitsFormElement?.incentive != nil,
+            styleConfig: styleConfig
         )
     }