Small reverts.

stripe · May 3, 2024 · f5493dc · f5493dc
1 parent df4a25b
commit f5493dc
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentOptionsViewModel.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentOptionsViewModel.kt
@@ -37,8 +37,10 @@ import com.stripe.android.uicore.utils.mapAsStateFlow
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 import kotlin.coroutines.CoroutineContext
@@ -127,7 +129,11 @@ internal class PaymentOptionsViewModel @Inject constructor(
  override var newPaymentSelection: PaymentSelection.New? =
  args.state.paymentSelection as? PaymentSelection.New
 
- override val primaryButtonUiState = primaryButtonUiStateMapper.forCustomFlow()
+ override val primaryButtonUiState = primaryButtonUiStateMapper.forCustomFlow().stateIn(
+ scope = viewModelScope,
+ started = SharingStarted.WhileSubscribed(),
+ initialValue = null,
+ )
 
  init {
  SessionSavedStateHandler.attachTo(this, savedStateHandle)

diff --git a/paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentSheetViewModel.kt b/paymentsheet/src/main/java/com/stripe/android/paymentsheet/PaymentSheetViewModel.kt
@@ -71,9 +71,11 @@ import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharedFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeoutOrNull
@@ -199,7 +201,11 @@ internal class PaymentSheetViewModel @Inject internal constructor(
  }
  }
 
- override val primaryButtonUiState = primaryButtonUiStateMapper.forCompleteFlow()
+ override val primaryButtonUiState = primaryButtonUiStateMapper.forCompleteFlow().stateIn(
+ scope = viewModelScope,
+ started = SharingStarted.WhileSubscribed(),
+ initialValue = null,
+ )
 
  override val error: StateFlow<String?> = buyButtonState.mapAsStateFlow { it?.errorMessage?.message }
 

diff --git a/...et/src/main/java/com/stripe/android/paymentsheet/viewmodels/PrimaryButtonUiStateMapper.kt b/...et/src/main/java/com/stripe/android/paymentsheet/viewmodels/PrimaryButtonUiStateMapper.kt
@@ -7,8 +7,9 @@ import com.stripe.android.paymentsheet.model.PaymentSelection
 import com.stripe.android.paymentsheet.navigation.PaymentSheetScreen
 import com.stripe.android.paymentsheet.ui.PrimaryButton
 import com.stripe.android.ui.core.Amount
-import com.stripe.android.uicore.utils.combineAsStateFlow
+import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.combine
 import com.stripe.android.ui.core.R as StripeUiCoreR
 
 internal class PrimaryButtonUiStateMapper(
@@ -23,8 +24,8 @@ internal class PrimaryButtonUiStateMapper(
  private val onClick: () -> Unit,
 ) {
 
- fun forCompleteFlow(): StateFlow<PrimaryButton.UIState?> {
- return combineAsStateFlow(
+ fun forCompleteFlow(): Flow<PrimaryButton.UIState?> {
+ return combine(
  currentScreenFlow,
  buttonsEnabledFlow,
  amountFlow,
@@ -40,8 +41,8 @@ internal class PrimaryButtonUiStateMapper(
  }
  }
 
- fun forCustomFlow(): StateFlow<PrimaryButton.UIState?> {
- return combineAsStateFlow(
+ fun forCustomFlow(): Flow<PrimaryButton.UIState?> {
+ return combine(
  currentScreenFlow,
  buttonsEnabledFlow,
  selectionFlow,