Simplify LinkHandler & source of truth for Link enablement

paymentsheet/src/main/java/com/stripe/android/paymentelement/embedded/content/EmbeddedWalletsHelper.kt

@@ -1,11 +1,12 @@
 package com.stripe.android.paymentelement.embedded.content
 
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodMetadata
+import com.stripe.android.lpmfoundations.paymentmethod.WalletType
 import com.stripe.android.model.SetupIntent
 import com.stripe.android.paymentsheet.LinkHandler
 import com.stripe.android.paymentsheet.model.GooglePayButtonType
 import com.stripe.android.paymentsheet.state.WalletsState
-import com.stripe.android.uicore.utils.combineAsStateFlow
+import com.stripe.android.uicore.utils.mapAsStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import javax.inject.Inject
 
@@ -19,14 +20,11 @@ internal class DefaultEmbeddedWalletsHelper @Inject constructor(
     override fun walletsState(paymentMethodMetadata: PaymentMethodMetadata): StateFlow<WalletsState?> {
         linkHandler.setupLink(paymentMethodMetadata.linkState)
 
-        return combineAsStateFlow(
-            linkHandler.isLinkEnabled,
-            linkHandler.linkConfigurationCoordinator.emailFlow,
-        ) { isLinkAvailable, linkEmail ->
+        return linkHandler.linkConfigurationCoordinator.emailFlow.mapAsStateFlow { linkEmail ->
             WalletsState.create(
-                isLinkAvailable = isLinkAvailable,
+                isLinkAvailable = paymentMethodMetadata.availableWallets.contains(WalletType.Link),
                 linkEmail = linkEmail,
-                isGooglePayReady = paymentMethodMetadata.isGooglePayReady == true,
+                isGooglePayReady = paymentMethodMetadata.isGooglePayReady,
                 buttonsEnabled = true,
                 paymentMethodTypes = paymentMethodMetadata.supportedPaymentMethodTypes(),
                 googlePayLauncherConfig = null, // This isn't used for embedded.

paymentsheet/src/main/java/com/stripe/android/paymentsheet/LinkHandler.kt

@@ -7,8 +7,6 @@ import com.stripe.android.paymentsheet.state.LinkState
 import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -17,18 +15,12 @@ import javax.inject.Singleton
 internal class LinkHandler @Inject constructor(
     val linkConfigurationCoordinator: LinkConfigurationCoordinator,
 ) {
-    private val _isLinkEnabled = MutableStateFlow<Boolean?>(null)
-    val isLinkEnabled: StateFlow<Boolean?> = _isLinkEnabled
-
-    private val _linkConfiguration = MutableStateFlow<LinkConfiguration?>(null)
-    val linkConfiguration: StateFlow<LinkConfiguration?> = _linkConfiguration.asStateFlow()
+    private val linkConfiguration = MutableStateFlow<LinkConfiguration?>(null)
 
     fun setupLink(state: LinkState?) {
-        _isLinkEnabled.value = state != null
-
         if (state == null) return
 
-        _linkConfiguration.value = state.configuration
+        linkConfiguration.value = state.configuration
     }
 
     suspend fun setupLinkWithEagerLaunch(state: LinkState?): Boolean {

paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentOptionsViewModel.kt

@@ -17,6 +17,7 @@ import com.stripe.android.link.LinkLaunchMode
 import com.stripe.android.link.LinkPaymentLauncher
 import com.stripe.android.link.domain.LinkProminenceFeatureProvider
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodMetadata
+import com.stripe.android.lpmfoundations.paymentmethod.WalletType
 import com.stripe.android.model.PaymentIntent
 import com.stripe.android.model.SetupIntent
 import com.stripe.android.paymentsheet.analytics.EventReporter
@@ -92,13 +93,12 @@ internal class PaymentOptionsViewModel @Inject constructor(
     override val walletsProcessingState: StateFlow<WalletsProcessingState?> = MutableStateFlow(null).asStateFlow()
 
     override val walletsState: StateFlow<WalletsState?> = combineAsStateFlow(
-        linkHandler.isLinkEnabled,
         linkHandler.linkConfigurationCoordinator.emailFlow,
         buttonsEnabled,
-    ) { isLinkAvailable, linkEmail, buttonsEnabled ->
+    ) { linkEmail, buttonsEnabled ->
         val paymentMethodMetadata = args.state.paymentMethodMetadata
         WalletsState.create(
-            isLinkAvailable = isLinkAvailable,
+            isLinkAvailable = paymentMethodMetadata.availableWallets.contains(WalletType.Link),
             linkEmail = linkEmail,
             isGooglePayReady = paymentMethodMetadata.isGooglePayReady,
             buttonsEnabled = buttonsEnabled,

paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentSheetViewModel.kt

@@ -21,6 +21,7 @@ import com.stripe.android.core.utils.requireApplication
 import com.stripe.android.googlepaylauncher.GooglePayEnvironment
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodMetadata
+import com.stripe.android.lpmfoundations.paymentmethod.WalletType
 import com.stripe.android.model.PaymentMethodOptionsParams
 import com.stripe.android.model.SetupIntent
 import com.stripe.android.model.StripeIntent
@@ -169,13 +170,12 @@ internal class PaymentSheetViewModel @Inject internal constructor(
     override val error: StateFlow<ResolvableString?> = buyButtonState.mapAsStateFlow { it?.errorMessage?.message }
 
     override val walletsState: StateFlow<WalletsState?> = combineAsStateFlow(
-        linkHandler.isLinkEnabled,
         linkHandler.linkConfigurationCoordinator.emailFlow,
         buttonsEnabled,
         paymentMethodMetadata,
-    ) { isLinkAvailable, linkEmail, buttonsEnabled, paymentMethodMetadata ->
+    ) { linkEmail, buttonsEnabled, paymentMethodMetadata ->
         WalletsState.create(
-            isLinkAvailable = isLinkAvailable,
+            isLinkAvailable = paymentMethodMetadata?.availableWallets?.contains(WalletType.Link),
             linkEmail = linkEmail,
             isGooglePayReady = paymentMethodMetadata?.isGooglePayReady == true,
             buttonsEnabled = buttonsEnabled,
@@ -454,7 +454,7 @@ internal class PaymentSheetViewModel @Inject internal constructor(
                 paymentSelectionWithCvcIfEnabled(paymentSelection)
                     ?.toConfirmationOption(
                         configuration = config.asCommonConfiguration(),
-                        linkConfiguration = linkHandler.linkConfiguration.value,
+                        linkConfiguration = paymentMethodMetadata.value?.linkState?.configuration,
                     )
             }
 

paymentsheet/src/main/java/com/stripe/android/paymentsheet/SavedPaymentMethodMutator.kt

@@ -6,6 +6,7 @@ import com.stripe.android.core.strings.ResolvableString
 import com.stripe.android.core.strings.orEmpty
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodMetadata
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentSheetCardBrandFilter
+import com.stripe.android.lpmfoundations.paymentmethod.WalletType
 import com.stripe.android.model.PaymentMethod
 import com.stripe.android.model.PaymentMethodUpdateParams
 import com.stripe.android.paymentsheet.analytics.EventReporter
@@ -450,7 +451,9 @@ internal class SavedPaymentMethodMutator(
                         setDefaultPaymentMethodExecutor = setDefaultPaymentMethodExecutor,
                     )
                 },
-                isLinkEnabled = viewModel.linkHandler.isLinkEnabled,
+                isLinkEnabled = viewModel.paymentMethodMetadata.mapAsStateFlow {
+                    it?.availableWallets?.contains(WalletType.Link)
+                },
                 isNotPaymentFlow = !viewModel.isCompleteFlow,
             ).apply {
                 viewModel.viewModelScope.launch {

paymentsheet/src/test/java/com/stripe/android/paymentsheet/LinkHandlerTest.kt

@@ -20,7 +20,6 @@ import com.stripe.android.paymentsheet.state.LinkState
 import com.stripe.android.paymentsheet.viewmodels.BaseSheetViewModel.Companion.SAVE_SELECTION
 import com.stripe.android.testing.PaymentIntentFactory
 import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.test.TestScope
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
@@ -42,7 +41,6 @@ class LinkHandlerTest {
                 signupMode = LinkSignupMode.InsteadOfSaveForFutureUse
             )
         )
-        assertThat(handler.isLinkEnabled.first()).isTrue()
         assertThat(savedStateHandle.get<PaymentSelection>(SAVE_SELECTION)).isNull()
     }
 
@@ -55,7 +53,6 @@ class LinkHandlerTest {
                 signupMode = LinkSignupMode.AlongsideSaveForFutureUse
             )
         )
-        assertThat(handler.isLinkEnabled.first()).isTrue()
         assertThat(savedStateHandle.get<PaymentSelection>(SAVE_SELECTION)).isNull()
     }
 

paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentOptionsViewModelTest.kt

@@ -21,6 +21,7 @@ import com.stripe.android.link.ui.inline.LinkSignupMode
 import com.stripe.android.link.ui.inline.SignUpConsentAction
 import com.stripe.android.link.ui.inline.UserInput
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodMetadataFactory
+import com.stripe.android.lpmfoundations.paymentmethod.WalletType
 import com.stripe.android.model.CardBrand
 import com.stripe.android.model.PaymentIntentFixtures
 import com.stripe.android.model.PaymentMethod
@@ -321,15 +322,18 @@ internal class PaymentOptionsViewModelTest {
     @Test
     fun `Does not select Link when user is logged out of their Link account`() = runTest {
         val viewModel = createViewModel(
-            linkState = LinkState(
-                configuration = mock(),
-                signupMode = null,
-                loginState = LinkState.LoginState.LoggedOut,
+            args = PAYMENT_OPTION_CONTRACT_ARGS.updateState(
+                availableWallets = listOf(WalletType.Link),
+                linkState = LinkState(
+                    configuration = mock(),
+                    signupMode = null,
+                    loginState = LinkState.LoginState.LoggedOut,
+                )
             ),
         )
 
         assertThat(viewModel.selection.value).isNotEqualTo(PaymentSelection.Link())
-        assertThat(viewModel.linkHandler.isLinkEnabled.value).isTrue()
+        assertThat(viewModel.paymentMethodMetadata.value?.availableWallets).contains(WalletType.Link)
     }
 
     @Test
@@ -339,7 +343,7 @@ internal class PaymentOptionsViewModelTest {
         )
 
         assertThat(viewModel.selection.value).isNotEqualTo(PaymentSelection.Link())
-        assertThat(viewModel.linkHandler.isLinkEnabled.value).isFalse()
+        assertThat(viewModel.paymentMethodMetadata.value?.availableWallets).doesNotContain(WalletType.Link)
     }
 
     @Test
@@ -830,11 +834,7 @@ internal class PaymentOptionsViewModelTest {
     @Test
     fun `Displays Link wallet button if customer has not saved PMs and Google Pay is not available`() = runTest {
         val args = PAYMENT_OPTION_CONTRACT_ARGS.updateState(
-            linkState = LinkState(
-                configuration = mock(),
-                signupMode = null,
-                loginState = LinkState.LoginState.NeedsVerification,
-            ),
+            availableWallets = listOf(WalletType.Link),
             isGooglePayReady = false,
         )
 

paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentSheetActivityTest.kt

@@ -46,6 +46,7 @@ import com.stripe.android.link.LinkActivityResult
 import com.stripe.android.link.LinkPaymentLauncher
 import com.stripe.android.link.model.AccountStatus
 import com.stripe.android.link.ui.LinkButtonTestTag
+import com.stripe.android.lpmfoundations.paymentmethod.WalletType
 import com.stripe.android.model.CardBrand
 import com.stripe.android.model.PaymentIntent
 import com.stripe.android.model.PaymentIntentFixtures
@@ -222,7 +223,10 @@ internal class PaymentSheetActivityTest {
 
     @Test
     fun `link button should not be enabled when editing`() {
-        val viewModel = createViewModel(isLinkAvailable = true)
+        val viewModel = createViewModel(
+            availableWallets = listOf(WalletType.Link),
+            isLinkAvailable = true,
+        )
         val scenario = activityScenario(viewModel)
 
         scenario.launch(intent).onActivity {
@@ -240,7 +244,10 @@ internal class PaymentSheetActivityTest {
 
     @Test
     fun `link button should not be enabled when processing`() {
-        val viewModel = createViewModel(isLinkAvailable = true)
+        val viewModel = createViewModel(
+            availableWallets = listOf(WalletType.Link),
+            isLinkAvailable = true
+        )
         val scenario = activityScenario(viewModel)
 
         scenario.launch(intent).onActivity { activity ->
@@ -312,7 +319,10 @@ internal class PaymentSheetActivityTest {
 
     @Test
     fun `Errors are cleared when checking out with Link`() {
-        val viewModel = createViewModel(isLinkAvailable = true)
+        val viewModel = createViewModel(
+            availableWallets = listOf(WalletType.Link),
+            isLinkAvailable = true,
+        )
         val scenario = activityScenario(viewModel)
 
         scenario.launch(intent).onActivity {
@@ -731,7 +741,11 @@ internal class PaymentSheetActivityTest {
     @Test
     fun `link flow updates the payment sheet before and after`() = runTest {
         RecordingLinkPaymentLauncher.test {
-            val viewModel = createViewModel(isLinkAvailable = true, linkPaymentLauncher = launcher)
+            val viewModel = createViewModel(
+                availableWallets = listOf(WalletType.Link),
+                isLinkAvailable = true,
+                linkPaymentLauncher = launcher
+            )
             val scenario = activityScenario(viewModel)
 
             scenario.launch(intent).onActivity {
@@ -1213,6 +1227,7 @@ internal class PaymentSheetActivityTest {
         paymentIntent: PaymentIntent = PAYMENT_INTENT,
         paymentMethods: List<PaymentMethod> = PAYMENT_METHODS,
         loadDelay: Duration = Duration.ZERO,
+        availableWallets: List<WalletType> = emptyList(),
         isGooglePayAvailable: Boolean = false,
         isLinkAvailable: Boolean = false,
         linkPaymentLauncher: LinkPaymentLauncher = RecordingLinkPaymentLauncher.noOp(),
@@ -1236,6 +1251,7 @@ internal class PaymentSheetActivityTest {
                     stripeIntent = paymentIntent,
                     customer = PaymentSheetFixtures.EMPTY_CUSTOMER_STATE.copy(paymentMethods = paymentMethods),
                     isGooglePayAvailable = isGooglePayAvailable,
+                    availableWallets = availableWallets,
                     linkState = LinkState(
                         configuration = mock(),
                         loginState = LinkState.LoginState.LoggedOut,

paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentSheetFixtures.kt

@@ -7,6 +7,7 @@ import com.stripe.android.common.model.asCommonConfiguration
 import com.stripe.android.core.strings.resolvableString
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodMetadataFactory
 import com.stripe.android.lpmfoundations.paymentmethod.PaymentMethodSaveConsentBehavior
+import com.stripe.android.lpmfoundations.paymentmethod.WalletType
 import com.stripe.android.model.PaymentMethod
 import com.stripe.android.model.PaymentMethodFixtures.BILLING_DETAILS
 import com.stripe.android.model.StripeIntent
@@ -176,6 +177,7 @@ internal object PaymentSheetFixtures {
         config: PaymentSheet.Configuration = configuration,
         paymentSelection: PaymentSelection? = state.paymentSelection,
         linkState: LinkState? = state.paymentMethodMetadata.linkState,
+        availableWallets: List<WalletType> = state.paymentMethodMetadata.availableWallets,
     ): PaymentOptionContract.Args {
         return copy(
             state = state.copy(
@@ -189,6 +191,7 @@ internal object PaymentSheetFixtures {
                 config = config.asCommonConfiguration(),
                 paymentSelection = paymentSelection,
                 paymentMethodMetadata = PaymentMethodMetadataFactory.create(
+                    availableWallets = availableWallets,
                     stripeIntent = stripeIntent,
                     isGooglePayReady = isGooglePayReady,
                     linkState = linkState,

paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentSheetViewModelTest.kt

@@ -37,6 +37,7 @@ import com.stripe.android.link.ui.inline.SignUpConsentAction
 import com.stripe.android.link.ui.inline.UserInput
 import com.stripe.android.link.utils.errorMessage
 import com.stripe.android.lpmfoundations.luxe.LpmRepositoryTestHelpers
+import com.stripe.android.lpmfoundations.paymentmethod.WalletType
 import com.stripe.android.lpmfoundations.paymentmethod.definitions.CardDefinition
 import com.stripe.android.model.Address
 import com.stripe.android.model.CardBrand
@@ -635,14 +636,15 @@ internal class PaymentSheetViewModelTest {
     @Test
     fun `Enables Link when user is logged out of their Link account`() = runTest {
         val viewModel = createViewModel(
+            availableWallets = listOf(WalletType.Link),
             linkState = LinkState(
                 configuration = mock(),
                 loginState = LinkState.LoginState.LoggedOut,
                 signupMode = null,
             ),
         )
 
-        assertThat(viewModel.linkHandler.isLinkEnabled.value).isTrue()
+        assertThat(viewModel.paymentMethodMetadata.value?.availableWallets).contains(WalletType.Link)
     }
 
     @Test
@@ -651,7 +653,7 @@ internal class PaymentSheetViewModelTest {
             linkState = null,
         )
 
-        assertThat(viewModel.linkHandler.isLinkEnabled.value).isFalse()
+        assertThat(viewModel.paymentMethodMetadata.value?.availableWallets).doesNotContain(WalletType.Link)
     }
 
     @Test
@@ -1943,6 +1945,7 @@ internal class PaymentSheetViewModelTest {
     @Test
     fun `Hides Google Pay wallet button if Google Pay is not available`() = runTest {
         val viewModel = createViewModel(
+            availableWallets = listOf(WalletType.Link),
             isGooglePayReady = false,
             linkState = LinkState(
                 configuration = mock(),
@@ -1961,6 +1964,7 @@ internal class PaymentSheetViewModelTest {
     @Test
     fun `Shows Link wallet button if Link is available`() = runTest {
         val viewModel = createViewModel(
+            availableWallets = listOf(WalletType.Link),
             linkState = LinkState(
                 configuration = mock(),
                 loginState = LinkState.LoginState.LoggedOut,
@@ -3514,6 +3518,7 @@ internal class PaymentSheetViewModelTest {
         linkConfigurationCoordinator: LinkConfigurationCoordinator = this.linkConfigurationCoordinator,
         customerRepository: CustomerRepository = FakeCustomerRepository(customer?.paymentMethods ?: emptyList()),
         shouldFailLoad: Boolean = false,
+        availableWallets: List<WalletType> = emptyList(),
         linkState: LinkState? = null,
         isGooglePayReady: Boolean = false,
         delay: Duration = Duration.ZERO,
@@ -3526,6 +3531,7 @@ internal class PaymentSheetViewModelTest {
         paymentElementLoader: PaymentElementLoader = FakePaymentElementLoader(
             stripeIntent = stripeIntent,
             shouldFail = shouldFailLoad,
+            availableWallets = availableWallets,
             linkState = linkState,
             customer = customer,
             delay = delay,

paymentsheet/src/test/java/com/stripe/android/paymentsheet/flowcontroller/DefaultFlowControllerTest.kt

@@ -484,7 +484,10 @@ internal class DefaultFlowControllerTest {
                 config = PaymentSheet.Configuration("com.stripe.android.paymentsheet.test").asCommonConfiguration(),
                 paymentSelection = null,
                 validationError = null,
-                paymentMethodMetadata = PaymentMethodMetadataFactory.create(allowsDelayedPaymentMethods = false),
+                paymentMethodMetadata = PaymentMethodMetadataFactory.create(
+                    allowsDelayedPaymentMethods = false,
+                    availableWallets = emptyList(),
+                ),
             ),
             configuration = PaymentSheet.Configuration("com.stripe.android.paymentsheet.test"),
             enableLogging = ENABLE_LOGGING,