Skip to content

feat(ad-hoc): (Dynamic Checkout) Refactor card payment UI #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vitalii-vanziak-cko merged 3 commits into from
Oct 23, 2025
Merged

feat(ad-hoc): (Dynamic Checkout) Refactor card payment UI #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76352d4
Apply CardTokenizationContent and style to DC
vitalii-vanziak-cko Oct 22, 2025
6cd1dd5
Remove legacy CardTokenization UI from DC
vitalii-vanziak-cko Oct 22, 2025
55cc702
Continue to edit in case of failure when card is not tokenized
vitalii-vanziak-cko Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ui/src/main/kotlin/com/processout/sdk/ui/card/tokenization/CardTokenizationViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,8 @@ internal class CardTokenizationViewModel private constructor(

fun onEvent(event: CardTokenizationEvent) = interactor.onEvent(event)

fun isTokenized() = interactor.state.value.tokenizedCard != null

private fun map(state: CardTokenizationInteractorState) = with(configuration) {
CardTokenizationViewModelState(
title = title ?: app.getString(R.string.po_card_tokenization_title),
Expand Down
2 changes: 1 addition & 1 deletion ui/src/main/kotlin/com/processout/sdk/ui/card/tokenization/screen/CardTokenizationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ internal object CardTokenizationScreen {
} ?: colors.icon.disabled
)

private val defaultScanButton: POButton.Style
val defaultScanButton: POButton.Style
@Composable get() = POButton.secondary2.let {
it.copy(
normal = it.normal.copy(
Expand Down
3 changes: 2 additions & 1 deletion ui/src/main/kotlin/com/processout/sdk/ui/checkout/DynamicCheckoutInteractor.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1077,7 +1077,8 @@ internal class DynamicCheckoutInteractor(
coroutineScope = interactorScope
) { request ->
interactorScope.launch {
eventDispatcher.send(request.toResponse(shouldContinue = false))
val shouldContinue = !cardTokenization.isTokenized()
eventDispatcher.send(request.toResponse(shouldContinue))
}
}
eventDispatcher.subscribeForRequest<PONativeAlternativePaymentMethodDefaultValuesRequest>(
Expand Down
6 changes: 3 additions & 3 deletions ui/src/main/kotlin/com/processout/sdk/ui/checkout/PODynamicCheckoutConfiguration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import com.google.android.gms.wallet.WalletConstants
import com.processout.sdk.api.model.request.POContact
import com.processout.sdk.api.model.request.POInvoiceRequest
import com.processout.sdk.ui.card.scanner.POCardScannerConfiguration
import com.processout.sdk.ui.card.tokenization.POCardTokenizationConfiguration.PreferredSchemeConfiguration
import com.processout.sdk.ui.checkout.PODynamicCheckoutConfiguration.GooglePayConfiguration.Environment
import com.processout.sdk.ui.core.annotation.ProcessOutInternalApi
import com.processout.sdk.ui.core.shared.image.PODrawableImage
import com.processout.sdk.ui.core.style.*
Expand Down Expand Up @@ -334,6 +332,7 @@ data class PODynamicCheckoutConfiguration(
* @param[label] Field label style.
* @param[field] Field style.
* @param[codeField] Code field style.
* @param[radioField] Radio field style.
* @param[radioButton] Radio button style.
* @param[checkbox] Checkbox style.
* @param[dropdownMenu] Dropdown menu style.
Expand All @@ -357,7 +356,8 @@ data class PODynamicCheckoutConfiguration(
val label: POTextStyle? = null,
val field: POFieldStyle? = null,
val codeField: POFieldStyle? = null,
val radioButton: PORadioButtonStyle? = null,
val radioField: PORadioFieldStyle? = null,
val radioButton: PORadioButtonStyle? = null, // TODO: remove
val checkbox: POCheckboxStyle? = null,
val dropdownMenu: PODropdownMenuStyle? = null,
val bodyText: POTextStyle? = null,
Expand Down
Loading