Remove all direct ApiConfiguration.State DI injections

tjclawson-stripe · claude · tjclawson-stripe · commit 8c7135dda895 · 2026-08-04T14:25:13.000-04:00
Every Dagger-injected instance of ApiConfiguration.State is now () -> ApiConfiguration.State. This eliminates all possible eager resolution at component construction time. Deleted ApiConfigurationStateFromProviderModule — no longer needed since nothing injects ApiConfiguration.State directly from Dagger. Classes updated: - PaymentAnalyticsRequestFactory (@Inject constructor) - DefaultPaymentNextActionHandlerRegistry (@Inject constructor) - PaymentLauncherModule (@provides) - CustomerSheetViewModel (constructor) - AttestationComponent (@BindsInstance) - AutocompleteViewModelFactoryComponent (@BindsInstance) - AddressElementViewModelFactoryComponent (@BindsInstance) - TapToAddCollectionHandler / TapToAddModule Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com> Committed-By-Agent: claude
diff --git a/payments-core/src/main/java/com/stripe/android/challenge/confirmation/di/IntentConfirmationChallengeComponent.kt b/payments-core/src/main/java/com/stripe/android/challenge/confirmation/di/IntentConfirmationChallengeComponent.kt
@@ -7,7 +7,6 @@ import com.stripe.android.challenge.confirmation.IntentConfirmationChallengeView
 import com.stripe.android.core.injection.CoreCommonModule
 import com.stripe.android.core.injection.CoroutineContextModule
 import com.stripe.android.networking.PaymentElementRequestSurfaceModule
-import com.stripe.android.payments.core.injection.ApiConfigurationStateFromProviderModule
 import com.stripe.android.payments.core.injection.ApiRequestOptionsModule
 import com.stripe.android.payments.core.injection.StripeRepositoryModule
 import dagger.BindsInstance
@@ -25,7 +24,6 @@ import javax.inject.Singleton
         CoroutineContextModule::class,
         StripeRepositoryModule::class,
         PaymentElementRequestSurfaceModule::class,
-        ApiConfigurationStateFromProviderModule::class,
         ApiRequestOptionsModule::class,
     ]
 )
diff --git a/payments-core/src/main/java/com/stripe/android/challenge/passive/PassiveChallengeComponent.kt b/payments-core/src/main/java/com/stripe/android/challenge/passive/PassiveChallengeComponent.kt
@@ -6,7 +6,6 @@ import com.stripe.android.core.injection.CoreCommonModule
 import com.stripe.android.core.injection.CoroutineContextModule
 import com.stripe.android.hcaptcha.HCaptchaModule
 import com.stripe.android.model.PassiveCaptchaParams
-import com.stripe.android.payments.core.injection.ApiConfigurationStateFromProviderModule
 import com.stripe.android.payments.core.injection.PRODUCT_USAGE
 import com.stripe.android.payments.core.injection.StripeRepositoryModule
 import dagger.BindsInstance
@@ -22,7 +21,6 @@ import javax.inject.Singleton
         StripeRepositoryModule::class,
         CoreCommonModule::class,
         CoroutineContextModule::class,
-        ApiConfigurationStateFromProviderModule::class,
     ]
 )
 internal interface PassiveChallengeComponent {
diff --git a/payments-core/src/main/java/com/stripe/android/challenge/passive/warmer/activity/PassiveChallengeWarmerActivityComponent.kt b/payments-core/src/main/java/com/stripe/android/challenge/passive/warmer/activity/PassiveChallengeWarmerActivityComponent.kt
@@ -7,7 +7,6 @@ import com.stripe.android.core.injection.CoreCommonModule
 import com.stripe.android.core.injection.CoroutineContextModule
 import com.stripe.android.hcaptcha.HCaptchaModule
 import com.stripe.android.model.PassiveCaptchaParams
-import com.stripe.android.payments.core.injection.ApiConfigurationStateFromProviderModule
 import com.stripe.android.payments.core.injection.PRODUCT_USAGE
 import com.stripe.android.payments.core.injection.StripeRepositoryModule
 import dagger.BindsInstance
@@ -23,7 +22,6 @@ import javax.inject.Singleton
         StripeRepositoryModule::class,
         CoreCommonModule::class,
         CoroutineContextModule::class,
-        ApiConfigurationStateFromProviderModule::class,
     ]
 )
 internal interface PassiveChallengeWarmerActivityComponent {
diff --git a/payments-core/src/main/java/com/stripe/android/networking/PaymentAnalyticsRequestFactory.kt b/payments-core/src/main/java/com/stripe/android/networking/PaymentAnalyticsRequestFactory.kt
@@ -68,13 +68,13 @@ class PaymentAnalyticsRequestFactory @VisibleForTesting internal constructor(
     @Inject
     internal constructor(
         context: Context,
-        apiConfigurationState: ApiConfiguration.State,
+        apiConfigurationProvider: Provider<() -> ApiConfiguration.State>,
         @Named(PRODUCT_USAGE) defaultProductUsageTokens: Set<String>
     ) : this(
         packageManager = context.applicationContext.packageManager,
         packageInfo = context.applicationContext.packageInfo,
         packageName = context.applicationContext.packageName.orEmpty(),
-        publishableKeyProvider = Provider { apiConfigurationState.publishableKey },
+        publishableKeyProvider = Provider { apiConfigurationProvider.get()().publishableKey },
         networkTypeProvider = NetworkTypeDetector(context)::invoke,
         defaultProductUsageTokens = defaultProductUsageTokens,
     )
diff --git a/payments-core/src/main/java/com/stripe/android/payments/bankaccount/di/CollectBankAccountComponent.kt b/payments-core/src/main/java/com/stripe/android/payments/bankaccount/di/CollectBankAccountComponent.kt
@@ -8,7 +8,6 @@ import com.stripe.android.networking.PaymentElementRequestSurfaceModule
 import com.stripe.android.payments.bankaccount.navigation.CollectBankAccountContract
 import com.stripe.android.payments.bankaccount.ui.CollectBankAccountViewEffect
 import com.stripe.android.payments.bankaccount.ui.CollectBankAccountViewModel
-import com.stripe.android.payments.core.injection.ApiConfigurationStateFromProviderModule
 import com.stripe.android.payments.core.injection.StripeRepositoryModule
 import dagger.BindsInstance
 import dagger.Component
@@ -23,7 +22,6 @@ import javax.inject.Singleton
         StripeRepositoryModule::class,
         PaymentElementRequestSurfaceModule::class,
         CoreCommonModule::class,
-        ApiConfigurationStateFromProviderModule::class,
     ]
 )
 internal interface CollectBankAccountComponent {
diff --git a/payments-core/src/main/java/com/stripe/android/payments/core/authentication/DefaultPaymentNextActionHandlerRegistry.kt b/payments-core/src/main/java/com/stripe/android/payments/core/authentication/DefaultPaymentNextActionHandlerRegistry.kt
@@ -36,14 +36,14 @@ internal class DefaultPaymentNextActionHandlerRegistry @Inject internal construc
     @IntentAuthenticatorMap private val paymentNextActionHandlers: Map<NextActionHandlerKey, NextActionHandler>,
     @Named(INCLUDE_PAYMENT_SHEET_NEXT_ACTION_HANDLERS) private val includePaymentSheetNextActionHandlers: Boolean,
     applicationContext: Context,
-    apiConfigurationState: ApiConfiguration.State,
+    apiConfigurationProvider: () -> ApiConfiguration.State,
 ) : PaymentNextActionHandlerRegistry {
 
     private val paymentSheetNextActionHandlers: Map<NextActionHandlerKey, NextActionHandler> by lazy {
         paymentSheetNextActionHandlers(
             includePaymentSheetNextActionHandlers,
             applicationContext,
-            apiConfigurationState.publishableKey,
+            apiConfigurationProvider().publishableKey,
         )
     }
 
diff --git a/payments-core/src/main/java/com/stripe/android/payments/core/injection/ApiConfigurationFromPaymentConfigurationModule.kt b/payments-core/src/main/java/com/stripe/android/payments/core/injection/ApiConfigurationFromPaymentConfigurationModule.kt
@@ -25,21 +25,6 @@ class ApiConfigurationFromPaymentConfigurationModule {
     }
 }
 
-/**
- * Eagerly evaluates a `() -> ApiConfiguration.State` provider function to produce an
- * [ApiConfiguration.State] instance. Use this in components that only have a
- * `() -> ApiConfiguration.State` binding and need to satisfy dependencies that
- * take [ApiConfiguration.State] directly.
- */
-@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
-@Module
-class ApiConfigurationStateFromProviderModule {
-    @Provides
-    fun provideApiConfigurationState(
-        provider: () -> ApiConfiguration.State
-    ): ApiConfiguration.State = provider()
-}
-
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 @Module
 class ApiRequestOptionsModule {
diff --git a/payments-core/src/main/java/com/stripe/android/payments/core/injection/NextActionHandlerComponent.kt b/payments-core/src/main/java/com/stripe/android/payments/core/injection/NextActionHandlerComponent.kt
@@ -29,7 +29,6 @@ import kotlin.coroutines.CoroutineContext
         WeChatPayNextActionHandlerModule::class,
         CoreCommonModule::class,
         StripeRepositoryModule::class,
-        ApiConfigurationStateFromProviderModule::class,
     ]
 )
 internal interface NextActionHandlerComponent {
diff --git a/payments-core/src/main/java/com/stripe/android/payments/core/injection/PaymentLauncherModule.kt b/payments-core/src/main/java/com/stripe/android/payments/core/injection/PaymentLauncherModule.kt
@@ -38,7 +38,7 @@ internal class PaymentLauncherModule {
         @IOContext workContext: CoroutineContext,
         @UIContext uiContext: CoroutineContext,
         paymentAnalyticsRequestFactory: PaymentAnalyticsRequestFactory,
-        apiConfigurationState: ApiConfiguration.State,
+        apiConfigurationProvider: () -> ApiConfiguration.State,
         @Named(PRODUCT_USAGE) productUsage: Set<String>,
         @Named(IS_INSTANT_APP) isInstantApp: Boolean,
         @Named(INCLUDE_PAYMENT_SHEET_NEXT_ACTION_HANDLERS) includePaymentSheetNextHandlers: Boolean,
@@ -48,7 +48,7 @@ internal class PaymentLauncherModule {
         enableLogging = enableLogging,
         workContext = workContext,
         uiContext = uiContext,
-        apiConfigurationState = apiConfigurationState,
+        apiConfigurationState = apiConfigurationProvider(),
         productUsage = productUsage,
         isInstantApp = isInstantApp,
         includePaymentSheetNextActionHandlers = includePaymentSheetNextHandlers,
diff --git a/payments-core/src/main/java/com/stripe/android/payments/core/injection/PaymentLauncherViewModelFactoryComponent.kt b/payments-core/src/main/java/com/stripe/android/payments/core/injection/PaymentLauncherViewModelFactoryComponent.kt
@@ -16,7 +16,6 @@ import javax.inject.Singleton
 @Component(
     modules = [
         PaymentLauncherModule::class,
-        ApiConfigurationStateFromProviderModule::class,
         ApiRequestOptionsModule::class,
         StripeRepositoryModule::class,
         PaymentElementRequestSurfaceModule::class,
diff --git a/payments-core/src/main/java/com/stripe/android/payments/core/injection/Stripe3ds2TransactionViewModelFactoryComponent.kt b/payments-core/src/main/java/com/stripe/android/payments/core/injection/Stripe3ds2TransactionViewModelFactoryComponent.kt
@@ -21,7 +21,6 @@ import javax.inject.Singleton
         CoroutineContextModule::class,
         CoreCommonModule::class,
         RetryDelayModule::class,
-        ApiConfigurationStateFromProviderModule::class,
     ]
 )
 internal interface Stripe3ds2TransactionViewModelFactoryComponent {
diff --git a/paymentsheet/src/main/java/com/stripe/android/attestation/AttestationComponent.kt b/paymentsheet/src/main/java/com/stripe/android/attestation/AttestationComponent.kt
@@ -31,7 +31,7 @@ internal interface AttestationComponent {
         fun build(
             @BindsInstance application: Application,
             @BindsInstance
-            apiConfigurationState: ApiConfiguration.State,
+            apiConfigurationProvider: () -> ApiConfiguration.State,
             @BindsInstance
             @Named(PRODUCT_USAGE)
             productUsage: Set<String>,
diff --git a/paymentsheet/src/main/java/com/stripe/android/attestation/AttestationViewModel.kt b/paymentsheet/src/main/java/com/stripe/android/attestation/AttestationViewModel.kt
@@ -63,10 +63,12 @@ internal class AttestationViewModel @Inject constructor(
                 DaggerAttestationComponent.factory()
                     .build(
                         application = app,
-                        apiConfigurationState = ApiConfiguration.State(
-                            publishableKey = args.publishableKey,
-                            stripeAccountId = null,
-                        ),
+                        apiConfigurationProvider = {
+                            ApiConfiguration.State(
+                                publishableKey = args.publishableKey,
+                                stripeAccountId = null,
+                            )
+                        },
                         productUsage = args.productUsage.toSet()
                     )
                     .attestationViewModel
diff --git a/paymentsheet/src/main/java/com/stripe/android/checkout/injection/CheckoutControllerComponent.kt b/paymentsheet/src/main/java/com/stripe/android/checkout/injection/CheckoutControllerComponent.kt
@@ -47,7 +47,6 @@ import com.stripe.android.paymentelement.embedded.content.DefaultEmbeddedSelecti
 import com.stripe.android.paymentelement.embedded.content.EmbeddedSelectionChooser
 import com.stripe.android.payments.core.analytics.ErrorReporter
 import com.stripe.android.payments.core.analytics.RealErrorReporter
-import com.stripe.android.payments.core.injection.ApiConfigurationStateFromProviderModule
 import com.stripe.android.payments.core.injection.StripeRepositoryModule
 import com.stripe.android.paymentsheet.CustomerStateHolder
 import com.stripe.android.paymentsheet.DefaultCustomerStateHolder
@@ -113,7 +112,6 @@ import javax.inject.Singleton
         PaymentMethodMessagePromotionsExperimentHandlerModule::class,
         NfcScanningAvailabilityModule::class,
         PaymentOptionCardArtModule::class,
-        ApiConfigurationStateFromProviderModule::class,
     ],
 )
 internal interface CheckoutControllerComponent {
diff --git a/paymentsheet/src/main/java/com/stripe/android/common/nfcscan/NfcScanningViewModelComponent.kt b/paymentsheet/src/main/java/com/stripe/android/common/nfcscan/NfcScanningViewModelComponent.kt
@@ -9,6 +9,7 @@ import com.stripe.android.common.nfcscan.tapzone.TapZoneModule
 import com.stripe.android.core.injection.CoroutineContextModule
 import com.stripe.android.core.injection.ViewModelScope
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodMetadata
+import com.stripe.android.paymentsheet.injection.ApiConfigurationModule
 import dagger.Binds
 import dagger.BindsInstance
 import dagger.Component
@@ -39,6 +40,7 @@ internal interface NfcScanningViewModelComponent {
         NfcCardScannerModule::class,
         NfcScanningEventReporterModule::class,
         TapZoneModule::class,
+        ApiConfigurationModule::class,
     ]
 )
 internal interface NfcScanningViewModelModule {
diff --git a/paymentsheet/src/main/java/com/stripe/android/common/taptoadd/TapToAddCollectionHandler.kt b/paymentsheet/src/main/java/com/stripe/android/common/taptoadd/TapToAddCollectionHandler.kt
@@ -59,7 +59,7 @@ internal interface TapToAddCollectionHandler {
             isStripeTerminalSdkAvailable: IsStripeTerminalSdkAvailable,
             terminalWrapper: TerminalWrapper,
             stripeRepository: StripeRepository,
-            apiConfiguration: ApiConfiguration.State,
+            apiConfigurationProvider: () -> ApiConfiguration.State,
             connectionManager: TapToAddConnectionManager,
             tapToPayUxConfiguration: TapToPayUxConfiguration,
             userFacingLogger: UserFacingLogger,
@@ -71,7 +71,7 @@ internal interface TapToAddCollectionHandler {
                     terminalWrapper = terminalWrapper,
                     connectionManager = connectionManager,
                     stripeRepository = stripeRepository,
-                    apiConfiguration = apiConfiguration,
+                    apiConfigurationProvider = apiConfigurationProvider,
                     tapToPayUxConfiguration = tapToPayUxConfiguration,
                     userFacingLogger = userFacingLogger,
                     errorReporter = errorReporter,
@@ -88,7 +88,7 @@ internal interface TapToAddCollectionHandler {
 internal class DefaultTapToAddCollectionHandler(
     private val terminalWrapper: TerminalWrapper,
     private val stripeRepository: StripeRepository,
-    private val apiConfiguration: ApiConfiguration.State,
+    private val apiConfigurationProvider: () -> ApiConfiguration.State,
     private val connectionManager: TapToAddConnectionManager,
     private val errorReporter: ErrorReporter,
     private val userFacingLogger: UserFacingLogger,
@@ -356,7 +356,7 @@ internal class DefaultTapToAddCollectionHandler(
 
         return ApiRequest.Options(
             apiKey = ephemeralKeySecret,
-            stripeAccount = apiConfiguration.stripeAccountId,
+            stripeAccount = apiConfigurationProvider().stripeAccountId,
         )
     }
 
diff --git a/paymentsheet/src/main/java/com/stripe/android/common/taptoadd/TapToAddModule.kt b/paymentsheet/src/main/java/com/stripe/android/common/taptoadd/TapToAddModule.kt
@@ -21,7 +21,7 @@ internal class TapToAddModule {
         isStripeTerminalSdkAvailable: IsStripeTerminalSdkAvailable,
         connectionManager: TapToAddConnectionManager,
         stripeRepository: StripeRepository,
-        apiConfiguration: ApiConfiguration.State,
+        apiConfigurationProvider: () -> ApiConfiguration.State,
         terminalWrapper: TerminalWrapper,
         tapToPayUxConfiguration: TapToPayUxConfiguration,
         userFacingLogger: UserFacingLogger,
@@ -33,7 +33,7 @@ internal class TapToAddModule {
             connectionManager = connectionManager,
             terminalWrapper = terminalWrapper,
             stripeRepository = stripeRepository,
-            apiConfiguration = apiConfiguration,
+            apiConfigurationProvider = apiConfigurationProvider,
             tapToPayUxConfiguration = tapToPayUxConfiguration,
             errorReporter = errorReporter,
             userFacingLogger = userFacingLogger,
diff --git a/paymentsheet/src/main/java/com/stripe/android/common/taptoadd/TapToAddViewModelComponent.kt b/paymentsheet/src/main/java/com/stripe/android/common/taptoadd/TapToAddViewModelComponent.kt
@@ -58,7 +58,6 @@ import com.stripe.android.paymentelement.confirmation.intent.DefaultIntentConfir
 import com.stripe.android.paymentelement.confirmation.linkinline.LinkInlineSignupConfirmationModule
 import com.stripe.android.payments.core.analytics.ErrorReporter
 import com.stripe.android.payments.core.analytics.RealErrorReporter
-import com.stripe.android.payments.core.injection.ApiConfigurationStateFromProviderModule
 import com.stripe.android.payments.core.injection.ApiRequestOptionsModule
 import com.stripe.android.payments.core.injection.PRODUCT_USAGE
 import com.stripe.android.payments.core.injection.STATUS_BAR_COLOR
@@ -95,7 +94,6 @@ import javax.inject.Singleton
         DefaultIntentConfirmationModule::class,
         LinkInlineSignupConfirmationModule::class,
         ApiConfigurationModule::class,
-        ApiConfigurationStateFromProviderModule::class,
         ApiRequestOptionsModule::class,
         PaymentElementRequestSurfaceModule::class,
         TapToAddViewModelModule::class,
diff --git a/paymentsheet/src/main/java/com/stripe/android/customersheet/CustomerSheetViewModel.kt b/paymentsheet/src/main/java/com/stripe/android/customersheet/CustomerSheetViewModel.kt
@@ -103,7 +103,7 @@ internal class CustomerSheetViewModel(
     private val logger: Logger,
     private val eventReporter: CustomerSheetEventReporter,
     private val workContext: CoroutineContext = Dispatchers.IO,
-    private val apiConfiguration: ApiConfiguration.State,
+    private val apiConfigurationProvider: () -> ApiConfiguration.State,
     private val productUsage: Set<String>,
     confirmationHandlerFactory: ConfirmationHandler.Factory,
     private val customerSheetLoader: CustomerSheetLoader,
@@ -123,7 +123,7 @@ internal class CustomerSheetViewModel(
         logger: Logger,
         eventReporter: CustomerSheetEventReporter,
         @IOContext workContext: CoroutineContext = Dispatchers.IO,
-        apiConfiguration: ApiConfiguration.State,
+        apiConfigurationProvider: () -> ApiConfiguration.State,
         @Named(PRODUCT_USAGE) productUsage: Set<String>,
         confirmationHandlerFactory: ConfirmationHandler.Factory,
         customerSheetLoader: CustomerSheetLoader,
@@ -143,7 +143,7 @@ internal class CustomerSheetViewModel(
         eventReporter = eventReporter,
         workContext = workContext,
         productUsage = productUsage,
-        apiConfiguration = apiConfiguration,
+        apiConfigurationProvider = apiConfigurationProvider,
         confirmationHandlerFactory = confirmationHandlerFactory,
         customerSheetLoader = customerSheetLoader,
         isNfcScanningAvailable = isNfcScanningAvailable,
@@ -171,7 +171,7 @@ internal class CustomerSheetViewModel(
         )
     )
 
-    private val isConfiguredLiveMode = apiConfiguration.isLiveMode()
+    private val isConfiguredLiveMode = apiConfigurationProvider().isLiveMode()
     private val isLiveMode
         get() = customerState.value.metadata?.stripeIntent?.isLiveMode ?: isConfiguredLiveMode
 
@@ -904,8 +904,8 @@ internal class CustomerSheetViewModel(
             sellerBusinessName = null,
             forceSetupFutureUseBehavior = false,
             clientAttributionMetadata = clientAttributionMetadata,
-            publishableKey = apiConfiguration.publishableKey,
-            stripeAccountId = apiConfiguration.stripeAccountId,
+            publishableKey = apiConfigurationProvider().publishableKey,
+            stripeAccountId = apiConfigurationProvider().stripeAccountId,
         )
     }
 
diff --git a/paymentsheet/src/main/java/com/stripe/android/customersheet/injection/CustomerSheetViewModelComponent.kt b/paymentsheet/src/main/java/com/stripe/android/customersheet/injection/CustomerSheetViewModelComponent.kt
@@ -11,7 +11,6 @@ import com.stripe.android.customersheet.CustomerSheetViewModel
 import com.stripe.android.googlepaylauncher.injection.GooglePayLauncherModule
 import com.stripe.android.networking.PaymentElementRequestSurfaceModule
 import com.stripe.android.paymentelement.confirmation.injection.CustomerSheetConfirmationModule
-import com.stripe.android.payments.core.injection.ApiConfigurationStateFromProviderModule
 import com.stripe.android.payments.core.injection.PaymentConfigurationModule
 import com.stripe.android.payments.core.injection.StripeRepositoryModule
 import com.stripe.android.paymentsheet.PaymentOptionCardArtModule
@@ -24,7 +23,6 @@ import dagger.Component
         ElementsSessionClientParamsModule::class,
         CustomerSheetConfirmationModule::class,
         CustomerSheetViewModelModule::class,
-        ApiConfigurationStateFromProviderModule::class,
         PaymentConfigurationModule::class,
         StripeRepositoryModule::class,
         PaymentElementRequestSurfaceModule::class,
diff --git a/paymentsheet/src/main/java/com/stripe/android/link/injection/LinkControllerComponent.kt b/paymentsheet/src/main/java/com/stripe/android/link/injection/LinkControllerComponent.kt
@@ -5,7 +5,6 @@ import androidx.lifecycle.SavedStateHandle
 import com.stripe.android.link.LinkController
 import com.stripe.android.networking.RequestSurface
 import com.stripe.android.paymentelement.callbacks.PaymentElementCallbackIdentifier
-import com.stripe.android.payments.core.injection.ApiConfigurationStateFromProviderModule
 import com.stripe.android.payments.core.injection.ApiRequestOptionsModule
 import com.stripe.android.paymentsheet.injection.PaymentMethodMessagePromotionsExperimentHandlerModule
 import dagger.BindsInstance
@@ -17,7 +16,6 @@ import javax.inject.Singleton
     modules = [
         LinkControllerModule::class,
         PaymentMethodMessagePromotionsExperimentHandlerModule::class,
-        ApiConfigurationStateFromProviderModule::class,
         ApiRequestOptionsModule::class,
     ]
 )
diff --git a/paymentsheet/src/main/java/com/stripe/android/link/injection/NativeLinkComponent.kt b/paymentsheet/src/main/java/com/stripe/android/link/injection/NativeLinkComponent.kt
@@ -27,7 +27,6 @@ import com.stripe.android.paymentelement.confirmation.injection.DefaultConfirmat
 import com.stripe.android.paymentelement.confirmation.intent.DefaultIntentConfirmationModule
 import com.stripe.android.paymentelement.confirmation.link.LinkPassthroughConfirmationModule
 import com.stripe.android.payments.core.analytics.ErrorReporter
-import com.stripe.android.payments.core.injection.ApiConfigurationStateFromProviderModule
 import com.stripe.android.payments.core.injection.ApiRequestOptionsModule
 import com.stripe.android.payments.core.injection.STATUS_BAR_COLOR
 import com.stripe.android.paymentsheet.addresselement.AutocompleteLauncher
@@ -50,7 +49,6 @@ internal annotation class NativeLinkScope
         DefaultConfirmationModule::class,
         DefaultIntentConfirmationModule::class,
         LinkPassthroughConfirmationModule::class,
-        ApiConfigurationStateFromProviderModule::class,
         ApiRequestOptionsModule::class,
     ]
 )
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/content/EmbeddedPaymentElementViewModelComponent.kt b/paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/content/EmbeddedPaymentElementViewModelComponent.kt
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/sheet/EmbeddedSheetComponent.kt b/paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/sheet/EmbeddedSheetComponent.kt
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/addresselement/AddressElementViewModel.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/addresselement/AddressElementViewModel.kt
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/addresselement/AutocompleteViewModel.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/addresselement/AutocompleteViewModel.kt
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/flowcontroller/FlowControllerStateComponent.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/flowcontroller/FlowControllerStateComponent.kt
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/AddressElementViewModelFactoryComponent.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/AddressElementViewModelFactoryComponent.kt
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/AutocompleteViewModelFactoryComponent.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/AutocompleteViewModelFactoryComponent.kt
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/PaymentOptionsViewModelFactoryComponent.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/PaymentOptionsViewModelFactoryComponent.kt
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/PaymentSheetLauncherComponent.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/injection/PaymentSheetLauncherComponent.kt
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/paymentdatacollection/polling/di/PollingComponent.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/paymentdatacollection/polling/di/PollingComponent.kt

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ import kotlin.coroutines.CoroutineContext`
`29`	`29`	`WeChatPayNextActionHandlerModule::class,`
`30`	`30`	`CoreCommonModule::class,`
`31`	`31`	`StripeRepositoryModule::class,`
`32`		`- ApiConfigurationStateFromProviderModule::class,`
`33`	`32`	`]`
`34`	`33`	`)`
`35`	`34`	`internal interface NextActionHandlerComponent {`