Fix issue where FlowController shows an empty saved payment method …

…screen when `Google Pay` is enabled.
stripe · Jun 24, 2024 · 54273f6 · 54273f6
1 parent 36fd0ac
commit 54273f6
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/viewmodels/BaseSheetViewModel.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/viewmodels/BaseSheetViewModel.kt
@@ -127,10 +127,10 @@ internal abstract class BaseSheetViewModel(
      * The list of saved payment methods for the current customer.
      * Value is null until it's loaded, and non-null (could be empty) after that.
      */
-    internal val paymentMethods: StateFlow<List<PaymentMethod>?> = savedStateHandle
+    internal val paymentMethods: StateFlow<List<PaymentMethod>> = savedStateHandle
         .getStateFlow<CustomerState?>(SAVED_CUSTOMER, null)
         .mapAsStateFlow { state ->
-            state?.paymentMethods
+            state?.paymentMethods ?: emptyList()
         }
 
     protected val backStack = MutableStateFlow<List<PaymentSheetScreen>>(

diff --git a/...eet/src/main/java/com/stripe/android/paymentsheet/viewmodels/PaymentOptionsStateMapper.kt b/...eet/src/main/java/com/stripe/android/paymentsheet/viewmodels/PaymentOptionsStateMapper.kt
@@ -10,7 +10,7 @@ import com.stripe.android.uicore.utils.combineAsStateFlow
 import kotlinx.coroutines.flow.StateFlow
 
 internal class PaymentOptionsStateMapper(
-    private val paymentMethods: StateFlow<List<PaymentMethod>?>,
+    private val paymentMethods: StateFlow<List<PaymentMethod>>,
     private val googlePayState: StateFlow<GooglePayState>,
     private val isLinkEnabled: StateFlow<Boolean?>,
     private val currentSelection: StateFlow<PaymentSelection?>,
@@ -39,13 +39,12 @@ internal class PaymentOptionsStateMapper(
 
     @Suppress("ReturnCount")
     private fun createPaymentOptionsState(
-        paymentMethods: List<PaymentMethod>?,
+        paymentMethods: List<PaymentMethod>,
         currentSelection: PaymentSelection?,
         isLinkEnabled: Boolean?,
         canRemovePaymentMethods: Boolean?,
         googlePayState: GooglePayState,
     ): PaymentOptionsState? {
-        if (paymentMethods == null) return null
         if (isLinkEnabled == null) return null
 
         return PaymentOptionsStateFactory.create(

diff --git a/paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentOptionsViewModelTest.kt b/paymentsheet/src/test/java/com/stripe/android/paymentsheet/PaymentOptionsViewModelTest.kt
@@ -830,6 +830,24 @@ internal class PaymentOptionsViewModelTest {
             )
         }
 
+    @Test
+    fun `paymentMethods is not null when loading is complete`() = runTest {
+        val args = PAYMENT_OPTION_CONTRACT_ARGS.updateState(
+            isGooglePayReady = true,
+        ).run {
+            copy(state = state.copy(customer = null))
+        }
+
+        val viewModel = createViewModel(args = args)
+
+        viewModel.currentScreen.test {
+            assertThat(awaitItem()).isInstanceOf(SelectSavedPaymentMethods::class.java)
+        }
+        viewModel.paymentMethods.test {
+            assertThat(awaitItem()).isEmpty()
+        }
+    }
+
     private fun createLinkViewModel(): PaymentOptionsViewModel {
         val linkConfigurationCoordinator = FakeLinkConfigurationCoordinator(
             attachNewCardToAccountResult = Result.success(LinkTestUtils.LINK_NEW_PAYMENT_DETAILS),

diff --git a/...src/test/java/com/stripe/android/paymentsheet/viewmodels/PaymentOptionsStateMapperTest.kt b/...src/test/java/com/stripe/android/paymentsheet/viewmodels/PaymentOptionsStateMapperTest.kt
@@ -20,7 +20,7 @@ class PaymentOptionsStateMapperTest {
     @get:Rule
     val instantTaskExecutorRule = InstantTaskExecutorRule()
 
-    private val paymentMethodsFlow = MutableStateFlow<List<PaymentMethod>?>(null)
+    private val paymentMethodsFlow = MutableStateFlow<List<PaymentMethod>>(emptyList())
     private val currentSelectionFlow = MutableStateFlow<PaymentSelection?>(null)
     private val googlePayStateFlow = MutableStateFlow<GooglePayState>(GooglePayState.Indeterminate)
     private val isLinkEnabledFlow = MutableStateFlow<Boolean?>(null)