Do not overwrite radar options

paymentsheet/src/main/java/com/stripe/android/paymentelement/confirmation/attestation/AttestationConfirmationDefinition.kt

@@ -139,16 +139,24 @@ internal class AttestationConfirmationDefinition @Inject constructor(
     }
 
     private fun PaymentMethodConfirmationOption.New.attachToken(token: String?): PaymentMethodConfirmationOption {
+        val radarOptions = if (token != null) {
+            createParams.radarOptions?.copy(
+                androidVerificationObject = AndroidVerificationObject(
+                    androidVerificationToken = token
+                )
+            ) ?: RadarOptions(
+                hCaptchaToken = null,
+                androidVerificationObject = AndroidVerificationObject(
+                    androidVerificationToken = token
+                )
+            )
+        } else {
+            createParams.radarOptions
+        }
+
         return copy(
             createParams = createParams.copy(
-                radarOptions = token?.let {
-                    RadarOptions(
-                        hCaptchaToken = null,
-                        androidVerificationObject = AndroidVerificationObject(
-                            androidVerificationToken = it
-                        )
-                    )
-                }
+                radarOptions = radarOptions
             ),
             attestationComplete = true
         )

paymentsheet/src/main/java/com/stripe/android/paymentelement/confirmation/challenge/PassiveChallengeConfirmationDefinition.kt

@@ -124,16 +124,21 @@ internal class PassiveChallengeConfirmationDefinition @Inject constructor(
     }
 
     private fun PaymentMethodConfirmationOption.New.attachToken(token: String?): PaymentMethodConfirmationOption {
+        val radarOptions = if (token != null) {
+            createParams.radarOptions?.copy(
+                hCaptchaToken = token
+            ) ?: RadarOptions(
+                hCaptchaToken = token,
+                androidVerificationObject = null
+            )
+        } else {
+            createParams.radarOptions
+        }
         return copy(
             createParams = createParams.copy(
-                radarOptions = token?.let {
-                    RadarOptions(
-                        hCaptchaToken = it,
-                        androidVerificationObject = null
-                    )
-                }
+                radarOptions = radarOptions
             ),
-            passiveChallengeComplete = true,
+            passiveChallengeComplete = true
         )
     }
 

paymentsheet/src/test/java/com/stripe/android/paymentelement/confirmation/attestation/AttestationConfirmationDefinitionTest.kt

@@ -267,6 +267,38 @@ internal class AttestationConfirmationDefinitionTest {
         assertThat(nextStepResult.arguments).isEqualTo(CONFIRMATION_PARAMETERS)
     }
 
+    @Test
+    fun `'toResult' should leave hCaptchaToken as is in RadarOptions for New option`() {
+        val definition = createAttestationConfirmationDefinition()
+        val testToken = "attestation_token"
+        val hCaptchaToken = "hcaptcha_token"
+
+        val result = definition.toResult(
+            confirmationOption = PAYMENT_METHOD_CONFIRMATION_OPTION_NEW.copy(
+                createParams = PAYMENT_METHOD_CONFIRMATION_OPTION_NEW.createParams.copy(
+                    radarOptions = RadarOptions(
+                        hCaptchaToken = hCaptchaToken,
+                        androidVerificationObject = null
+                    )
+                )
+            ),
+            confirmationArgs = CONFIRMATION_PARAMETERS,
+            deferredIntentConfirmationType = null,
+            result = AttestationActivityResult.Success(testToken),
+        )
+
+        val nextStepResult = result.asNextStep()
+        val option = nextStepResult.confirmationOption as PaymentMethodConfirmationOption.New
+
+        val expectedCreateParams = PAYMENT_METHOD_CONFIRMATION_OPTION_NEW.createParams.copy(
+            radarOptions = RadarOptions(
+                hCaptchaToken = hCaptchaToken,
+                androidVerificationObject = AndroidVerificationObject(testToken)
+            )
+        )
+        assertThat(option.createParams).isEqualTo(expectedCreateParams)
+    }
+
     @Test
     fun `'canConfirm' should return false when New option already has a token`() {
         val definition = createAttestationConfirmationDefinition()

paymentsheet/src/test/java/com/stripe/android/paymentelement/confirmation/challenge/PassiveChallengeConfirmationDefinitionTest.kt

@@ -420,7 +420,7 @@ internal class PassiveChallengeConfirmationDefinitionTest {
         val expectedCreateParams = PAYMENT_METHOD_CONFIRMATION_OPTION_NEW.createParams.copy(
             radarOptions = RadarOptions(
                 hCaptchaToken = testToken,
-                androidVerificationObject = null
+                androidVerificationObject = AndroidVerificationObject(attestationToken)
             )
         )
         assertThat(option.createParams).isEqualTo(expectedCreateParams)