Link Cvc & Expiry recollection #9880
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModelProvider | |
| import androidx.lifecycle.viewModelScope | ||
| import androidx.lifecycle.viewmodel.initializer | ||
| import androidx.lifecycle.viewmodel.viewModelFactory | ||
| import com.stripe.android.common.exception.stripeErrorMessage | ||
| import com.stripe.android.core.Logger | ||
| import com.stripe.android.core.strings.resolvableString | ||
| import com.stripe.android.link.LinkActivityResult | ||
|
|
@@ -14,14 +15,25 @@ import com.stripe.android.link.account.LinkAccountManager | |
| import com.stripe.android.link.injection.NativeLinkComponent | ||
| import com.stripe.android.link.model.LinkAccount | ||
| import com.stripe.android.link.model.supportedPaymentMethodTypes | ||
| import com.stripe.android.model.CardBrand | ||
| import com.stripe.android.model.ConsumerPaymentDetails | ||
| import com.stripe.android.model.ConsumerPaymentDetailsUpdateParams | ||
| import com.stripe.android.model.PaymentIntent | ||
| import com.stripe.android.model.PaymentMethod | ||
| import com.stripe.android.model.PaymentMethodCreateParams | ||
| import com.stripe.android.model.SetupIntent | ||
| import com.stripe.android.model.StripeIntent | ||
| import com.stripe.android.ui.core.Amount | ||
| import com.stripe.android.ui.core.FieldValuesToParamsMapConverter | ||
| import com.stripe.android.ui.core.R | ||
| import com.stripe.android.ui.core.elements.CvcController | ||
| import com.stripe.android.ui.core.elements.createExpiryDateFormFieldValues | ||
| import com.stripe.android.uicore.elements.DateConfig | ||
| import com.stripe.android.uicore.elements.SimpleTextFieldController | ||
| import com.stripe.android.uicore.utils.mapAsStateFlow | ||
| import kotlinx.coroutines.flow.MutableStateFlow | ||
| import kotlinx.coroutines.flow.StateFlow | ||
| import kotlinx.coroutines.flow.collectLatest | ||
| import kotlinx.coroutines.flow.update | ||
| import kotlinx.coroutines.launch | ||
| import javax.inject.Inject | ||
|
|
@@ -48,8 +60,33 @@ internal class WalletViewModel @Inject constructor( | |
|
|
||
| val uiState: StateFlow<WalletUiState> = _uiState | ||
|
|
||
| val expiryDateController = SimpleTextFieldController( | ||
| textFieldConfig = DateConfig() | ||
| ) | ||
| val cvcController = CvcController( | ||
| cardBrandFlow = uiState.mapAsStateFlow { | ||
| (it.selectedItem as? ConsumerPaymentDetails.Card)?.brand ?: CardBrand.Unknown | ||
| } | ||
| ) | ||
|
|
||
| init { | ||
| loadPaymentDetails() | ||
|
|
||
| viewModelScope.launch { | ||
| expiryDateController.formFieldValue.collectLatest { input -> | ||
| _uiState.update { | ||
| it.copy(expiryDateInput = input) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| viewModelScope.launch { | ||
| cvcController.formFieldValue.collectLatest { input -> | ||
| _uiState.update { | ||
| it.copy(cvcInput = input) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun loadPaymentDetails() { | ||
|
|
@@ -84,12 +121,66 @@ internal class WalletViewModel @Inject constructor( | |
| fun onItemSelected(item: ConsumerPaymentDetails.PaymentDetails) { | ||
| if (item == uiState.value.selectedItem) return | ||
|
|
||
| expiryDateController.onRawValueChange("") | ||
| cvcController.onRawValueChange("") | ||
|
|
||
| _uiState.update { | ||
| it.copy(selectedItem = item) | ||
| } | ||
| } | ||
|
|
||
| fun onPrimaryButtonClicked() { | ||
| val paymentDetail = _uiState.value.selectedItem ?: return | ||
| _uiState.update { | ||
| it.copy(isProcessing = true) | ||
| } | ||
|
|
||
| viewModelScope.launch { | ||
| performPaymentConfirmation(paymentDetail) | ||
| } | ||
| } | ||
|
|
||
| private suspend fun performPaymentConfirmation( | ||
| selectedPaymentDetails: ConsumerPaymentDetails.PaymentDetails, | ||
| ) { | ||
| val card = selectedPaymentDetails as? ConsumerPaymentDetails.Card | ||
| val isExpired = card != null && card.isExpired | ||
|
|
||
| if (isExpired) { | ||
| performPaymentDetailsUpdate(selectedPaymentDetails).fold( | ||
| onSuccess = { result -> | ||
| val updatedPaymentDetails = result.paymentDetails.single { | ||
| it.id == selectedPaymentDetails.id | ||
| } | ||
| performPaymentConfirmation(updatedPaymentDetails) | ||
| }, | ||
| onFailure = { error -> | ||
| _uiState.update { | ||
| it.copy( | ||
| alertMessage = error.stripeErrorMessage(), | ||
| isProcessing = false | ||
| ) | ||
| } | ||
| } | ||
| ) | ||
| } else { | ||
| // Confirm payment with LinkConfirmationHandler | ||
|
There was a problem hiding this comment. |
||
| } | ||
| } | ||
|
|
||
| private suspend fun performPaymentDetailsUpdate( | ||
| selectedPaymentDetails: ConsumerPaymentDetails.PaymentDetails | ||
| ): Result<ConsumerPaymentDetails> { | ||
| val paymentMethodCreateParams = uiState.value.toPaymentMethodCreateParams() | ||
|
|
||
| val updateParams = ConsumerPaymentDetailsUpdateParams( | ||
| id = selectedPaymentDetails.id, | ||
| isDefault = selectedPaymentDetails.isDefault, | ||
| cardPaymentMethodCreateParamsMap = paymentMethodCreateParams.toParamMap() | ||
| ) | ||
|
|
||
| return linkAccountManager.updatePaymentDetails(updateParams) | ||
| } | ||
|
|
||
| fun onPayAnotherWayClicked() { | ||
| dismissWithResult(LinkActivityResult.Canceled(LinkActivityResult.Canceled.Reason.PayAnotherWay)) | ||
|
|
@@ -129,3 +220,12 @@ internal class WalletViewModel @Inject constructor( | |
| } | ||
| } | ||
| } | ||
|
|
||
| private fun WalletUiState.toPaymentMethodCreateParams(): PaymentMethodCreateParams { | ||
| val expiryDateValues = createExpiryDateFormFieldValues(expiryDateInput) | ||
| return FieldValuesToParamsMapConverter.transformToPaymentMethodCreateParams( | ||
| fieldValuePairs = expiryDateValues, | ||
| code = PaymentMethod.Type.Card.code, | ||
| requiresMandate = false | ||
| ) | ||
| } | ||
|
Comment on lines
+224
to
+231
There was a problem hiding this comment. The Spotted by Graphite Reviewer There was a problem hiding this comment. cvc is not part of |
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
isMissingExpiryDateInputcheck should only depend onexpiryDateInput.isComplete. IncludingcvcInput.isCompletein this check is incorrect since it's meant to validate expiry date completeness only. The check should be simplified to:Spotted by Graphite Reviewer
Is this helpful? React 👍 or 👎 to let us know.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
expired cards requires both updated expiryDate and cvc