@@ -99,6 +99,7 @@ internal class NativeAlternativePaymentInteractor(
9999
100100 private var paymentState: PONativeAlternativePaymentState = UNKNOWN
101101 private var latestDefaultValuesRequest: NativeAlternativePaymentDefaultValuesRequest ? = null
102+ private var latestWillSubmitParametersEvent: WillSubmitParameters ? = null
102103
103104 private var captureStartTimestamp = 0L
104105 private var capturePassedTimestamp = 0L
@@ -447,7 +448,12 @@ internal class NativeAlternativePaymentInteractor(
447448 )
448449 }
449450 POLogger .info(" Submitted: waiting for additional payment parameters." )
450- dispatch(DidSubmitParameters (additionalParametersExpected = true ))
451+ dispatch(
452+ event = DidSubmitParameters (
453+ parameters = latestWillSubmitParametersEvent?.parameters ? : emptyList(),
454+ additionalParametersExpected = true
455+ )
456+ )
451457 }
452458
453459 // endregion
@@ -621,7 +627,9 @@ internal class NativeAlternativePaymentInteractor(
621627 return @whenNextStep
622628 }
623629 POLogger .info(" Will submit payment parameters." )
624- dispatch(WillSubmitParameters (parameters = stateValue.fields.map { it.parameter }))
630+ val willSubmitParametersEvent = WillSubmitParameters (parameters = stateValue.fields.map { it.parameter })
631+ latestWillSubmitParametersEvent = willSubmitParametersEvent
632+ dispatch(willSubmitParametersEvent)
625633 val invalidFields = stateValue.fields.mapNotNull { it.validate() }
626634 if (invalidFields.isNotEmpty()) {
627635 val failure = ProcessOutResult .Failure (
@@ -943,7 +951,12 @@ internal class NativeAlternativePaymentInteractor(
943951 elements : List <Element >
944952 ) {
945953 POLogger .info(" All payment parameters has been submitted." )
946- dispatch(DidSubmitParameters (additionalParametersExpected = false ))
954+ dispatch(
955+ event = DidSubmitParameters (
956+ parameters = latestWillSubmitParametersEvent?.parameters ? : emptyList(),
957+ additionalParametersExpected = false
958+ )
959+ )
947960 POLogger .info(" Waiting for payment confirmation." )
948961 dispatch(WillWaitForPaymentConfirmation )
949962 val pendingStateValue = stateValue.toPendingStateValue(
0 commit comments