Merge pull request #153 from veritrans/feat/CC_error_cvv

Error Card Dialogue Detail and Incorrect Flow when delete card.
veritrans · Feb 21, 2023 · b71d40d · b71d40d
2 parents 6c07522 + 3f7dd36
commit b71d40d
Show file tree

Hide file tree

Showing 8 changed files with 239 additions and 171 deletions.
diff --git a/...main/kotlin/com/midtrans/sdk/uikit/internal/presentation/creditcard/CreditCardActivity.kt b/...main/kotlin/com/midtrans/sdk/uikit/internal/presentation/creditcard/CreditCardActivity.kt
@@ -124,6 +124,7 @@ internal class CreditCardActivity : BaseActivity() {
     }
 
     private var onPromoReset: () -> Unit = {}
+    private var isCreditCardChanged = false
 
     private val savedTokenList: SnapshotStateList<FormData>? by lazy {
         creditCard?.savedTokens?.mapIndexed { index, savedToken ->
@@ -448,15 +449,30 @@ internal class CreditCardActivity : BaseActivity() {
                                     promoId = state.promoId
                                 )
                             } else {
-                                viewModel?.chargeUsingCreditCard(
-                                    formData = selectedFormData as SavedCreditCardFormData,
-                                    snapToken = snapToken,
-                                    cardCvv = state.cvv,
-                                    customerEmail = state.customerEmail.text,
-                                    transactionDetails = transactionDetails,
-                                    installmentTerm = installmentTerm,
-                                    promoId = state.promoId
-                                )
+                                if (savedTokenListState != null && savedTokenListState.size > 1) {
+                                    viewModel?.chargeUsingCreditCard(
+                                        formData = selectedFormData as SavedCreditCardFormData,
+                                        snapToken = snapToken,
+                                        cardCvv = state.cvv,
+                                        customerEmail = state.customerEmail.text,
+                                        transactionDetails = transactionDetails,
+                                        installmentTerm = installmentTerm,
+                                        promoId = state.promoId
+                                    )
+                                } else {
+                                    viewModel?.chargeUsingCreditCard(
+                                        transactionDetails = transactionDetails,
+                                        cardNumber = state.cardNumber,
+                                        cardExpiry = state.expiry,
+                                        cardCvv = state.cvv,
+                                        isSavedCard = state.isSavedCardChecked,
+                                        customerEmail = state.customerEmail.text,
+                                        customerPhone = state.customerPhone.text,
+                                        installmentTerm = installmentTerm,
+                                        snapToken = snapToken,
+                                        promoId = state.promoId
+                                    )
+                                }
                             }
                             isFirstInit = false
                         }
@@ -509,6 +525,10 @@ internal class CreditCardActivity : BaseActivity() {
                         )
                         savedTokenListState?.remove(it)
                         isDeleteConfirmationShownState = false
+                        isCreditCardChanged = true
+                        state.cardNumber = TextFieldValue()
+                        state.expiry = TextFieldValue()
+                        state.cvv = TextFieldValue()
                     }
                 },
                 onCancelClicked = {
@@ -759,23 +779,21 @@ internal class CreditCardActivity : BaseActivity() {
                             CustomerPhoneLayout(state = state)
                         }
 
-                        savedTokenListState?.let {
+                        if (savedTokenListState != null && savedTokenListState.size > 1) {
                             SavedCardLayout(
                                 viewModel = viewModel,
                                 isTransactionDenied = isTransactionDenied,
                                 state = state,
                                 selectedFormData = selectedFormData,
                                 isPointBankShownState = isPointBankShownState,
-                                savedTokenListState = it,
+                                savedTokenListState = savedTokenListState,
                                 bankCodeId = bankCodeState,
                                 onCardNumberValueChange = onCardNumberValueChange,
                                 onSavedCardRadioSelected = onSavedCardRadioSelected,
                                 onSavedCardPointBankCheckedChange = onSavedCardPointBankCheckedChange,
                                 onItemRemoveClicked = onItemRemoveClicked
                             )
-                        }
-
-                        if (savedTokenListState == null) {
+                        } else {
                             NormalCardFormLayout(
                                 state = state,
                                 isTransactionDenied = isTransactionDenied,
@@ -1017,6 +1035,11 @@ internal class CreditCardActivity : BaseActivity() {
             .observeOn(AndroidSchedulers.mainThread())
     }
 
+    override fun onBackPressed() {
+        if (isCreditCardChanged) setResult(UiKitConstants.ACTIVITY_CC_CHANGES)
+        super.onBackPressed()
+    }
+
     @Preview
     @Composable
     private fun ForPreview() {