Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ internal class NativeAlternativePaymentInteractor(

private var paymentState: PONativeAlternativePaymentState = UNKNOWN
private var latestDefaultValuesRequest: NativeAlternativePaymentDefaultValuesRequest? = null
private var latestWillSubmitParametersEvent: WillSubmitParameters? = null

private var captureStartTimestamp = 0L
private var capturePassedTimestamp = 0L
Expand Down Expand Up @@ -447,7 +448,12 @@ internal class NativeAlternativePaymentInteractor(
)
}
POLogger.info("Submitted: waiting for additional payment parameters.")
dispatch(DidSubmitParameters(additionalParametersExpected = true))
dispatch(
event = DidSubmitParameters(
parameters = latestWillSubmitParametersEvent?.parameters ?: emptyList(),
additionalParametersExpected = true
)
)
}

//endregion
Expand Down Expand Up @@ -621,7 +627,9 @@ internal class NativeAlternativePaymentInteractor(
return@whenNextStep
}
POLogger.info("Will submit payment parameters.")
dispatch(WillSubmitParameters(parameters = stateValue.fields.map { it.parameter }))
val willSubmitParametersEvent = WillSubmitParameters(parameters = stateValue.fields.map { it.parameter })
latestWillSubmitParametersEvent = willSubmitParametersEvent
dispatch(willSubmitParametersEvent)
val invalidFields = stateValue.fields.mapNotNull { it.validate() }
if (invalidFields.isNotEmpty()) {
val failure = ProcessOutResult.Failure(
Expand Down Expand Up @@ -943,7 +951,12 @@ internal class NativeAlternativePaymentInteractor(
elements: List<Element>
) {
POLogger.info("All payment parameters has been submitted.")
dispatch(DidSubmitParameters(additionalParametersExpected = false))
dispatch(
event = DidSubmitParameters(
parameters = latestWillSubmitParametersEvent?.parameters ?: emptyList(),
additionalParametersExpected = false
)
)
POLogger.info("Waiting for payment confirmation.")
dispatch(WillWaitForPaymentConfirmation)
val pendingStateValue = stateValue.toPendingStateValue(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,12 @@ sealed class PONativeAlternativePaymentEvent {

/**
* Event is sent when parameters were submitted successfully.
* Inspect the associated value [additionalParametersExpected] to check whether additional user input is required.
*
* @param[parameters] Parameter definitions.
* @param[additionalParametersExpected] Indicates whether additional user input is required.
*/
data class DidSubmitParameters(
val parameters: List<PONativeAlternativePaymentElement.Form.Parameter>,
val additionalParametersExpected: Boolean
) : PONativeAlternativePaymentEvent()

Expand Down