From 85ae9935d8f65d684e757bc24bd19411fedbd713 Mon Sep 17 00:00:00 2001
From: Twig <Twigz@users.noreply.github.com>
Date: Thu, 23 Apr 2026 16:24:38 -0400
Subject: [PATCH 01/57] Initial attempt at the CARFD integration

---
 crypto-onramp/api/crypto-onramp.api           | 139 ++++++++---
 crypto-onramp/build.gradle                    |   2 +
 crypto-onramp/res/values/themes.xml           |   2 +-
 crypto-onramp/src/main/AndroidManifest.xml    |  13 +-
 .../crypto/onramp/OnrampCoordinator.kt        |  32 +++
 .../android/crypto/onramp/OnrampInteractor.kt | 163 ++++++++++++
 .../onramp/OnrampPresenterCoordinator.kt      |  37 +++
 .../onramp/analytics/OnrampAnalyticsEvent.kt  |  21 +-
 .../crypto/onramp/model/CrsCarfDeclaration.kt |  29 +++
 .../crypto/onramp/model/EuIdentifiers.kt      | 236 ++++++++++++++++++
 .../onramp/model/KycCollectionRequest.kt      |   9 +
 .../android/crypto/onramp/model/KycInfo.kt    |  28 ++-
 .../onramp/model/KycRetrieveResponse.kt       |   4 +-
 .../crypto/onramp/model/OnrampCallbacks.kt    |  10 +
 .../model/OnrampCollectEuIdentifiersResult.kt |  25 ++
 .../model/OnrampCrsCarfDeclarationResult.kt   |  37 +++
 .../OnrampGetIdentifierRequirementsResult.kt  |  25 ++
 .../repositories/CryptoApiRepository.kt       |  96 +++++++
 .../onramp/ui/CrsCarfDeclarationActivity.kt   | 115 +++++++++
 .../crypto/onramp/CryptoApiRepositoryTest.kt  | 235 +++++++++++++++--
 .../crypto/onramp/OnrampInteractorTest.kt     | 114 ++++++++-
 paymentsheet/api/paymentsheet.api             |   6 +
 .../onramp/ui/CrsCarfDeclarationScreen.kt     | 104 ++++++++
 23 files changed, 1407 insertions(+), 75 deletions(-)
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/CrsCarfDeclaration.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/EuIdentifiers.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/ui/CrsCarfDeclarationActivity.kt
 create mode 100644 paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 715e9837cfb..a3a907bf929 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -5,9 +5,11 @@ public final class com/stripe/android/crypto/onramp/OnrampCoordinator {
 	public static final field $stable I
 	public final fun attachKycInfo (Lcom/stripe/android/crypto/onramp/model/KycInfo;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun authenticateUserWithToken (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun collectEuIdentifiers (Lcom/stripe/android/crypto/onramp/model/EuIdentifiers;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun configure (Lcom/stripe/android/crypto/onramp/model/OnrampConfiguration;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun createCryptoPaymentToken (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun createPresenter (Landroidx/activity/ComponentActivity;)Lcom/stripe/android/crypto/onramp/OnrampCoordinator$Presenter;
+	public final fun getIdentifierRequirements (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun hasLinkAccount (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun logOut (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun registerLinkUser (Lcom/stripe/android/crypto/onramp/model/LinkUserInfo;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
@@ -26,6 +28,7 @@ public final class com/stripe/android/crypto/onramp/OnrampCoordinator$Presenter
 	public final fun authorize (Ljava/lang/String;)V
 	public final fun collectPaymentMethod (Lcom/stripe/android/crypto/onramp/model/PaymentMethodSelection;)V
 	public final fun performCheckout (Ljava/lang/String;)V
+	public final fun presentCrsCarfDeclaration ()V
 	public final fun verifyIdentity ()V
 	public final fun verifyKycInfo (Lcom/stripe/android/paymentsheet/PaymentSheet$Address;)V
 	public static synthetic fun verifyKycInfo$default (Lcom/stripe/android/crypto/onramp/OnrampCoordinator$Presenter;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;ILjava/lang/Object;)V
@@ -76,59 +79,45 @@ public final class com/stripe/android/crypto/onramp/model/CryptoNetwork$Companio
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public final class com/stripe/android/crypto/onramp/model/KycInfo {
+public final class com/stripe/android/crypto/onramp/model/EuIdentifier {
+	public static final field $stable I
+	public fun <init> ()V
+	public final fun country (Lcom/stripe/android/core/model/CountryCode;)Lcom/stripe/android/crypto/onramp/model/EuIdentifier;
+	public final fun identifier (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/EuIdentifier;
+}
+
+public final class com/stripe/android/crypto/onramp/model/EuIdentifiers {
+	public static final field $stable I
+	public fun <init> ()V
+	public final fun identifiersCarf (Ljava/util/List;)Lcom/stripe/android/crypto/onramp/model/EuIdentifiers;
+	public final fun identifiersMica (Ljava/util/List;)Lcom/stripe/android/crypto/onramp/model/EuIdentifiers;
+}
+
+public final class com/stripe/android/crypto/onramp/model/IdentifierRequirements {
 	public static final field $stable I
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;)V
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAddress ()Lcom/stripe/android/paymentsheet/PaymentSheet$Address;
-	public final fun getDateOfBirth ()Lcom/stripe/android/model/DateOfBirth;
-	public final fun getFirstName ()Ljava/lang/String;
-	public final fun getIdNumber ()Ljava/lang/String;
-	public final fun getLastName ()Ljava/lang/String;
+	public final fun getMissingIdentifiersCarf ()Ljava/util/List;
+	public final fun getMissingIdentifiersMica ()Ljava/util/List;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/stripe/android/crypto/onramp/model/KycRetrieveResponse : android/os/Parcelable {
+public final class com/stripe/android/crypto/onramp/model/KycInfo {
 	public static final field $stable I
-	public static final field CREATOR Landroid/os/Parcelable$Creator;
-	public static final field Companion Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Lcom/stripe/android/model/DateOfBirth;
-	public final fun component6 ()Lcom/stripe/android/paymentsheet/PaymentSheet$Address;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;)Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse;
-	public static synthetic fun copy$default (Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;ILjava/lang/Object;)Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse;
-	public final fun describeContents ()I
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;Lcom/stripe/android/core/model/CountryCode;Ljava/lang/String;Ljava/util/List;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;Lcom/stripe/android/core/model/CountryCode;Ljava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAddress ()Lcom/stripe/android/paymentsheet/PaymentSheet$Address;
+	public final fun getBirthCity ()Ljava/lang/String;
+	public final fun getBirthCountry ()Lcom/stripe/android/core/model/CountryCode;
 	public final fun getDateOfBirth ()Lcom/stripe/android/model/DateOfBirth;
 	public final fun getFirstName ()Ljava/lang/String;
-	public final fun getIdNumberLastFour ()Ljava/lang/String;
-	public final fun getIdType ()Ljava/lang/String;
+	public final fun getIdNumber ()Ljava/lang/String;
 	public final fun getLastName ()Ljava/lang/String;
+	public final fun getNationalities ()Ljava/util/List;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
-	public final fun writeToParcel (Landroid/os/Parcel;I)V
-}
-
-public final synthetic class com/stripe/android/crypto/onramp/model/KycRetrieveResponse$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field $stable I
-	public static final field INSTANCE Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/stripe/android/crypto/onramp/model/KycRetrieveResponse$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
 public final class com/stripe/android/crypto/onramp/model/LinkUserInfo : android/os/Parcelable {
@@ -146,6 +135,15 @@ public final class com/stripe/android/crypto/onramp/model/LinkUserInfo : android
 	public final fun writeToParcel (Landroid/os/Parcel;I)V
 }
 
+public final class com/stripe/android/crypto/onramp/model/MissingEuIdentifiers {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getMissingIdentifiersCarf ()Ljava/util/List;
+	public final fun getMissingIdentifiersMica ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public abstract interface class com/stripe/android/crypto/onramp/model/OnrampAttachKycInfoResult {
 }
 
@@ -189,6 +187,7 @@ public final class com/stripe/android/crypto/onramp/model/OnrampCallbacks {
 	public final fun authorizeCallback (Lcom/stripe/android/crypto/onramp/model/OnrampAuthorizeCallback;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
 	public final fun checkoutCallback (Lcom/stripe/android/crypto/onramp/model/OnrampCheckoutCallback;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
 	public final fun collectPaymentCallback (Lcom/stripe/android/crypto/onramp/model/OnrampCollectPaymentMethodCallback;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
+	public final fun crsCarfDeclarationCallback (Lcom/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationCallback;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
 	public final fun googlePayIsReadyCallback (Lkotlin/jvm/functions/Function1;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
 	public final fun onrampSessionClientSecretProvider (Lkotlin/jvm/functions/Function2;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
 	public final fun verifyIdentityCallback (Lcom/stripe/android/crypto/onramp/model/OnrampVerifyIdentityCallback;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
@@ -215,6 +214,19 @@ public final class com/stripe/android/crypto/onramp/model/OnrampCheckoutResult$F
 	public final fun getError ()Ljava/lang/Throwable;
 }
 
+public abstract interface class com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult {
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult$Completed : com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult {
+	public static final field $stable I
+	public final fun getResult ()Lcom/stripe/android/crypto/onramp/model/SubmitEuIdentifiersResult;
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult$Failed : com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult {
+	public static final field $stable I
+	public final fun getError ()Ljava/lang/Throwable;
+}
+
 public abstract interface class com/stripe/android/crypto/onramp/model/OnrampCollectPaymentMethodCallback {
 	public abstract fun onResult (Lcom/stripe/android/crypto/onramp/model/OnrampCollectPaymentMethodResult;)V
 }
@@ -274,6 +286,39 @@ public final class com/stripe/android/crypto/onramp/model/OnrampCreateCryptoPaym
 	public final fun getError ()Ljava/lang/Throwable;
 }
 
+public abstract interface class com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationCallback {
+	public abstract fun onResult (Lcom/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult;)V
+}
+
+public abstract interface class com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult {
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult$Cancelled : com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult {
+	public static final field $stable I
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult$Confirmed : com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult {
+	public static final field $stable I
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult$Failed : com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult {
+	public static final field $stable I
+	public final fun getError ()Ljava/lang/Throwable;
+}
+
+public abstract interface class com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult {
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult$Completed : com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult {
+	public static final field $stable I
+	public final fun getRequirements ()Lcom/stripe/android/crypto/onramp/model/IdentifierRequirements;
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult$Failed : com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult {
+	public static final field $stable I
+	public final fun getError ()Ljava/lang/Throwable;
+}
+
 public abstract interface class com/stripe/android/crypto/onramp/model/OnrampHasLinkAccountResult {
 }
 
@@ -454,3 +499,19 @@ public final class com/stripe/android/crypto/onramp/model/PaymentMethodType : ja
 	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/PaymentMethodType;
 }
 
+public final class com/stripe/android/crypto/onramp/model/SubmitEuIdentifiersResult {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getErrors ()Ljava/util/List;
+	public final fun getMissingIdentifiers ()Lcom/stripe/android/crypto/onramp/model/MissingEuIdentifiers;
+	public final fun getValid ()Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/ui/ComposableSingletons$CrsCarfDeclarationActivityKt {
+	public static final field INSTANCE Lcom/stripe/android/crypto/onramp/ui/ComposableSingletons$CrsCarfDeclarationActivityKt;
+	public fun <init> ()V
+	public final fun getLambda$-1481598038$crypto_onramp_release ()Lkotlin/jvm/functions/Function3;
+}
+
diff --git a/crypto-onramp/build.gradle b/crypto-onramp/build.gradle
index 76c122dd521..908b40871da 100644
--- a/crypto-onramp/build.gradle
+++ b/crypto-onramp/build.gradle
@@ -22,6 +22,8 @@ dependencies {
 
     api libs.compose.ui
     implementation libs.compose.activity
+    implementation libs.compose.foundation
+    implementation libs.compose.material
 
     implementation libs.dagger
 
diff --git a/crypto-onramp/res/values/themes.xml b/crypto-onramp/res/values/themes.xml
index e29d8e99c79..ad123d332cd 100644
--- a/crypto-onramp/res/values/themes.xml
+++ b/crypto-onramp/res/values/themes.xml
@@ -12,7 +12,7 @@
         <item name="android:taskCloseExitAnimation">@null</item>
     </style>
 
-    <style name="StripeVerifyKycTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="StripeOnrampTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowAnimationStyle">@style/Stripe.NoWindowAnims</item>
diff --git a/crypto-onramp/src/main/AndroidManifest.xml b/crypto-onramp/src/main/AndroidManifest.xml
index 9a80c959fd7..1e67bdbdbe8 100644
--- a/crypto-onramp/src/main/AndroidManifest.xml
+++ b/crypto-onramp/src/main/AndroidManifest.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
-    <activity
-        android:name="com.stripe.android.crypto.onramp.ui.VerifyKycInfoActivity"
-        android:theme="@style/StripeVerifyKycTheme"
-        android:exported="false" />
+        <activity
+            android:name="com.stripe.android.crypto.onramp.ui.VerifyKycInfoActivity"
+            android:theme="@style/StripeOnrampTheme"
+            android:exported="false" />
+
+        <activity
+            android:name="com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivity"
+            android:theme="@style/StripeOnrampTheme"
+            android:exported="false" />
     </application>
 </manifest>
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
index 1270cb1156a..f667947db48 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
@@ -6,13 +6,16 @@ import androidx.lifecycle.SavedStateHandle
 import com.stripe.android.crypto.onramp.di.OnrampComponentHolder
 import com.stripe.android.crypto.onramp.di.OnrampPresenterComponent
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
+import com.stripe.android.crypto.onramp.model.EuIdentifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampCallbacks
+import com.stripe.android.crypto.onramp.model.OnrampCollectEuIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
+import com.stripe.android.crypto.onramp.model.OnrampGetIdentifierRequirementsResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
@@ -31,6 +34,7 @@ import javax.inject.Inject
  * @param presenterComponentFactory Factory for creating presenter components.
  */
 @ExperimentalCryptoOnramp
+@Suppress("TooManyFunctions")
 class OnrampCoordinator @Inject internal constructor(
     private val interactor: OnrampInteractor,
     private val presenterComponentFactory: OnrampPresenterComponent.Factory,
@@ -111,6 +115,26 @@ class OnrampCoordinator @Inject internal constructor(
         return interactor.attachKycInfo(info)
     }
 
+    /**
+     * Retrieves identifier requirements for the current Link user.
+     * Requires an authenticated Link user.
+     */
+    suspend fun getIdentifierRequirements(): OnrampGetIdentifierRequirementsResult {
+        return interactor.getIdentifierRequirements()
+    }
+
+    /**
+     * Submits EU identifiers for the current Link user.
+     * Requires an authenticated Link user.
+     *
+     * @param identifiers The EU identifier payload to submit.
+     */
+    suspend fun collectEuIdentifiers(
+        identifiers: EuIdentifiers
+    ): OnrampCollectEuIdentifiersResult {
+        return interactor.collectEuIdentifiers(identifiers)
+    }
+
     /**
      * Creates a crypto payment token for the payment method currently selected on the coordinator.
      * Call after a successful [Presenter.collectPaymentMethod].
@@ -205,6 +229,14 @@ class OnrampCoordinator @Inject internal constructor(
         ) {
             coordinator.performCheckout(onrampSessionId = onrampSessionId)
         }
+
+        /**
+         * Presents the CRS/CARF declaration screen and records acceptance when the user confirms.
+         * The result will be delivered through the CRS/CARF declaration callback provided in OnrampCallbacks.
+         */
+        fun presentCrsCarfDeclaration() {
+            coordinator.presentCrsCarfDeclaration()
+        }
     }
 
     /**
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
index e40e71e9173..76b18d33368 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
@@ -14,17 +14,22 @@ import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.exception.MissingPaymentMethodException
 import com.stripe.android.crypto.onramp.exception.PaymentFailedException
+import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
+import com.stripe.android.crypto.onramp.model.EuIdentifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampAuthorizeResult
 import com.stripe.android.crypto.onramp.model.OnrampCheckoutResult
+import com.stripe.android.crypto.onramp.model.OnrampCollectEuIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
+import com.stripe.android.crypto.onramp.model.OnrampCrsCarfDeclarationResult
+import com.stripe.android.crypto.onramp.model.OnrampGetIdentifierRequirementsResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
@@ -39,6 +44,8 @@ import com.stripe.android.crypto.onramp.model.PaymentMethodDisplayData
 import com.stripe.android.crypto.onramp.model.PaymentMethodType
 import com.stripe.android.crypto.onramp.model.googlePayKycInfo
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityResult
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationScreenAction
 import com.stripe.android.crypto.onramp.ui.KycRefreshScreenAction
 import com.stripe.android.crypto.onramp.ui.VerifyKycActivityResult
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
@@ -329,6 +336,102 @@ internal class OnrampInteractor @Inject constructor(
             )
     }
 
+    suspend fun getIdentifierRequirements(): OnrampGetIdentifierRequirementsResult {
+        val secret = consumerSessionClientSecret()
+        if (secret == null) {
+            val error = MissingConsumerSecretException()
+            analyticsService?.track(
+                OnrampAnalyticsEvent.ErrorOccurred(
+                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.GetIdentifierRequirements,
+                    error = error,
+                )
+            )
+            return OnrampGetIdentifierRequirementsResult.Failed(error)
+        }
+
+        return cryptoApiRepository.getIdentifierRequirements(secret)
+            .fold(
+                onSuccess = { requirements ->
+                    analyticsService?.track(OnrampAnalyticsEvent.IdentifierRequirementsRetrieved)
+                    OnrampGetIdentifierRequirementsResult.Completed(requirements)
+                },
+                onFailure = { error ->
+                    analyticsService?.track(
+                        OnrampAnalyticsEvent.ErrorOccurred(
+                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.GetIdentifierRequirements,
+                            error = error,
+                        )
+                    )
+                    OnrampGetIdentifierRequirementsResult.Failed(error)
+                }
+            )
+    }
+
+    suspend fun collectEuIdentifiers(identifiers: EuIdentifiers): OnrampCollectEuIdentifiersResult {
+        val secret = consumerSessionClientSecret()
+        if (secret == null) {
+            val error = MissingConsumerSecretException()
+            analyticsService?.track(
+                OnrampAnalyticsEvent.ErrorOccurred(
+                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.CollectEuIdentifiers,
+                    error = error,
+                )
+            )
+            return OnrampCollectEuIdentifiersResult.Failed(error)
+        }
+
+        return cryptoApiRepository.collectEuIdentifiers(identifiers, secret)
+            .fold(
+                onSuccess = { result ->
+                    analyticsService?.track(OnrampAnalyticsEvent.EuIdentifiersSubmitted)
+                    OnrampCollectEuIdentifiersResult.Completed(result)
+                },
+                onFailure = { error ->
+                    analyticsService?.track(
+                        OnrampAnalyticsEvent.ErrorOccurred(
+                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.CollectEuIdentifiers,
+                            error = error,
+                        )
+                    )
+                    OnrampCollectEuIdentifiersResult.Failed(error)
+                }
+            )
+    }
+
+    suspend fun startCrsCarfDeclaration(): OnrampStartCrsCarfDeclarationResult {
+        val secret = consumerSessionClientSecret()
+        if (secret == null) {
+            val error = MissingConsumerSecretException()
+            analyticsService?.track(
+                OnrampAnalyticsEvent.ErrorOccurred(
+                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.ConfirmCrsCarfDeclaration,
+                    error = error,
+                )
+            )
+            return OnrampStartCrsCarfDeclarationResult.Failed(error)
+        }
+
+        return cryptoApiRepository.retrieveCrsCarfDeclaration(secret)
+            .fold(
+                onSuccess = { declaration ->
+                    analyticsService?.track(OnrampAnalyticsEvent.CrsCarfDeclarationStarted)
+                    OnrampStartCrsCarfDeclarationResult.Completed(
+                        declaration = declaration,
+                        appearance = state.value.configurationState?.appearance
+                    )
+                },
+                onFailure = { error ->
+                    analyticsService?.track(
+                        OnrampAnalyticsEvent.ErrorOccurred(
+                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.ConfirmCrsCarfDeclaration,
+                            error = error,
+                        )
+                    )
+                    OnrampStartCrsCarfDeclarationResult.Failed(error)
+                }
+            )
+    }
+
     suspend fun startIdentityVerification(): OnrampStartVerificationResult {
         val secret = consumerSessionClientSecret()
         if (secret == null) {
@@ -693,6 +796,49 @@ internal class OnrampInteractor @Inject constructor(
         }
     }
 
+    suspend fun handleCrsCarfDeclarationResult(
+        result: CrsCarfDeclarationActivityResult,
+    ): OnrampCrsCarfDeclarationResult = when (result.action) {
+        is CrsCarfDeclarationScreenAction.Cancelled -> {
+            OnrampCrsCarfDeclarationResult.Cancelled()
+        }
+        is CrsCarfDeclarationScreenAction.Confirm -> {
+            val secret = consumerSessionClientSecret()
+
+            if (secret != null) {
+                val confirmResult = cryptoApiRepository.confirmCrsCarfDeclaration(secret)
+
+                confirmResult.fold(
+                    onSuccess = {
+                        analyticsService?.track(OnrampAnalyticsEvent.CrsCarfDeclarationConfirmed)
+
+                        OnrampCrsCarfDeclarationResult.Confirmed()
+                    },
+                    onFailure = { error ->
+                        analyticsService?.track(
+                            OnrampAnalyticsEvent.ErrorOccurred(
+                                operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.ConfirmCrsCarfDeclaration,
+                                error = error,
+                            )
+                        )
+
+                        OnrampCrsCarfDeclarationResult.Failed(error)
+                    }
+                )
+            } else {
+                val error = MissingConsumerSecretException()
+                analyticsService?.track(
+                    OnrampAnalyticsEvent.ErrorOccurred(
+                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.ConfirmCrsCarfDeclaration,
+                        error = error,
+                    )
+                )
+
+                OnrampCrsCarfDeclarationResult.Failed(error)
+            }
+        }
+    }
+
     private fun consumerSessionClientSecret(): String? =
         _state.value.linkControllerState?.internalLinkAccount?.consumerSessionClientSecret
             ?: linkController.state(application).value.internalLinkAccount?.consumerSessionClientSecret
@@ -1001,6 +1147,23 @@ internal sealed interface OnrampStartKycVerificationResult {
     ) : OnrampStartKycVerificationResult
 }
 
+internal sealed interface OnrampStartCrsCarfDeclarationResult {
+    /**
+     * Starting CRS/CARF declaration presentation completed successfully.
+     */
+    class Completed internal constructor(
+        val declaration: CrsCarfDeclaration,
+        val appearance: LinkAppearance?
+    ) : OnrampStartCrsCarfDeclarationResult
+
+    /**
+     * Starting CRS/CARF declaration presentation failed.
+     */
+    class Failed internal constructor(
+        val error: Throwable
+    ) : OnrampStartCrsCarfDeclarationResult
+}
+
 internal fun LinkController.PaymentMethodType.toDisplayType(): PaymentMethodDisplayData.Type {
     return when (this) {
         LinkController.PaymentMethodType.Card ->
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampPresenterCoordinator.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampPresenterCoordinator.kt
index 86e7dff7940..e77dcdbeffe 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampPresenterCoordinator.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampPresenterCoordinator.kt
@@ -16,11 +16,15 @@ import com.stripe.android.crypto.onramp.exception.PaymentFailedException
 import com.stripe.android.crypto.onramp.model.OnrampCallbacks
 import com.stripe.android.crypto.onramp.model.OnrampCheckoutResult
 import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
+import com.stripe.android.crypto.onramp.model.OnrampCrsCarfDeclarationResult
 import com.stripe.android.crypto.onramp.model.OnrampStartVerificationResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodSelection
 import com.stripe.android.crypto.onramp.model.PaymentMethodType
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityArgs
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityContract
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityResult
 import com.stripe.android.crypto.onramp.ui.VerifyKycActivityArgs
 import com.stripe.android.crypto.onramp.ui.VerifyKycActivityResult
 import com.stripe.android.crypto.onramp.ui.VerifyKycInfoActivityContract
@@ -93,6 +97,13 @@ internal class OnrampPresenterCoordinator @Inject constructor(
             callback = ::handleVerifyKycResult
         )
 
+    private val crsCarfDeclarationResultLauncher: ActivityResultLauncher<CrsCarfDeclarationActivityArgs> =
+        activity.activityResultRegistry.register(
+            key = "OnrampPresenterCoordinator_CrsCarfResultLauncher($onrampCallbackIdentifier)",
+            contract = CrsCarfDeclarationActivityContract(),
+            callback = ::handleCrsCarfDeclarationResult
+        )
+
     init {
         // Observe Link controller state
         lifecycleOwner.lifecycleScope.launch {
@@ -115,6 +126,7 @@ internal class OnrampPresenterCoordinator @Inject constructor(
                 override fun onDestroy(owner: LifecycleOwner) {
                     googlePayActivityResultLauncher.unregister()
                     verifyKycResultLauncher.unregister()
+                    crsCarfDeclarationResultLauncher.unregister()
 
                     if (activity.isFinishing) {
                         OnrampCallbackReferences.remove(onrampCallbackIdentifier)
@@ -165,6 +177,23 @@ internal class OnrampPresenterCoordinator @Inject constructor(
         }
     }
 
+    fun presentCrsCarfDeclaration() {
+        coroutineScope.launch {
+            when (val result = interactor.startCrsCarfDeclaration()) {
+                is OnrampStartCrsCarfDeclarationResult.Completed -> {
+                    crsCarfDeclarationResultLauncher.launch(
+                        CrsCarfDeclarationActivityArgs(result.declaration, result.appearance)
+                    )
+                }
+                is OnrampStartCrsCarfDeclarationResult.Failed -> {
+                    onrampCallbacksState.crsCarfDeclarationCallback?.onResult(
+                        OnrampCrsCarfDeclarationResult.Failed(result.error)
+                    )
+                }
+            }
+        }
+    }
+
     fun collectPaymentMethod(selection: PaymentMethodSelection) {
         interactor.onCollectPaymentMethod(selection.type)
 
@@ -290,6 +319,14 @@ internal class OnrampPresenterCoordinator @Inject constructor(
         }
     }
 
+    private fun handleCrsCarfDeclarationResult(result: CrsCarfDeclarationActivityResult) {
+        coroutineScope.launch {
+            onrampCallbacksState.crsCarfDeclarationCallback?.onResult(
+                interactor.handleCrsCarfDeclarationResult(result)
+            )
+        }
+    }
+
     private fun googlePayConfig(): GooglePayPaymentMethodLauncher.Config? =
         interactor.state.value.configurationState?.googlePayConfig
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
index 667305d4bfb..2b04f374367 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
@@ -73,6 +73,22 @@ internal sealed class OnrampAnalyticsEvent(
         name = "kyc_info_verification_completed"
     )
 
+    data object IdentifierRequirementsRetrieved : OnrampAnalyticsEvent(
+        name = "identifier_requirements_retrieved"
+    )
+
+    data object EuIdentifiersSubmitted : OnrampAnalyticsEvent(
+        name = "eu_identifiers_submitted"
+    )
+
+    data object CrsCarfDeclarationStarted : OnrampAnalyticsEvent(
+        name = "crs_carf_declaration_started"
+    )
+
+    data object CrsCarfDeclarationConfirmed : OnrampAnalyticsEvent(
+        name = "crs_carf_declaration_confirmed"
+    )
+
     class WalletRegistered(
         network: CryptoNetwork
     ) : OnrampAnalyticsEvent(
@@ -161,7 +177,10 @@ internal sealed class OnrampAnalyticsEvent(
             CreateCryptoPaymentToken("create_crypto_payment_token"),
             PerformCheckout("perform_checkout"),
             LogOut("log_out"),
-            VerifyKyc("verify_kyc_info")
+            VerifyKyc("verify_kyc_info"),
+            GetIdentifierRequirements("get_identifier_requirements"),
+            CollectEuIdentifiers("collect_eu_identifiers"),
+            ConfirmCrsCarfDeclaration("confirm_crs_carf_declaration")
         }
     }
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/CrsCarfDeclaration.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/CrsCarfDeclaration.kt
new file mode 100644
index 00000000000..145739aa2bb
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/CrsCarfDeclaration.kt
@@ -0,0 +1,29 @@
+package com.stripe.android.crypto.onramp.model
+
+import dev.drewhamilton.poko.Poko
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/**
+ * CRS/CARF declaration text that should be shown before recording acceptance.
+ */
+@Poko
+internal class CrsCarfDeclaration(
+    val text: String,
+    val version: String
+)
+
+@Serializable
+internal data class CrsCarfDeclarationResponse(
+    @SerialName("text")
+    val text: String,
+    @SerialName("version")
+    val version: String,
+) {
+    fun toDeclaration(): CrsCarfDeclaration {
+        return CrsCarfDeclaration(
+            text = text,
+            version = version
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/EuIdentifiers.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/EuIdentifiers.kt
new file mode 100644
index 00000000000..03816b7243a
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/EuIdentifiers.kt
@@ -0,0 +1,236 @@
+package com.stripe.android.crypto.onramp.model
+
+import com.stripe.android.core.model.CountryCode
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import dev.drewhamilton.poko.Poko
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.JsonPrimitive
+import kotlinx.serialization.json.booleanOrNull
+import kotlinx.serialization.json.contentOrNull
+
+/**
+ * EU identifier payload submitted to the Crypto Onramp API.
+ *
+ * @property identifiersMica MiCA identifiers for the consumer.
+ * @property identifiersCarf CARF identifiers for the consumer.
+ */
+@ExperimentalCryptoOnramp
+class EuIdentifiers {
+    private var identifiersMica: List<EuIdentifier>? = null
+    private var identifiersCarf: List<EuIdentifier>? = null
+
+    /**
+     * Sets MiCA identifiers for the consumer.
+     */
+    fun identifiersMica(identifiersMica: List<EuIdentifier>?) = apply {
+        this.identifiersMica = identifiersMica
+    }
+
+    /**
+     * Sets CARF identifiers for the consumer.
+     */
+    fun identifiersCarf(identifiersCarf: List<EuIdentifier>?) = apply {
+        this.identifiersCarf = identifiersCarf
+    }
+
+    internal class State(
+        val identifiersMica: List<EuIdentifier.State>?,
+        val identifiersCarf: List<EuIdentifier.State>?
+    )
+
+    internal fun build(): State {
+        return State(
+            identifiersMica = identifiersMica?.map { it.build() },
+            identifiersCarf = identifiersCarf?.map { it.build() }
+        )
+    }
+}
+
+/**
+ * A country-scoped EU identifier.
+ *
+ * @property country ISO 3166-1 alpha-2 country code associated with the identifier.
+ * @property identifier The identifier value.
+ */
+@ExperimentalCryptoOnramp
+class EuIdentifier {
+    private var country: CountryCode? = null
+    private var identifier: String? = null
+
+    /**
+     * Sets the ISO 3166-1 alpha-2 country code associated with the identifier.
+     */
+    fun country(country: CountryCode) = apply {
+        this.country = country
+    }
+
+    /**
+     * Sets the identifier value.
+     */
+    fun identifier(identifier: String) = apply {
+        this.identifier = identifier
+    }
+
+    internal class State(
+        val country: CountryCode,
+        val identifier: String
+    )
+
+    internal fun build(): State {
+        return State(
+            country = requireNotNull(country) {
+                "country must not be null"
+            },
+            identifier = requireNotNull(identifier) {
+                "identifier must not be null"
+            }
+        )
+    }
+}
+
+/**
+ * Identifier requirements returned by the Crypto Onramp API.
+ *
+ * @property missingIdentifiersMica Missing MiCA identifier field names.
+ * @property missingIdentifiersCarf Missing CARF identifier field names.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class IdentifierRequirements internal constructor(
+    val missingIdentifiersMica: List<String>,
+    val missingIdentifiersCarf: List<String>
+)
+
+/**
+ * Missing EU identifiers returned by the submit EU identifiers API.
+ *
+ * @property missingIdentifiersMica Missing MiCA identifier field names.
+ * @property missingIdentifiersCarf Missing CARF identifier field names.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class MissingEuIdentifiers internal constructor(
+    val missingIdentifiersMica: List<String>,
+    val missingIdentifiersCarf: List<String>
+)
+
+/**
+ * Validation result returned after submitting EU identifiers.
+ *
+ * @property valid Whether the submitted identifiers were accepted.
+ * @property missingIdentifiers Missing identifiers, if more are required.
+ * @property errors Invalid country codes for identifiers that were rejected.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class SubmitEuIdentifiersResult internal constructor(
+    val valid: Boolean,
+    val missingIdentifiers: MissingEuIdentifiers?,
+    val errors: List<String>?
+)
+
+@Serializable
+internal data class EuIdentifiersRequest(
+    @SerialName("credentials")
+    val credentials: CryptoCustomerRequestParams.Credentials,
+    @SerialName("identifiers_mica")
+    val identifiersMica: List<EuIdentifierRequest>? = null,
+    @SerialName("identifiers_carf")
+    val identifiersCarf: List<EuIdentifierRequest>? = null
+)
+
+@Serializable
+internal data class EuIdentifierRequest(
+    @SerialName("country")
+    val country: String,
+    @SerialName("identifier")
+    val identifier: String
+)
+
+@Serializable
+internal data class IdentifierRequirementsResponse(
+    @SerialName("missing_identifiers_mica")
+    val missingIdentifiersMica: List<String> = emptyList(),
+    @SerialName("missing_identifiers_carf")
+    val missingIdentifiersCarf: List<String> = emptyList(),
+) {
+    fun toIdentifierRequirements(): IdentifierRequirements {
+        return IdentifierRequirements(
+            missingIdentifiersMica = missingIdentifiersMica,
+            missingIdentifiersCarf = missingIdentifiersCarf
+        )
+    }
+}
+
+@Serializable
+internal data class SubmitEuIdentifiersResponse(
+    @SerialName("valid")
+    val valid: Boolean = false,
+    @SerialName("missing_identifiers")
+    val missingIdentifiers: JsonObject? = null,
+    @SerialName("errors")
+    val errors: List<String>? = null,
+) {
+    fun toSubmitEuIdentifiersResult(): SubmitEuIdentifiersResult {
+        return SubmitEuIdentifiersResult(
+            valid = valid,
+            missingIdentifiers = missingIdentifiers?.toMissingEuIdentifiers(),
+            errors = errors
+        )
+    }
+}
+
+internal fun EuIdentifiers.toRequest(
+    credentials: CryptoCustomerRequestParams.Credentials
+): EuIdentifiersRequest {
+    val state = build()
+
+    return EuIdentifiersRequest(
+        credentials = credentials,
+        identifiersMica = state.identifiersMica?.map { it.toRequest() },
+        identifiersCarf = state.identifiersCarf?.map { it.toRequest() }
+    )
+}
+
+private fun EuIdentifier.State.toRequest(): EuIdentifierRequest {
+    return EuIdentifierRequest(
+        country = country.value,
+        identifier = identifier
+    )
+}
+
+private fun JsonObject.toMissingEuIdentifiers(): MissingEuIdentifiers {
+    val missingIdentifiersMica = readStringList(
+        "missing_identifiers_mica",
+        "identifiers_mica",
+        "mica",
+    )
+    val missingIdentifiersCarf = readStringList(
+        "missing_identifiers_carf",
+        "identifiers_carf",
+        "carf",
+    )
+    val fallbackIdentifiers = if (missingIdentifiersMica == null && missingIdentifiersCarf == null) {
+        entries.mapNotNull { (key, value) ->
+            ((value as? JsonPrimitive)?.booleanOrNull == true).takeIf { it }?.let { key }
+        }
+    } else {
+        emptyList()
+    }
+
+    return MissingEuIdentifiers(
+        missingIdentifiersMica = missingIdentifiersMica ?: emptyList(),
+        missingIdentifiersCarf = missingIdentifiersCarf ?: fallbackIdentifiers
+    )
+}
+
+private fun JsonObject.readStringList(vararg keys: String): List<String>? {
+    return keys.firstNotNullOfOrNull { key ->
+        (this[key] as? JsonArray)?.mapNotNull { element ->
+            (element as? JsonPrimitive)?.contentOrNull
+        }
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt
index ffc2dcb8bc0..de40c48ecc2 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt
@@ -21,6 +21,12 @@ internal data class KycCollectionRequest(
     @SerialName("dob")
     @Serializable(with = DateOfBirthSerializer::class)
     val dateOfBirth: DateOfBirth?,
+    @SerialName("birth_country")
+    val birthCountry: String?,
+    @SerialName("birth_city")
+    val birthCity: String?,
+    @SerialName("nationalities")
+    val nationalities: List<String>?,
     @SerialName("city")
     val city: String?,
     @SerialName("country")
@@ -50,6 +56,9 @@ internal data class KycCollectionRequest(
                 idNumber = kycInfo.idNumber.takeIf { !it.isNullOrEmpty() },
                 idType = SOCIAL_SECURITY_NUMBER.takeIf { !kycInfo.idNumber.isNullOrEmpty() },
                 dateOfBirth = kycInfo.dateOfBirth,
+                birthCountry = kycInfo.birthCountry?.value,
+                birthCity = kycInfo.birthCity.takeIf { !it.isNullOrEmpty() },
+                nationalities = kycInfo.nationalities?.map { it.value },
                 city = kycInfo.address?.city,
                 country = kycInfo.address?.country,
                 line1 = kycInfo.address?.line1,
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycInfo.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycInfo.kt
index ecd28f191f7..666aa7c47b7 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycInfo.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycInfo.kt
@@ -1,6 +1,7 @@
 package com.stripe.android.crypto.onramp.model
 
 import android.os.Parcelable
+import com.stripe.android.core.model.CountryCode
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import com.stripe.android.model.DateOfBirth
 import com.stripe.android.paymentsheet.PaymentSheet
@@ -15,6 +16,9 @@ import kotlinx.parcelize.Parcelize
  * @property idNumber The full identification number.
  * @property dateOfBirth The user’s date of birth.
  * @property address The user’s billing address.
+ * @property birthCountry The country where the user was born.
+ * @property birthCity The city where the user was born.
+ * @property nationalities The user's nationalities.
  */
 @ExperimentalCryptoOnramp
 @Poko
@@ -23,8 +27,28 @@ class KycInfo(
     val lastName: String?,
     val idNumber: String?,
     val dateOfBirth: DateOfBirth?,
-    val address: PaymentSheet.Address?
-)
+    val address: PaymentSheet.Address?,
+    val birthCountry: CountryCode? = null,
+    val birthCity: String? = null,
+    val nationalities: List<CountryCode>? = null
+) {
+    constructor(
+        firstName: String?,
+        lastName: String?,
+        idNumber: String?,
+        dateOfBirth: DateOfBirth?,
+        address: PaymentSheet.Address?
+    ) : this(
+        firstName = firstName,
+        lastName = lastName,
+        idNumber = idNumber,
+        dateOfBirth = dateOfBirth,
+        address = address,
+        birthCountry = null,
+        birthCity = null,
+        nationalities = null
+    )
+}
 
 /**
  * Represents a set of KYC information used when refreshing or revalidating
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycRetrieveResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycRetrieveResponse.kt
index fc55c2ea472..e7c8fbe5c1a 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycRetrieveResponse.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycRetrieveResponse.kt
@@ -1,7 +1,6 @@
 package com.stripe.android.crypto.onramp.model
 
 import android.os.Parcelable
-import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import com.stripe.android.model.DateOfBirth
 import com.stripe.android.paymentsheet.PaymentSheet
 import kotlinx.parcelize.Parcelize
@@ -14,8 +13,7 @@ import kotlinx.serialization.Serializable
  */
 @Serializable
 @Parcelize
-@ExperimentalCryptoOnramp
-data class KycRetrieveResponse(
+internal data class KycRetrieveResponse(
     @SerialName("first_name")
     val firstName: String,
     @SerialName("last_name")
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCallbacks.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCallbacks.kt
index 2beca8914c3..720d8cb9643 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCallbacks.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCallbacks.kt
@@ -19,6 +19,7 @@ class OnrampCallbacks {
     private var collectPaymentCallback: OnrampCollectPaymentMethodCallback? = null
     private var authorizeCallback: OnrampAuthorizeCallback? = null
     private var checkoutCallback: OnrampCheckoutCallback? = null
+    private var crsCarfDeclarationCallback: OnrampCrsCarfDeclarationCallback? = null
     private var onrampSessionClientSecretProvider: OnrampSessionClientSecretProvider? = null
     private var googlePayIsReadyCallback: ((Boolean) -> Unit)? = null
 
@@ -57,6 +58,13 @@ class OnrampCallbacks {
         this.checkoutCallback = callback
     }
 
+    /**
+     * Callback invoked when CRS/CARF declaration presentation completes.
+     */
+    fun crsCarfDeclarationCallback(callback: OnrampCrsCarfDeclarationCallback) = apply {
+        this.crsCarfDeclarationCallback = callback
+    }
+
     /**
      * An async closure that calls your backend to perform a checkout.
      *     Your backend should call Stripe's `/v1/crypto/onramp_sessions/:id/checkout` endpoint with the session ID.
@@ -85,6 +93,7 @@ class OnrampCallbacks {
         val collectPaymentCallback: OnrampCollectPaymentMethodCallback,
         val authorizeCallback: OnrampAuthorizeCallback,
         val checkoutCallback: OnrampCheckoutCallback,
+        val crsCarfDeclarationCallback: OnrampCrsCarfDeclarationCallback?,
         val onrampSessionClientSecretProvider: OnrampSessionClientSecretProvider,
         val googlePayIsReadyCallback: ((Boolean) -> Unit)?
     )
@@ -106,6 +115,7 @@ class OnrampCallbacks {
             checkoutCallback = requireNotNull(checkoutCallback) {
                 "checkoutCallback must not be null"
             },
+            crsCarfDeclarationCallback = crsCarfDeclarationCallback,
             onrampSessionClientSecretProvider = requireNotNull(onrampSessionClientSecretProvider) {
                 "onrampSessionClientSecretProvider must be not null"
             },
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult.kt
new file mode 100644
index 00000000000..cdd62825104
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult.kt
@@ -0,0 +1,25 @@
+package com.stripe.android.crypto.onramp.model
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * Result of submitting EU identifiers.
+ */
+@ExperimentalCryptoOnramp
+sealed interface OnrampCollectEuIdentifiersResult {
+    /**
+     * EU identifier submission completed and returned a validation result.
+     */
+    @ExperimentalCryptoOnramp
+    class Completed internal constructor(
+        val result: SubmitEuIdentifiersResult
+    ) : OnrampCollectEuIdentifiersResult
+
+    /**
+     * EU identifier submission failed.
+     */
+    @ExperimentalCryptoOnramp
+    class Failed internal constructor(
+        val error: Throwable
+    ) : OnrampCollectEuIdentifiersResult
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult.kt
new file mode 100644
index 00000000000..8a1ffeea429
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult.kt
@@ -0,0 +1,37 @@
+package com.stripe.android.crypto.onramp.model
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * Callback invoked when CRS/CARF declaration presentation completes.
+ */
+@ExperimentalCryptoOnramp
+fun interface OnrampCrsCarfDeclarationCallback {
+    fun onResult(result: OnrampCrsCarfDeclarationResult)
+}
+
+/**
+ * Result of presenting and recording a CRS/CARF declaration.
+ */
+@ExperimentalCryptoOnramp
+sealed interface OnrampCrsCarfDeclarationResult {
+    /**
+     * The declaration was accepted and recorded.
+     */
+    @ExperimentalCryptoOnramp
+    class Confirmed internal constructor() : OnrampCrsCarfDeclarationResult
+
+    /**
+     * The declaration presentation was cancelled.
+     */
+    @ExperimentalCryptoOnramp
+    class Cancelled internal constructor() : OnrampCrsCarfDeclarationResult
+
+    /**
+     * Presenting or recording the declaration failed.
+     */
+    @ExperimentalCryptoOnramp
+    class Failed internal constructor(
+        val error: Throwable
+    ) : OnrampCrsCarfDeclarationResult
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult.kt
new file mode 100644
index 00000000000..482ee560972
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult.kt
@@ -0,0 +1,25 @@
+package com.stripe.android.crypto.onramp.model
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * Result of retrieving identifier requirements.
+ */
+@ExperimentalCryptoOnramp
+sealed interface OnrampGetIdentifierRequirementsResult {
+    /**
+     * Identifier requirements were retrieved.
+     */
+    @ExperimentalCryptoOnramp
+    class Completed internal constructor(
+        val requirements: IdentifierRequirements
+    ) : OnrampGetIdentifierRequirementsResult
+
+    /**
+     * Identifier requirement retrieval failed.
+     */
+    @ExperimentalCryptoOnramp
+    class Failed internal constructor(
+        val error: Throwable
+    ) : OnrampGetIdentifierRequirementsResult
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index d04bbdc564e..b8c7cbc35f3 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -8,17 +8,23 @@ import com.stripe.android.core.model.parsers.StripeErrorJsonParser
 import com.stripe.android.core.networking.ApiRequest
 import com.stripe.android.core.networking.StripeNetworkClient
 import com.stripe.android.core.networking.StripeRequest
+import com.stripe.android.core.networking.executeRequestWithErrorParsing
 import com.stripe.android.core.networking.executeRequestWithKSerializerParser
 import com.stripe.android.core.networking.toMap
 import com.stripe.android.core.version.StripeSdkVersion
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenRequest
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
+import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
+import com.stripe.android.crypto.onramp.model.CrsCarfDeclarationResponse
 import com.stripe.android.crypto.onramp.model.CryptoCustomerRequestParams
 import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.CryptoWalletRequestParams
+import com.stripe.android.crypto.onramp.model.EuIdentifiers
 import com.stripe.android.crypto.onramp.model.GetOnrampSessionResponse
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
+import com.stripe.android.crypto.onramp.model.IdentifierRequirements
+import com.stripe.android.crypto.onramp.model.IdentifierRequirementsResponse
 import com.stripe.android.crypto.onramp.model.KycCollectionRequest
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRefreshRequest
@@ -26,6 +32,9 @@ import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationRequest
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
+import com.stripe.android.crypto.onramp.model.SubmitEuIdentifiersResponse
+import com.stripe.android.crypto.onramp.model.SubmitEuIdentifiersResult
+import com.stripe.android.crypto.onramp.model.toRequest
 import com.stripe.android.link.LinkController
 import com.stripe.android.link.utils.isLinkAuthorizationError
 import com.stripe.android.model.PaymentIntent
@@ -34,6 +43,7 @@ import com.stripe.android.utils.filterNotNullValues
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.Json
+import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.encodeToJsonElement
 import kotlinx.serialization.json.jsonObject
@@ -46,6 +56,7 @@ import javax.inject.Singleton
 */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
 @Singleton
+@Suppress("TooManyFunctions")
 internal class CryptoApiRepository @Inject constructor(
     private val stripeNetworkClient: StripeNetworkClient,
     private val stripeRepository: StripeRepository,
@@ -117,6 +128,63 @@ internal class CryptoApiRepository @Inject constructor(
         )
     }
 
+    suspend fun getIdentifierRequirements(
+        consumerSessionClientSecret: String
+    ): Result<IdentifierRequirements> {
+        val request = apiRequestFactory.createGet(
+            url = identifierRequirementsUrl,
+            options = buildRequestOptions(),
+            params = credentialsParams(consumerSessionClientSecret).toMap(),
+        )
+
+        return execute(
+            request = request,
+            responseSerializer = IdentifierRequirementsResponse.serializer()
+        ).map { it.toIdentifierRequirements() }
+    }
+
+    suspend fun collectEuIdentifiers(
+        identifiers: EuIdentifiers,
+        consumerSessionClientSecret: String
+    ): Result<SubmitEuIdentifiersResult> {
+        return executePost(
+            euIdentifiersUrl,
+            JsonObject(
+                Json.encodeToJsonElement(
+                    identifiers.toRequest(
+                        credentials = CryptoCustomerRequestParams.Credentials(consumerSessionClientSecret)
+                    )
+                ).jsonObject.filterValues { it != JsonNull }
+            ),
+            SubmitEuIdentifiersResponse.serializer()
+        ).map { it.toSubmitEuIdentifiersResult() }
+    }
+
+    suspend fun retrieveCrsCarfDeclaration(
+        consumerSessionClientSecret: String
+    ): Result<CrsCarfDeclaration> {
+        val request = apiRequestFactory.createGet(
+            url = crsCarfDeclarationUrl,
+            options = buildRequestOptions(),
+            params = credentialsParams(consumerSessionClientSecret).toMap(),
+        )
+
+        return execute(
+            request = request,
+            responseSerializer = CrsCarfDeclarationResponse.serializer()
+        ).map { it.toDeclaration() }
+    }
+
+    suspend fun confirmCrsCarfDeclaration(
+        consumerSessionClientSecret: String
+    ): Result<Unit> {
+        return executePost(
+            crsCarfDeclarationUrl,
+            credentialsParams(consumerSessionClientSecret),
+            Unit.serializer()
+        )
+    }
+
     suspend fun refreshKycData(
         kycInfo: RefreshKycInfo,
         consumerSessionClientSecret: String
@@ -264,6 +332,16 @@ internal class CryptoApiRepository @Inject constructor(
         )
     }
 
+    private fun credentialsParams(
+        consumerSessionClientSecret: String
+    ): JsonObject {
+        return Json.encodeToJsonElement(
+            CryptoCustomerRequestParams(
+                CryptoCustomerRequestParams.Credentials(consumerSessionClientSecret)
+            )
+        ).jsonObject
+    }
+
     private suspend fun <Response> executePost(
         url: String,
         paramsJson: JsonObject,
@@ -312,6 +390,24 @@ internal class CryptoApiRepository @Inject constructor(
         internal val collectKycDataUrl: String
             get() = getApiUrl("crypto/internal/kyc_data_collection")
 
+        /**
+         * @return `https://api.stripe.com/v1/crypto/internal/identifier_requirements`
+         */
+        internal val identifierRequirementsUrl: String
+            get() = getApiUrl("crypto/internal/identifier_requirements")
+
+        /**
+         * @return `https://api.stripe.com/v1/crypto/internal/eu_identifiers`
+         */
+        internal val euIdentifiersUrl: String
+            get() = getApiUrl("crypto/internal/eu_identifiers")
+
+        /**
+         * @return `https://api.stripe.com/v1/crypto/internal/crs_carf_declaration`
+         */
+        internal val crsCarfDeclarationUrl: String
+            get() = getApiUrl("crypto/internal/crs_carf_declaration")
+
         /**
          * @return `https://api.stripe.com/v1/crypto/internal/wallet`
          */
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/ui/CrsCarfDeclarationActivity.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/ui/CrsCarfDeclarationActivity.kt
new file mode 100644
index 00000000000..9cf1e015029
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/ui/CrsCarfDeclarationActivity.kt
@@ -0,0 +1,115 @@
+package com.stripe.android.crypto.onramp.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.os.Parcelable
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.core.os.BundleCompat
+import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
+import com.stripe.android.link.LinkAppearance
+import com.stripe.android.link.onramp.ui.CrsCarfDeclarationScreen
+import com.stripe.android.uicore.utils.fadeOut
+import kotlinx.parcelize.Parcelize
+
+internal class CrsCarfDeclarationActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val args = intent.extras?.let {
+            BundleCompat.getParcelable(it, EXTRA_ARGS, CrsCarfDeclarationArgs::class.java)
+        } ?: error("Missing CrsCarfDeclarationArgs")
+
+        enableEdgeToEdge()
+
+        setContent {
+            CrsCarfDeclarationScreen(
+                attestationText = args.attestationText,
+                appearance = args.appearance,
+                onClose = {
+                    setResult(RESULT_CANCELED, createResultIntent(CrsCarfDeclarationScreenAction.Cancelled))
+                    finish()
+                },
+                onConfirm = {
+                    setResult(RESULT_OK, createResultIntent(CrsCarfDeclarationScreenAction.Confirm))
+                    finish()
+                }
+            )
+        }
+    }
+
+    override fun finish() {
+        super.finish()
+        fadeOut()
+    }
+
+    private fun createResultIntent(action: CrsCarfDeclarationScreenAction): Intent {
+        return Intent().apply { putExtra(ACTION_ARG, action) }
+    }
+
+    companion object {
+        private const val EXTRA_ARGS = "crs_carf_declaration_args"
+        internal const val ACTION_ARG = "action"
+
+        internal fun createIntent(
+            context: Context,
+            args: CrsCarfDeclarationArgs
+        ): Intent {
+            return Intent(context, CrsCarfDeclarationActivity::class.java)
+                .putExtra(EXTRA_ARGS, args)
+        }
+    }
+}
+
+internal data class CrsCarfDeclarationActivityArgs(
+    val declaration: CrsCarfDeclaration,
+    val linkAppearance: LinkAppearance?
+)
+
+internal sealed interface CrsCarfDeclarationScreenAction : Parcelable {
+    @Parcelize
+    data object Cancelled : CrsCarfDeclarationScreenAction
+
+    @Parcelize
+    data object Confirm : CrsCarfDeclarationScreenAction
+}
+
+internal data class CrsCarfDeclarationActivityResult(
+    val action: CrsCarfDeclarationScreenAction
+)
+
+internal class CrsCarfDeclarationActivityContract : ActivityResultContract<
+    CrsCarfDeclarationActivityArgs,
+    CrsCarfDeclarationActivityResult
+    >() {
+    override fun createIntent(context: Context, input: CrsCarfDeclarationActivityArgs): Intent {
+        return CrsCarfDeclarationActivity.createIntent(
+            context = context,
+            args = CrsCarfDeclarationArgs(
+                attestationText = input.declaration.text,
+                appearance = input.linkAppearance?.build()
+            )
+        )
+    }
+
+    override fun parseResult(resultCode: Int, intent: Intent?): CrsCarfDeclarationActivityResult {
+        val action = intent?.extras?.let {
+            BundleCompat.getParcelable(
+                it,
+                CrsCarfDeclarationActivity.ACTION_ARG,
+                CrsCarfDeclarationScreenAction::class.java
+            )
+        } ?: CrsCarfDeclarationScreenAction.Cancelled
+
+        return CrsCarfDeclarationActivityResult(action)
+    }
+}
+
+@Parcelize
+internal data class CrsCarfDeclarationArgs(
+    val attestationText: String,
+    val appearance: LinkAppearance.State?,
+) : Parcelable
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 7ccf30fdbad..9b5ab812f99 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -2,13 +2,17 @@ package com.stripe.android.crypto.onramp
 
 import com.google.common.truth.Truth.assertThat
 import com.stripe.android.core.ApiVersion
+import com.stripe.android.core.model.CountryCode
 import com.stripe.android.core.networking.ApiRequest
 import com.stripe.android.core.networking.StripeNetworkClient
 import com.stripe.android.core.networking.StripeResponse
 import com.stripe.android.core.version.StripeSdkVersion
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
+import com.stripe.android.crypto.onramp.model.EuIdentifier
+import com.stripe.android.crypto.onramp.model.EuIdentifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
+import com.stripe.android.crypto.onramp.model.SubmitEuIdentifiersResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.link.LinkController
 import com.stripe.android.model.DateOfBirth
@@ -125,42 +129,165 @@ class CryptoApiRepositoryTest {
                     lastName = "User",
                     idNumber = "999-88-7777",
                     dateOfBirth = DateOfBirth(day = 1, month = 3, year = 1975),
-                    address = PaymentSheet.Address(city = "Orlando", state = "FL")
+                    address = PaymentSheet.Address(city = "Orlando", state = "FL"),
+                    birthCountry = CountryCode.create("IE"),
+                    birthCity = "Dublin",
+                    nationalities = listOf(CountryCode.create("IE"), CountryCode.create("FR"))
                 ),
                 consumerSessionClientSecret = "test-secret"
             )
 
+            verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
+
+            assertThat(result.isSuccess)
+                .isEqualTo(true)
+            assertKycCollectionRequest(apiRequestArgumentCaptor.firstValue)
+        }
+    }
+
+    @Test
+    fun testGetIdentifierRequirementsSucceeds() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                """
+                    {
+                        "missing_identifiers_mica": ["tax_id"],
+                        "missing_identifiers_carf": ["nationalities"]
+                    }
+                    """,
+                emptyMap()
+            )
+
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.getIdentifierRequirements(
+                consumerSessionClientSecret = "test-secret"
+            )
+
             verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
             val apiRequest = apiRequestArgumentCaptor.firstValue
 
             assertThat(apiRequest.baseUrl)
-                .isEqualTo("https://api.stripe.com/v1/crypto/internal/kyc_data_collection")
+                .isEqualTo("https://api.stripe.com/v1/crypto/internal/identifier_requirements")
+            assertThat(apiRequest.params)
+                .isEqualTo(mapOf("credentials" to mapOf("consumer_session_client_secret" to "test-secret")))
 
-            val params = apiRequest.params!!
-            val dobValue = params["dob"] as Map<*, *>
-            assertThat(params["first_name"]).isEqualTo("Test")
-            assertThat(params["last_name"]).isEqualTo("User")
-            assertThat(params["id_number"]).isEqualTo("999-88-7777")
-            assertThat(params["id_type"]).isEqualTo("social_security_number") // Hardcoded to match iOS
-            assertThat(dobValue["day"]).isEqualTo("1")
-            assertThat(dobValue["month"]).isEqualTo("3")
-            assertThat(dobValue["year"]).isEqualTo("1975")
-            assertThat(params["nationalities"]).isNull()
-            assertThat(params["birth_country"]).isNull()
-            assertThat(params["birth_city"]).isNull()
-            assertThat(params["city"]).isEqualTo("Orlando")
-            assertThat(params["state"]).isEqualTo("FL")
-            assertThat(params["country"]).isNull()
-            assertThat(params["line1"]).isNull()
-            assertThat(params["line2"]).isNull()
-            assertThat(params["zip"]).isNull()
+            assertThat(result.isSuccess).isTrue()
+            assertThat(result.getOrThrow().missingIdentifiersMica)
+                .isEqualTo(listOf("tax_id"))
+            assertThat(result.getOrThrow().missingIdentifiersCarf)
+                .isEqualTo(listOf("nationalities"))
+        }
+    }
 
-            assertThat(params["credentials"]).isEqualTo(
-                mapOf("consumer_session_client_secret" to "test-secret")
+    @Test
+    fun testCollectEuIdentifiersSucceeds() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                """
+                    {
+                        "valid": false,
+                        "missing_identifiers": {
+                            "missing_identifiers_mica": ["tax_id"],
+                            "missing_identifiers_carf": ["nationalities"]
+                        },
+                        "errors": ["FR"]
+                    }
+                    """,
+                emptyMap()
             )
 
-            assertThat(result.isSuccess)
-                .isEqualTo(true)
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.collectEuIdentifiers(
+                identifiers = EuIdentifiers()
+                    .identifiersMica(
+                        listOf(
+                            EuIdentifier()
+                                .country(CountryCode.create("IE"))
+                                .identifier("mica_123")
+                        )
+                    )
+                    .identifiersCarf(
+                        listOf(
+                            EuIdentifier()
+                                .country(CountryCode.create("FR"))
+                                .identifier("carf_456")
+                        )
+                    ),
+                consumerSessionClientSecret = "test-secret"
+            )
+
+            verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
+            assertEuIdentifiersRequest(apiRequestArgumentCaptor.firstValue)
+            assertThat(result.isSuccess).isTrue()
+            assertSubmitEuIdentifiersResult(result.getOrThrow())
+        }
+    }
+
+    @Test
+    fun testRetrieveCrsCarfDeclarationSucceeds() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                """
+                    {
+                        "text": "I confirm this declaration.",
+                        "version": "2026-04-23"
+                    }
+                    """,
+                emptyMap()
+            )
+
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.retrieveCrsCarfDeclaration(
+                consumerSessionClientSecret = "test-secret"
+            )
+
+            verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
+            val apiRequest = apiRequestArgumentCaptor.firstValue
+
+            assertThat(apiRequest.baseUrl)
+                .isEqualTo("https://api.stripe.com/v1/crypto/internal/crs_carf_declaration")
+            assertThat(apiRequest.params)
+                .isEqualTo(mapOf("credentials" to mapOf("consumer_session_client_secret" to "test-secret")))
+            assertThat(result.getOrThrow().text)
+                .isEqualTo("I confirm this declaration.")
+            assertThat(result.getOrThrow().version)
+                .isEqualTo("2026-04-23")
+        }
+    }
+
+    @Test
+    fun testConfirmCrsCarfDeclarationSucceeds() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                "{}",
+                emptyMap()
+            )
+
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.confirmCrsCarfDeclaration(
+                consumerSessionClientSecret = "test-secret"
+            )
+
+            verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
+            val apiRequest = apiRequestArgumentCaptor.firstValue
+
+            assertThat(apiRequest.baseUrl)
+                .isEqualTo("https://api.stripe.com/v1/crypto/internal/crs_carf_declaration")
+            assertThat(apiRequest.params)
+                .isEqualTo(mapOf("credentials" to mapOf("consumer_session_client_secret" to "test-secret")))
+            assertThat(result.isSuccess).isTrue()
         }
     }
 
@@ -491,4 +618,64 @@ class CryptoApiRepositoryTest {
                 .isEqualTo(true)
         }
     }
+
+    private fun assertKycCollectionRequest(apiRequest: ApiRequest) {
+        assertThat(apiRequest.baseUrl)
+            .isEqualTo("https://api.stripe.com/v1/crypto/internal/kyc_data_collection")
+
+        val params = apiRequest.params!!
+        val dobValue = params["dob"] as Map<*, *>
+        assertThat(params["first_name"]).isEqualTo("Test")
+        assertThat(params["last_name"]).isEqualTo("User")
+        assertThat(params["id_number"]).isEqualTo("999-88-7777")
+        assertThat(params["id_type"]).isEqualTo("social_security_number") // Hardcoded to match iOS
+        assertThat(dobValue["day"]).isEqualTo("1")
+        assertThat(dobValue["month"]).isEqualTo("3")
+        assertThat(dobValue["year"]).isEqualTo("1975")
+        assertThat(params["nationalities"]).isEqualTo(listOf("IE", "FR"))
+        assertThat(params["birth_country"]).isEqualTo("IE")
+        assertThat(params["birth_city"]).isEqualTo("Dublin")
+        assertThat(params["city"]).isEqualTo("Orlando")
+        assertThat(params["state"]).isEqualTo("FL")
+        assertThat(params["country"]).isNull()
+        assertThat(params["line1"]).isNull()
+        assertThat(params["line2"]).isNull()
+        assertThat(params["zip"]).isNull()
+        assertThat(params["credentials"]).isEqualTo(
+            mapOf("consumer_session_client_secret" to "test-secret")
+        )
+    }
+
+    private fun assertEuIdentifiersRequest(apiRequest: ApiRequest) {
+        assertThat(apiRequest.baseUrl)
+            .isEqualTo("https://api.stripe.com/v1/crypto/internal/eu_identifiers")
+        assertThat(apiRequest.params)
+            .isEqualTo(
+                mapOf(
+                    "credentials" to mapOf("consumer_session_client_secret" to "test-secret"),
+                    "identifiers_mica" to listOf(
+                        mapOf(
+                            "country" to "IE",
+                            "identifier" to "mica_123"
+                        )
+                    ),
+                    "identifiers_carf" to listOf(
+                        mapOf(
+                            "country" to "FR",
+                            "identifier" to "carf_456"
+                        )
+                    )
+                )
+            )
+    }
+
+    private fun assertSubmitEuIdentifiersResult(result: SubmitEuIdentifiersResult) {
+        assertThat(result.valid).isFalse()
+        assertThat(result.missingIdentifiers?.missingIdentifiersMica)
+            .isEqualTo(listOf("tax_id"))
+        assertThat(result.missingIdentifiers?.missingIdentifiersCarf)
+            .isEqualTo(listOf("nationalities"))
+        assertThat(result.errors)
+            .isEqualTo(listOf("FR"))
+    }
 }
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index b3ed0da787e..ea47993742b 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -4,23 +4,32 @@ import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
 import androidx.lifecycle.SavedStateHandle
 import com.google.common.truth.Truth.assertThat
+import com.stripe.android.core.model.CountryCode
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsService
 import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
+import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
+import com.stripe.android.crypto.onramp.model.EuIdentifier
+import com.stripe.android.crypto.onramp.model.EuIdentifiers
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
+import com.stripe.android.crypto.onramp.model.IdentifierRequirements
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
+import com.stripe.android.crypto.onramp.model.MissingEuIdentifiers
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampAuthorizeResult
+import com.stripe.android.crypto.onramp.model.OnrampCollectEuIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
+import com.stripe.android.crypto.onramp.model.OnrampCrsCarfDeclarationResult
+import com.stripe.android.crypto.onramp.model.OnrampGetIdentifierRequirementsResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
@@ -32,7 +41,10 @@ import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
+import com.stripe.android.crypto.onramp.model.SubmitEuIdentifiersResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityResult
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationScreenAction
 import com.stripe.android.crypto.onramp.ui.KycRefreshScreenAction
 import com.stripe.android.crypto.onramp.ui.VerifyKycActivityResult
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
@@ -183,11 +195,84 @@ class OnrampInteractorTest {
             address = PaymentSheet.Address(city = "Orlando", state = "FL")
         )
         val result = interactor.attachKycInfo(kycInfo)
-        assert(result is OnrampAttachKycInfoResult.Completed)
+        assertThat(result).isInstanceOf(OnrampAttachKycInfoResult.Completed::class.java)
 
         testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.KycInfoSubmitted)
     }
 
+    @Test
+    fun testGetIdentifierRequirementsIsSuccessful() = runTest {
+        whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
+        val requirements = IdentifierRequirements(
+            missingIdentifiersMica = listOf("tax_id"),
+            missingIdentifiersCarf = listOf("nationalities")
+        )
+        whenever(cryptoApiRepository.getIdentifierRequirements(any()))
+            .thenReturn(Result.success(requirements))
+
+        interactor.onLinkControllerState(mockLinkStateWithAccount())
+
+        val result = interactor.getIdentifierRequirements()
+
+        assertThat(result).isInstanceOf(OnrampGetIdentifierRequirementsResult.Completed::class.java)
+        val completed = result as OnrampGetIdentifierRequirementsResult.Completed
+        assertThat(completed.requirements).isEqualTo(requirements)
+        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.IdentifierRequirementsRetrieved)
+    }
+
+    @Test
+    fun testCollectEuIdentifiersIsSuccessful() = runTest {
+        whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
+        val submissionResult = SubmitEuIdentifiersResult(
+            valid = false,
+            missingIdentifiers = MissingEuIdentifiers(
+                missingIdentifiersMica = emptyList(),
+                missingIdentifiersCarf = listOf("nationalities")
+            ),
+            errors = listOf("FR")
+        )
+        whenever(cryptoApiRepository.collectEuIdentifiers(any(), any()))
+            .thenReturn(Result.success(submissionResult))
+
+        interactor.onLinkControllerState(mockLinkStateWithAccount())
+
+        val result = interactor.collectEuIdentifiers(
+            EuIdentifiers()
+                .identifiersMica(
+                    listOf(
+                        EuIdentifier()
+                            .country(CountryCode.create("IE"))
+                            .identifier("mica_123")
+                    )
+                )
+        )
+
+        assertThat(result).isInstanceOf(OnrampCollectEuIdentifiersResult.Completed::class.java)
+        val completed = result as OnrampCollectEuIdentifiersResult.Completed
+        assertThat(completed.result).isEqualTo(submissionResult)
+        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.EuIdentifiersSubmitted)
+    }
+
+    @Test
+    fun testStartCrsCarfDeclarationIsSuccessful() = runTest {
+        whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
+        val declaration = CrsCarfDeclaration(
+            text = "I confirm this declaration.",
+            version = "2026-04-23"
+        )
+        whenever(cryptoApiRepository.retrieveCrsCarfDeclaration(any()))
+            .thenReturn(Result.success(declaration))
+
+        interactor.onLinkControllerState(mockLinkStateWithAccount())
+
+        val result = interactor.startCrsCarfDeclaration()
+
+        assertThat(result).isInstanceOf(OnrampStartCrsCarfDeclarationResult.Completed::class.java)
+        val completed = result as OnrampStartCrsCarfDeclarationResult.Completed
+        assertThat(completed.declaration).isEqualTo(declaration)
+        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.CrsCarfDeclarationStarted)
+    }
+
     @Test
     fun testStartIdentityVerificationIsSuccessful() = runTest {
         whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
@@ -543,6 +628,33 @@ class OnrampInteractorTest {
         assertThat(failed.error).isInstanceOf(MissingConsumerSecretException::class.java)
     }
 
+    @Test
+    fun testHandleCrsCarfDeclarationResultConfirmedSuccess() = runTest {
+        interactor.onLinkControllerState(mockLinkStateWithAccount())
+        whenever(cryptoApiRepository.confirmCrsCarfDeclaration(any()))
+            .thenReturn(Result.success(Unit))
+
+        val result = interactor.handleCrsCarfDeclarationResult(
+            CrsCarfDeclarationActivityResult(
+                CrsCarfDeclarationScreenAction.Confirm
+            )
+        )
+
+        assertThat(result).isInstanceOf(OnrampCrsCarfDeclarationResult.Confirmed::class.java)
+        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.CrsCarfDeclarationConfirmed)
+    }
+
+    @Test
+    fun testHandleCrsCarfDeclarationResultCancelled() = runTest {
+        val result = interactor.handleCrsCarfDeclarationResult(
+            CrsCarfDeclarationActivityResult(
+                CrsCarfDeclarationScreenAction.Cancelled
+            )
+        )
+
+        assertThat(result).isInstanceOf(OnrampCrsCarfDeclarationResult.Cancelled::class.java)
+    }
+
     @Test
     fun testCreateCryptoPaymentTokenFailsMissingCryptoCustomer() = runTest {
         interactor.onLinkControllerState(mockLinkStateWithAccount())
diff --git a/paymentsheet/api/paymentsheet.api b/paymentsheet/api/paymentsheet.api
index 93eec471bd3..2f4805a8a55 100644
--- a/paymentsheet/api/paymentsheet.api
+++ b/paymentsheet/api/paymentsheet.api
@@ -224,6 +224,12 @@ public abstract interface class com/stripe/android/customersheet/SetupIntentClie
 	public abstract fun provideSetupIntentClientSecret (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
+public final class com/stripe/android/link/onramp/ui/ComposableSingletons$CrsCarfDeclarationScreenKt {
+	public static final field INSTANCE Lcom/stripe/android/link/onramp/ui/ComposableSingletons$CrsCarfDeclarationScreenKt;
+	public fun <init> ()V
+	public final fun getLambda$-2073378803$paymentsheet_release ()Lkotlin/jvm/functions/Function3;
+}
+
 public final class com/stripe/android/link/onramp/ui/ComposableSingletons$OnrampKYCRefreshScreenKt {
 	public static final field INSTANCE Lcom/stripe/android/link/onramp/ui/ComposableSingletons$OnrampKYCRefreshScreenKt;
 	public fun <init> ()V
diff --git a/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt b/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt
new file mode 100644
index 00000000000..925c9d78546
--- /dev/null
+++ b/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt
@@ -0,0 +1,104 @@
+package com.stripe.android.link.onramp.ui
+
+import androidx.activity.compose.BackHandler
+import androidx.annotation.RestrictTo
+import androidx.compose.foundation.background
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.stripe.android.link.LinkAppearance
+import com.stripe.android.link.theme.DefaultLinkTheme
+import com.stripe.android.link.theme.LinkTheme
+import com.stripe.android.link.ui.PrimaryButton
+import com.stripe.android.link.ui.PrimaryButtonState
+
+@Composable
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+fun CrsCarfDeclarationScreen(
+    appearance: LinkAppearance.State?,
+    attestationText: String,
+    onClose: () -> Unit,
+    onConfirm: () -> Unit
+) {
+    BackHandler(onBack = onClose)
+
+    DefaultLinkTheme(appearance = appearance) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(LinkTheme.colors.surfaceBackdrop.copy(alpha = 0.32f))
+        ) {
+            Surface(
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .fillMaxWidth(),
+                color = LinkTheme.colors.surfacePrimary,
+                shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp),
+                elevation = 8.dp,
+            ) {
+                Column(
+                    modifier = Modifier
+                        .navigationBarsPadding()
+                        .padding(horizontal = 24.dp, vertical = 20.dp)
+                ) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Text(
+                            text = "Tax declaration",
+                            style = LinkTheme.typography.bodyEmphasized,
+                            color = LinkTheme.colors.textPrimary
+                        )
+                        TextButton(onClick = onClose) {
+                            Text(
+                                text = "Cancel",
+                                style = LinkTheme.typography.detailEmphasized,
+                                color = LinkTheme.colors.textSecondary
+                            )
+                        }
+                    }
+
+                    Spacer(Modifier.height(16.dp))
+
+                    Text(
+                        text = attestationText,
+                        style = LinkTheme.typography.body,
+                        color = LinkTheme.colors.textPrimary,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .weight(1f, fill = false)
+                            .verticalScroll(rememberScrollState())
+                    )
+
+                    Spacer(Modifier.height(24.dp))
+
+                    PrimaryButton(
+                        label = "Accept",
+                        state = PrimaryButtonState.Enabled,
+                        onButtonClick = onConfirm,
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                }
+            }
+        }
+    }
+}

From 9703c20c230572bb5793b5f5f3a53e690dc57f36 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 27 Apr 2026 12:53:49 -0400
Subject: [PATCH 02/57] Renaming

---
 crypto-onramp/api/crypto-onramp.api           | 60 +++++++++----------
 .../crypto/onramp/OnrampCoordinator.kt        | 16 ++---
 .../android/crypto/onramp/OnrampInteractor.kt | 14 ++---
 .../{EuIdentifiers.kt => Identifiers.kt}      | 60 +++++++++----------
 ...Result.kt => OnrampUpdateKycInfoResult.kt} | 14 ++---
 .../repositories/CryptoApiRepository.kt       | 20 +++----
 .../crypto/onramp/CryptoApiRepositoryTest.kt  | 24 ++++----
 .../crypto/onramp/OnrampInteractorTest.kt     | 28 ++++-----
 8 files changed, 115 insertions(+), 121 deletions(-)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{EuIdentifiers.kt => Identifiers.kt} (78%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{OnrampCollectEuIdentifiersResult.kt => OnrampUpdateKycInfoResult.kt} (51%)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index a3a907bf929..e581f27b986 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -5,7 +5,6 @@ public final class com/stripe/android/crypto/onramp/OnrampCoordinator {
 	public static final field $stable I
 	public final fun attachKycInfo (Lcom/stripe/android/crypto/onramp/model/KycInfo;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun authenticateUserWithToken (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun collectEuIdentifiers (Lcom/stripe/android/crypto/onramp/model/EuIdentifiers;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun configure (Lcom/stripe/android/crypto/onramp/model/OnrampConfiguration;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun createCryptoPaymentToken (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun createPresenter (Landroidx/activity/ComponentActivity;)Lcom/stripe/android/crypto/onramp/OnrampCoordinator$Presenter;
@@ -14,6 +13,7 @@ public final class com/stripe/android/crypto/onramp/OnrampCoordinator {
 	public final fun logOut (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun registerLinkUser (Lcom/stripe/android/crypto/onramp/model/LinkUserInfo;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun registerWalletAddress (Ljava/lang/String;Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun updateKycInfo (Lcom/stripe/android/crypto/onramp/model/Identifiers;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun updatePhoneNumber (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
@@ -79,18 +79,11 @@ public final class com/stripe/android/crypto/onramp/model/CryptoNetwork$Companio
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public final class com/stripe/android/crypto/onramp/model/EuIdentifier {
+public final class com/stripe/android/crypto/onramp/model/Identifier {
 	public static final field $stable I
 	public fun <init> ()V
-	public final fun country (Lcom/stripe/android/core/model/CountryCode;)Lcom/stripe/android/crypto/onramp/model/EuIdentifier;
-	public final fun identifier (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/EuIdentifier;
-}
-
-public final class com/stripe/android/crypto/onramp/model/EuIdentifiers {
-	public static final field $stable I
-	public fun <init> ()V
-	public final fun identifiersCarf (Ljava/util/List;)Lcom/stripe/android/crypto/onramp/model/EuIdentifiers;
-	public final fun identifiersMica (Ljava/util/List;)Lcom/stripe/android/crypto/onramp/model/EuIdentifiers;
+	public final fun country (Lcom/stripe/android/core/model/CountryCode;)Lcom/stripe/android/crypto/onramp/model/Identifier;
+	public final fun identifier (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Identifier;
 }
 
 public final class com/stripe/android/crypto/onramp/model/IdentifierRequirements {
@@ -102,6 +95,13 @@ public final class com/stripe/android/crypto/onramp/model/IdentifierRequirements
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/stripe/android/crypto/onramp/model/Identifiers {
+	public static final field $stable I
+	public fun <init> ()V
+	public final fun identifiersCarf (Ljava/util/List;)Lcom/stripe/android/crypto/onramp/model/Identifiers;
+	public final fun identifiersMica (Ljava/util/List;)Lcom/stripe/android/crypto/onramp/model/Identifiers;
+}
+
 public final class com/stripe/android/crypto/onramp/model/KycInfo {
 	public static final field $stable I
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;)V
@@ -135,7 +135,7 @@ public final class com/stripe/android/crypto/onramp/model/LinkUserInfo : android
 	public final fun writeToParcel (Landroid/os/Parcel;I)V
 }
 
-public final class com/stripe/android/crypto/onramp/model/MissingEuIdentifiers {
+public final class com/stripe/android/crypto/onramp/model/MissingIdentifiers {
 	public static final field $stable I
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getMissingIdentifiersCarf ()Ljava/util/List;
@@ -214,19 +214,6 @@ public final class com/stripe/android/crypto/onramp/model/OnrampCheckoutResult$F
 	public final fun getError ()Ljava/lang/Throwable;
 }
 
-public abstract interface class com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult {
-}
-
-public final class com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult$Completed : com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult {
-	public static final field $stable I
-	public final fun getResult ()Lcom/stripe/android/crypto/onramp/model/SubmitEuIdentifiersResult;
-}
-
-public final class com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult$Failed : com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult {
-	public static final field $stable I
-	public final fun getError ()Ljava/lang/Throwable;
-}
-
 public abstract interface class com/stripe/android/crypto/onramp/model/OnrampCollectPaymentMethodCallback {
 	public abstract fun onResult (Lcom/stripe/android/crypto/onramp/model/OnrampCollectPaymentMethodResult;)V
 }
@@ -381,6 +368,19 @@ public final class com/stripe/android/crypto/onramp/model/OnrampTokenAuthenticat
 	public final fun getError ()Ljava/lang/Throwable;
 }
 
+public abstract interface class com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult {
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult$Completed : com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult {
+	public static final field $stable I
+	public final fun getResult ()Lcom/stripe/android/crypto/onramp/model/UpdateKycInfoResult;
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult$Failed : com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult {
+	public static final field $stable I
+	public final fun getError ()Ljava/lang/Throwable;
+}
+
 public abstract interface class com/stripe/android/crypto/onramp/model/OnrampUpdatePhoneNumberResult {
 }
 
@@ -499,19 +499,13 @@ public final class com/stripe/android/crypto/onramp/model/PaymentMethodType : ja
 	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/PaymentMethodType;
 }
 
-public final class com/stripe/android/crypto/onramp/model/SubmitEuIdentifiersResult {
+public final class com/stripe/android/crypto/onramp/model/UpdateKycInfoResult {
 	public static final field $stable I
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getErrors ()Ljava/util/List;
-	public final fun getMissingIdentifiers ()Lcom/stripe/android/crypto/onramp/model/MissingEuIdentifiers;
+	public final fun getMissingIdentifiers ()Lcom/stripe/android/crypto/onramp/model/MissingIdentifiers;
 	public final fun getValid ()Z
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/stripe/android/crypto/onramp/ui/ComposableSingletons$CrsCarfDeclarationActivityKt {
-	public static final field INSTANCE Lcom/stripe/android/crypto/onramp/ui/ComposableSingletons$CrsCarfDeclarationActivityKt;
-	public fun <init> ()V
-	public final fun getLambda$-1481598038$crypto_onramp_release ()Lkotlin/jvm/functions/Function3;
-}
-
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
index f667947db48..641af886811 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
@@ -6,12 +6,11 @@ import androidx.lifecycle.SavedStateHandle
 import com.stripe.android.crypto.onramp.di.OnrampComponentHolder
 import com.stripe.android.crypto.onramp.di.OnrampPresenterComponent
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
-import com.stripe.android.crypto.onramp.model.EuIdentifiers
+import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampCallbacks
-import com.stripe.android.crypto.onramp.model.OnrampCollectEuIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
@@ -21,6 +20,7 @@ import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterWalletAddressResult
 import com.stripe.android.crypto.onramp.model.OnrampTokenAuthenticationResult
+import com.stripe.android.crypto.onramp.model.OnrampUpdateKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodSelection
 import com.stripe.android.paymentsheet.PaymentSheet
@@ -124,15 +124,15 @@ class OnrampCoordinator @Inject internal constructor(
     }
 
     /**
-     * Submits EU identifiers for the current Link user.
+     * Updates KYC info for the current Link user.
      * Requires an authenticated Link user.
      *
-     * @param identifiers The EU identifier payload to submit.
+     * @param identifiers The identifier payload to submit.
      */
-    suspend fun collectEuIdentifiers(
-        identifiers: EuIdentifiers
-    ): OnrampCollectEuIdentifiersResult {
-        return interactor.collectEuIdentifiers(identifiers)
+    suspend fun updateKycInfo(
+        identifiers: Identifiers
+    ): OnrampUpdateKycInfoResult {
+        return interactor.updateKycInfo(identifiers)
     }
 
     /**
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
index 76b18d33368..607e07bf250 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
@@ -16,14 +16,13 @@ import com.stripe.android.crypto.onramp.exception.MissingPaymentMethodException
 import com.stripe.android.crypto.onramp.exception.PaymentFailedException
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
-import com.stripe.android.crypto.onramp.model.EuIdentifiers
+import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampAuthorizeResult
 import com.stripe.android.crypto.onramp.model.OnrampCheckoutResult
-import com.stripe.android.crypto.onramp.model.OnrampCollectEuIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
@@ -37,6 +36,7 @@ import com.stripe.android.crypto.onramp.model.OnrampRegisterWalletAddressResult
 import com.stripe.android.crypto.onramp.model.OnrampSessionClientSecretProvider
 import com.stripe.android.crypto.onramp.model.OnrampStartVerificationResult
 import com.stripe.android.crypto.onramp.model.OnrampTokenAuthenticationResult
+import com.stripe.android.crypto.onramp.model.OnrampUpdateKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
@@ -367,7 +367,7 @@ internal class OnrampInteractor @Inject constructor(
             )
     }
 
-    suspend fun collectEuIdentifiers(identifiers: EuIdentifiers): OnrampCollectEuIdentifiersResult {
+    suspend fun updateKycInfo(identifiers: Identifiers): OnrampUpdateKycInfoResult {
         val secret = consumerSessionClientSecret()
         if (secret == null) {
             val error = MissingConsumerSecretException()
@@ -377,14 +377,14 @@ internal class OnrampInteractor @Inject constructor(
                     error = error,
                 )
             )
-            return OnrampCollectEuIdentifiersResult.Failed(error)
+            return OnrampUpdateKycInfoResult.Failed(error)
         }
 
-        return cryptoApiRepository.collectEuIdentifiers(identifiers, secret)
+        return cryptoApiRepository.updateKycInfo(identifiers, secret)
             .fold(
                 onSuccess = { result ->
                     analyticsService?.track(OnrampAnalyticsEvent.EuIdentifiersSubmitted)
-                    OnrampCollectEuIdentifiersResult.Completed(result)
+                    OnrampUpdateKycInfoResult.Completed(result)
                 },
                 onFailure = { error ->
                     analyticsService?.track(
@@ -393,7 +393,7 @@ internal class OnrampInteractor @Inject constructor(
                             error = error,
                         )
                     )
-                    OnrampCollectEuIdentifiersResult.Failed(error)
+                    OnrampUpdateKycInfoResult.Failed(error)
                 }
             )
     }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/EuIdentifiers.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
similarity index 78%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/EuIdentifiers.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
index 03816b7243a..6c0c74895ce 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/EuIdentifiers.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
@@ -12,33 +12,33 @@ import kotlinx.serialization.json.booleanOrNull
 import kotlinx.serialization.json.contentOrNull
 
 /**
- * EU identifier payload submitted to the Crypto Onramp API.
+ * Identifier payload submitted to the Crypto Onramp API.
  *
  * @property identifiersMica MiCA identifiers for the consumer.
  * @property identifiersCarf CARF identifiers for the consumer.
  */
 @ExperimentalCryptoOnramp
-class EuIdentifiers {
-    private var identifiersMica: List<EuIdentifier>? = null
-    private var identifiersCarf: List<EuIdentifier>? = null
+class Identifiers {
+    private var identifiersMica: List<Identifier>? = null
+    private var identifiersCarf: List<Identifier>? = null
 
     /**
      * Sets MiCA identifiers for the consumer.
      */
-    fun identifiersMica(identifiersMica: List<EuIdentifier>?) = apply {
+    fun identifiersMica(identifiersMica: List<Identifier>?) = apply {
         this.identifiersMica = identifiersMica
     }
 
     /**
      * Sets CARF identifiers for the consumer.
      */
-    fun identifiersCarf(identifiersCarf: List<EuIdentifier>?) = apply {
+    fun identifiersCarf(identifiersCarf: List<Identifier>?) = apply {
         this.identifiersCarf = identifiersCarf
     }
 
     internal class State(
-        val identifiersMica: List<EuIdentifier.State>?,
-        val identifiersCarf: List<EuIdentifier.State>?
+        val identifiersMica: List<Identifier.State>?,
+        val identifiersCarf: List<Identifier.State>?
     )
 
     internal fun build(): State {
@@ -50,13 +50,13 @@ class EuIdentifiers {
 }
 
 /**
- * A country-scoped EU identifier.
+ * A country-scoped identifier entry.
  *
  * @property country ISO 3166-1 alpha-2 country code associated with the identifier.
  * @property identifier The identifier value.
  */
 @ExperimentalCryptoOnramp
-class EuIdentifier {
+class Identifier {
     private var country: CountryCode? = null
     private var identifier: String? = null
 
@@ -105,20 +105,20 @@ class IdentifierRequirements internal constructor(
 )
 
 /**
- * Missing EU identifiers returned by the submit EU identifiers API.
+ * Missing identifiers returned by the KYC info update API.
  *
  * @property missingIdentifiersMica Missing MiCA identifier field names.
  * @property missingIdentifiersCarf Missing CARF identifier field names.
  */
 @ExperimentalCryptoOnramp
 @Poko
-class MissingEuIdentifiers internal constructor(
+class MissingIdentifiers internal constructor(
     val missingIdentifiersMica: List<String>,
     val missingIdentifiersCarf: List<String>
 )
 
 /**
- * Validation result returned after submitting EU identifiers.
+ * Validation result returned after updating KYC info.
  *
  * @property valid Whether the submitted identifiers were accepted.
  * @property missingIdentifiers Missing identifiers, if more are required.
@@ -126,24 +126,24 @@ class MissingEuIdentifiers internal constructor(
  */
 @ExperimentalCryptoOnramp
 @Poko
-class SubmitEuIdentifiersResult internal constructor(
+class UpdateKycInfoResult internal constructor(
     val valid: Boolean,
-    val missingIdentifiers: MissingEuIdentifiers?,
+    val missingIdentifiers: MissingIdentifiers?,
     val errors: List<String>?
 )
 
 @Serializable
-internal data class EuIdentifiersRequest(
+internal data class IdentifiersRequest(
     @SerialName("credentials")
     val credentials: CryptoCustomerRequestParams.Credentials,
     @SerialName("identifiers_mica")
-    val identifiersMica: List<EuIdentifierRequest>? = null,
+    val identifiersMica: List<IdentifierRequest>? = null,
     @SerialName("identifiers_carf")
-    val identifiersCarf: List<EuIdentifierRequest>? = null
+    val identifiersCarf: List<IdentifierRequest>? = null
 )
 
 @Serializable
-internal data class EuIdentifierRequest(
+internal data class IdentifierRequest(
     @SerialName("country")
     val country: String,
     @SerialName("identifier")
@@ -166,7 +166,7 @@ internal data class IdentifierRequirementsResponse(
 }
 
 @Serializable
-internal data class SubmitEuIdentifiersResponse(
+internal data class UpdateKycInfoResponse(
     @SerialName("valid")
     val valid: Boolean = false,
     @SerialName("missing_identifiers")
@@ -174,35 +174,35 @@ internal data class SubmitEuIdentifiersResponse(
     @SerialName("errors")
     val errors: List<String>? = null,
 ) {
-    fun toSubmitEuIdentifiersResult(): SubmitEuIdentifiersResult {
-        return SubmitEuIdentifiersResult(
+    fun toUpdateKycInfoResult(): UpdateKycInfoResult {
+        return UpdateKycInfoResult(
             valid = valid,
-            missingIdentifiers = missingIdentifiers?.toMissingEuIdentifiers(),
+            missingIdentifiers = missingIdentifiers?.toMissingIdentifiers(),
             errors = errors
         )
     }
 }
 
-internal fun EuIdentifiers.toRequest(
+internal fun Identifiers.toRequest(
     credentials: CryptoCustomerRequestParams.Credentials
-): EuIdentifiersRequest {
+): IdentifiersRequest {
     val state = build()
 
-    return EuIdentifiersRequest(
+    return IdentifiersRequest(
         credentials = credentials,
         identifiersMica = state.identifiersMica?.map { it.toRequest() },
         identifiersCarf = state.identifiersCarf?.map { it.toRequest() }
     )
 }
 
-private fun EuIdentifier.State.toRequest(): EuIdentifierRequest {
-    return EuIdentifierRequest(
+private fun Identifier.State.toRequest(): IdentifierRequest {
+    return IdentifierRequest(
         country = country.value,
         identifier = identifier
     )
 }
 
-private fun JsonObject.toMissingEuIdentifiers(): MissingEuIdentifiers {
+private fun JsonObject.toMissingIdentifiers(): MissingIdentifiers {
     val missingIdentifiersMica = readStringList(
         "missing_identifiers_mica",
         "identifiers_mica",
@@ -221,7 +221,7 @@ private fun JsonObject.toMissingEuIdentifiers(): MissingEuIdentifiers {
         emptyList()
     }
 
-    return MissingEuIdentifiers(
+    return MissingIdentifiers(
         missingIdentifiersMica = missingIdentifiersMica ?: emptyList(),
         missingIdentifiersCarf = missingIdentifiersCarf ?: fallbackIdentifiers
     )
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult.kt
similarity index 51%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult.kt
index cdd62825104..3232beaba34 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCollectEuIdentifiersResult.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult.kt
@@ -3,23 +3,23 @@ package com.stripe.android.crypto.onramp.model
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 
 /**
- * Result of submitting EU identifiers.
+ * Result of updating KYC info.
  */
 @ExperimentalCryptoOnramp
-sealed interface OnrampCollectEuIdentifiersResult {
+sealed interface OnrampUpdateKycInfoResult {
     /**
-     * EU identifier submission completed and returned a validation result.
+     * KYC info update completed and returned a validation result.
      */
     @ExperimentalCryptoOnramp
     class Completed internal constructor(
-        val result: SubmitEuIdentifiersResult
-    ) : OnrampCollectEuIdentifiersResult
+        val result: UpdateKycInfoResult
+    ) : OnrampUpdateKycInfoResult
 
     /**
-     * EU identifier submission failed.
+     * KYC info update failed.
      */
     @ExperimentalCryptoOnramp
     class Failed internal constructor(
         val error: Throwable
-    ) : OnrampCollectEuIdentifiersResult
+    ) : OnrampUpdateKycInfoResult
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index b8c7cbc35f3..e9bff3c11b8 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -20,9 +20,9 @@ import com.stripe.android.crypto.onramp.model.CryptoCustomerRequestParams
 import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.CryptoWalletRequestParams
-import com.stripe.android.crypto.onramp.model.EuIdentifiers
 import com.stripe.android.crypto.onramp.model.GetOnrampSessionResponse
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
+import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
 import com.stripe.android.crypto.onramp.model.IdentifierRequirementsResponse
 import com.stripe.android.crypto.onramp.model.KycCollectionRequest
@@ -32,8 +32,8 @@ import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationRequest
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
-import com.stripe.android.crypto.onramp.model.SubmitEuIdentifiersResponse
-import com.stripe.android.crypto.onramp.model.SubmitEuIdentifiersResult
+import com.stripe.android.crypto.onramp.model.UpdateKycInfoResponse
+import com.stripe.android.crypto.onramp.model.UpdateKycInfoResult
 import com.stripe.android.crypto.onramp.model.toRequest
 import com.stripe.android.link.LinkController
 import com.stripe.android.link.utils.isLinkAuthorizationError
@@ -143,12 +143,12 @@ internal class CryptoApiRepository @Inject constructor(
         ).map { it.toIdentifierRequirements() }
     }
 
-    suspend fun collectEuIdentifiers(
-        identifiers: EuIdentifiers,
+    suspend fun updateKycInfo(
+        identifiers: Identifiers,
         consumerSessionClientSecret: String
-    ): Result<SubmitEuIdentifiersResult> {
+    ): Result<UpdateKycInfoResult> {
         return executePost(
-            euIdentifiersUrl,
+            updateKycInfoUrl,
             JsonObject(
                 Json.encodeToJsonElement(
                     identifiers.toRequest(
@@ -156,8 +156,8 @@ internal class CryptoApiRepository @Inject constructor(
                     )
                 ).jsonObject.filterValues { it != JsonNull }
             ),
-            SubmitEuIdentifiersResponse.serializer()
-        ).map { it.toSubmitEuIdentifiersResult() }
+            UpdateKycInfoResponse.serializer()
+        ).map { it.toUpdateKycInfoResult() }
     }
 
     suspend fun retrieveCrsCarfDeclaration(
@@ -399,7 +399,7 @@ internal class CryptoApiRepository @Inject constructor(
         /**
          * @return `https://api.stripe.com/v1/crypto/internal/eu_identifiers`
          */
-        internal val euIdentifiersUrl: String
+        internal val updateKycInfoUrl: String
             get() = getApiUrl("crypto/internal/eu_identifiers")
 
         /**
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 9b5ab812f99..b850b9f0035 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -8,11 +8,11 @@ import com.stripe.android.core.networking.StripeNetworkClient
 import com.stripe.android.core.networking.StripeResponse
 import com.stripe.android.core.version.StripeSdkVersion
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
-import com.stripe.android.crypto.onramp.model.EuIdentifier
-import com.stripe.android.crypto.onramp.model.EuIdentifiers
+import com.stripe.android.crypto.onramp.model.Identifier
+import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
-import com.stripe.android.crypto.onramp.model.SubmitEuIdentifiersResult
+import com.stripe.android.crypto.onramp.model.UpdateKycInfoResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.link.LinkController
 import com.stripe.android.model.DateOfBirth
@@ -183,7 +183,7 @@ class CryptoApiRepositoryTest {
     }
 
     @Test
-    fun testCollectEuIdentifiersSucceeds() {
+    fun testUpdateKycInfoSucceeds() {
         runTest {
             val stripeResponse = StripeResponse(
                 200,
@@ -203,18 +203,18 @@ class CryptoApiRepositoryTest {
             whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
                 .thenReturn(stripeResponse)
 
-            val result = cryptoApiRepository.collectEuIdentifiers(
-                identifiers = EuIdentifiers()
+            val result = cryptoApiRepository.updateKycInfo(
+                identifiers = Identifiers()
                     .identifiersMica(
                         listOf(
-                            EuIdentifier()
+                            Identifier()
                                 .country(CountryCode.create("IE"))
                                 .identifier("mica_123")
                         )
                     )
                     .identifiersCarf(
                         listOf(
-                            EuIdentifier()
+                            Identifier()
                                 .country(CountryCode.create("FR"))
                                 .identifier("carf_456")
                         )
@@ -223,9 +223,9 @@ class CryptoApiRepositoryTest {
             )
 
             verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
-            assertEuIdentifiersRequest(apiRequestArgumentCaptor.firstValue)
+            assertIdentifiersRequest(apiRequestArgumentCaptor.firstValue)
             assertThat(result.isSuccess).isTrue()
-            assertSubmitEuIdentifiersResult(result.getOrThrow())
+            assertUpdateKycInfoResult(result.getOrThrow())
         }
     }
 
@@ -646,7 +646,7 @@ class CryptoApiRepositoryTest {
         )
     }
 
-    private fun assertEuIdentifiersRequest(apiRequest: ApiRequest) {
+    private fun assertIdentifiersRequest(apiRequest: ApiRequest) {
         assertThat(apiRequest.baseUrl)
             .isEqualTo("https://api.stripe.com/v1/crypto/internal/eu_identifiers")
         assertThat(apiRequest.params)
@@ -669,7 +669,7 @@ class CryptoApiRepositoryTest {
             )
     }
 
-    private fun assertSubmitEuIdentifiersResult(result: SubmitEuIdentifiersResult) {
+    private fun assertUpdateKycInfoResult(result: UpdateKycInfoResult) {
         assertThat(result.valid).isFalse()
         assertThat(result.missingIdentifiers?.missingIdentifiersMica)
             .isEqualTo(listOf("tax_id"))
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index ea47993742b..d2e7e5c89c1 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -13,17 +13,16 @@ import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
-import com.stripe.android.crypto.onramp.model.EuIdentifier
-import com.stripe.android.crypto.onramp.model.EuIdentifiers
+import com.stripe.android.crypto.onramp.model.Identifier
+import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
-import com.stripe.android.crypto.onramp.model.MissingEuIdentifiers
+import com.stripe.android.crypto.onramp.model.MissingIdentifiers
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampAuthorizeResult
-import com.stripe.android.crypto.onramp.model.OnrampCollectEuIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
@@ -36,12 +35,13 @@ import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterWalletAddressResult
 import com.stripe.android.crypto.onramp.model.OnrampSessionClientSecretProvider
 import com.stripe.android.crypto.onramp.model.OnrampStartVerificationResult
+import com.stripe.android.crypto.onramp.model.OnrampUpdateKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
-import com.stripe.android.crypto.onramp.model.SubmitEuIdentifiersResult
+import com.stripe.android.crypto.onramp.model.UpdateKycInfoResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityResult
 import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationScreenAction
@@ -221,34 +221,34 @@ class OnrampInteractorTest {
     }
 
     @Test
-    fun testCollectEuIdentifiersIsSuccessful() = runTest {
+    fun testUpdateKycInfoIsSuccessful() = runTest {
         whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
-        val submissionResult = SubmitEuIdentifiersResult(
+        val submissionResult = UpdateKycInfoResult(
             valid = false,
-            missingIdentifiers = MissingEuIdentifiers(
+            missingIdentifiers = MissingIdentifiers(
                 missingIdentifiersMica = emptyList(),
                 missingIdentifiersCarf = listOf("nationalities")
             ),
             errors = listOf("FR")
         )
-        whenever(cryptoApiRepository.collectEuIdentifiers(any(), any()))
+        whenever(cryptoApiRepository.updateKycInfo(any(), any()))
             .thenReturn(Result.success(submissionResult))
 
         interactor.onLinkControllerState(mockLinkStateWithAccount())
 
-        val result = interactor.collectEuIdentifiers(
-            EuIdentifiers()
+        val result = interactor.updateKycInfo(
+            Identifiers()
                 .identifiersMica(
                     listOf(
-                        EuIdentifier()
+                        Identifier()
                             .country(CountryCode.create("IE"))
                             .identifier("mica_123")
                     )
                 )
         )
 
-        assertThat(result).isInstanceOf(OnrampCollectEuIdentifiersResult.Completed::class.java)
-        val completed = result as OnrampCollectEuIdentifiersResult.Completed
+        assertThat(result).isInstanceOf(OnrampUpdateKycInfoResult.Completed::class.java)
+        val completed = result as OnrampUpdateKycInfoResult.Completed
         assertThat(completed.result).isEqualTo(submissionResult)
         testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.EuIdentifiersSubmitted)
     }

From dcf4d3d2b5cc747de44f3b77c149c687ae246e24 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 27 Apr 2026 14:53:10 -0400
Subject: [PATCH 03/57] Simplied Identifiers

---
 .../crypto/onramp/model/Identifiers.kt        | 57 ++++++-------------
 1 file changed, 17 insertions(+), 40 deletions(-)

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
index 6c0c74895ce..1e6af14c386 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
@@ -5,11 +5,6 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import dev.drewhamilton.poko.Poko
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonArray
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.JsonPrimitive
-import kotlinx.serialization.json.booleanOrNull
-import kotlinx.serialization.json.contentOrNull
 
 /**
  * Identifier payload submitted to the Crypto Onramp API.
@@ -168,9 +163,9 @@ internal data class IdentifierRequirementsResponse(
 @Serializable
 internal data class UpdateKycInfoResponse(
     @SerialName("valid")
-    val valid: Boolean = false,
+    val valid: Boolean = true,
     @SerialName("missing_identifiers")
-    val missingIdentifiers: JsonObject? = null,
+    val missingIdentifiers: MissingIdentifiersResponse? = null,
     @SerialName("errors")
     val errors: List<String>? = null,
 ) {
@@ -183,6 +178,21 @@ internal data class UpdateKycInfoResponse(
     }
 }
 
+@Serializable
+internal data class MissingIdentifiersResponse(
+    @SerialName("missing_identifiers_mica")
+    val missingIdentifiersMica: List<String> = emptyList(),
+    @SerialName("missing_identifiers_carf")
+    val missingIdentifiersCarf: List<String> = emptyList(),
+) {
+    fun toMissingIdentifiers(): MissingIdentifiers {
+        return MissingIdentifiers(
+            missingIdentifiersMica = missingIdentifiersMica,
+            missingIdentifiersCarf = missingIdentifiersCarf
+        )
+    }
+}
+
 internal fun Identifiers.toRequest(
     credentials: CryptoCustomerRequestParams.Credentials
 ): IdentifiersRequest {
@@ -201,36 +211,3 @@ private fun Identifier.State.toRequest(): IdentifierRequest {
         identifier = identifier
     )
 }
-
-private fun JsonObject.toMissingIdentifiers(): MissingIdentifiers {
-    val missingIdentifiersMica = readStringList(
-        "missing_identifiers_mica",
-        "identifiers_mica",
-        "mica",
-    )
-    val missingIdentifiersCarf = readStringList(
-        "missing_identifiers_carf",
-        "identifiers_carf",
-        "carf",
-    )
-    val fallbackIdentifiers = if (missingIdentifiersMica == null && missingIdentifiersCarf == null) {
-        entries.mapNotNull { (key, value) ->
-            ((value as? JsonPrimitive)?.booleanOrNull == true).takeIf { it }?.let { key }
-        }
-    } else {
-        emptyList()
-    }
-
-    return MissingIdentifiers(
-        missingIdentifiersMica = missingIdentifiersMica ?: emptyList(),
-        missingIdentifiersCarf = missingIdentifiersCarf ?: fallbackIdentifiers
-    )
-}
-
-private fun JsonObject.readStringList(vararg keys: String): List<String>? {
-    return keys.firstNotNullOfOrNull { key ->
-        (this[key] as? JsonArray)?.mapNotNull { element ->
-            (element as? JsonPrimitive)?.contentOrNull
-        }
-    }
-}

From 6d5c19d9dde2b5fdb04c735f37f60e3dc7073d2b Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 27 Apr 2026 15:39:43 -0400
Subject: [PATCH 04/57] linting

---
 .../android/crypto/onramp/repositories/CryptoApiRepository.kt | 3 +--
 .../com/stripe/android/crypto/onramp/OnrampInteractorTest.kt  | 4 ++--
 .../stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt | 3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index e9bff3c11b8..3267b169432 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -8,7 +8,6 @@ import com.stripe.android.core.model.parsers.StripeErrorJsonParser
 import com.stripe.android.core.networking.ApiRequest
 import com.stripe.android.core.networking.StripeNetworkClient
 import com.stripe.android.core.networking.StripeRequest
-import com.stripe.android.core.networking.executeRequestWithErrorParsing
 import com.stripe.android.core.networking.executeRequestWithKSerializerParser
 import com.stripe.android.core.networking.toMap
 import com.stripe.android.core.version.StripeSdkVersion
@@ -22,9 +21,9 @@ import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.CryptoWalletRequestParams
 import com.stripe.android.crypto.onramp.model.GetOnrampSessionResponse
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
-import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
 import com.stripe.android.crypto.onramp.model.IdentifierRequirementsResponse
+import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycCollectionRequest
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRefreshRequest
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index d2e7e5c89c1..87b1585e74b 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -13,10 +13,10 @@ import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
-import com.stripe.android.crypto.onramp.model.Identifier
-import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
+import com.stripe.android.crypto.onramp.model.Identifier
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
+import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
diff --git a/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt b/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt
index 925c9d78546..4f2412f16ce 100644
--- a/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt
+++ b/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt
@@ -3,7 +3,6 @@ package com.stripe.android.link.onramp.ui
 import androidx.activity.compose.BackHandler
 import androidx.annotation.RestrictTo
 import androidx.compose.foundation.background
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -14,6 +13,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.Surface
@@ -30,6 +30,7 @@ import com.stripe.android.link.ui.PrimaryButton
 import com.stripe.android.link.ui.PrimaryButtonState
 
 @Composable
+@Suppress("LongMethod")
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 fun CrsCarfDeclarationScreen(
     appearance: LinkAppearance.State?,

From 8c25f8ec6f27755dbf8393ee641156abd327bece Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 27 Apr 2026 16:17:42 -0400
Subject: [PATCH 05/57] Update OnrampActivity example

---
 .../crypto/onramp/example/OnrampActivity.kt   | 31 ++++++++++++++++---
 .../crypto/onramp/example/OnrampViewModel.kt  | 16 ++++++++++
 .../onramp/ui/CrsCarfDeclarationScreen.kt     |  4 +--
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
index 5ed5d38d099..1a69d49a0cb 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
@@ -217,6 +217,9 @@ internal class OnrampActivity : ComponentActivity() {
                             },
                             onVerifyKyc = {
                                 onrampPresenter.verifyKycInfo()
+                            },
+                            onShowCRSCARFDeclaration = {
+                                onrampPresenter.presentCrsCarfDeclaration()
                             }
                         )
                     }
@@ -428,6 +431,7 @@ internal fun OnrampScreen(
     onCollectPayment: (type: PaymentMethodSelection) -> Unit,
     onCreatePaymentToken: () -> Unit,
     onVerifyKyc: () -> Unit,
+    onShowCRSCARFDeclaration: () -> Unit,
 ) {
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
 
@@ -505,6 +509,7 @@ internal fun OnrampScreen(
                     onCollectKYC = { kycInfo -> viewModel.collectKycInfo(kycInfo) },
                     onVerifyKyc = onVerifyKyc,
                     onStartVerification = onStartVerification,
+                    onShowCRSCARFDeclaration = onShowCRSCARFDeclaration,
                     onCollectPayment = onCollectPayment,
                     onCreatePaymentToken = onCreatePaymentToken,
                     onCreateSession = { viewModel.createSession() },
@@ -736,6 +741,7 @@ private fun AuthenticatedOperationsScreen(
     onCollectKYC: (KycInfo) -> Unit,
     onVerifyKyc: () -> Unit,
     onStartVerification: () -> Unit,
+    onShowCRSCARFDeclaration: () -> Unit,
     onCollectPayment: (type: PaymentMethodSelection) -> Unit,
     onCreatePaymentToken: () -> Unit,
     onCreateSession: () -> Unit,
@@ -974,9 +980,14 @@ private fun AuthenticatedOperationsScreen(
             }
         }
 
-        StartVerificationScreen {
-            onStartVerification()
-        }
+        StartVerificationScreen(
+            startVerification = {
+                onStartVerification()
+            },
+            showCRSCARFDeclaration = {
+                onShowCRSCARFDeclaration()
+            }
+        )
 
         Text(
             text = "Payment",
@@ -1183,7 +1194,8 @@ private fun KYCTextField(
 
 @Composable
 private fun StartVerificationScreen(
-    startVerification: () -> Unit
+    startVerification: () -> Unit,
+    showCRSCARFDeclaration: () -> Unit
 ) {
     Column {
         Text(
@@ -1202,6 +1214,17 @@ private fun StartVerificationScreen(
         ) {
             Text("Start Identity Verification")
         }
+
+        Button(
+            onClick = {
+                showCRSCARFDeclaration()
+            },
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 24.dp)
+        ) {
+            Text("CRS CARF Declaration")
+        }
     }
 }
 
diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index 2c43059a019..786d731d136 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -30,6 +30,7 @@ import com.stripe.android.crypto.onramp.model.OnrampCheckoutResult
 import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
+import com.stripe.android.crypto.onramp.model.OnrampCrsCarfDeclarationResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
@@ -69,6 +70,7 @@ internal class OnrampViewModel(
         .authorizeCallback(callback = ::onAuthorizeResult)
         .onrampSessionClientSecretProvider(callback = ::checkoutWithBackend)
         .googlePayIsReadyCallback(callback = ::googlePayIsReady)
+        .crsCarfDeclarationCallback(callback = ::onCrsCarfDeclarationResult)
 
     val onrampCoordinator: OnrampCoordinator =
         OnrampCoordinator
@@ -338,6 +340,20 @@ internal class OnrampViewModel(
         }
     }
 
+    fun onCrsCarfDeclarationResult(result: OnrampCrsCarfDeclarationResult) {
+        when (result) {
+            is OnrampCrsCarfDeclarationResult.Confirmed -> {
+                _message.value = "CRS CARF Declaration Confirmed"
+            }
+            is OnrampCrsCarfDeclarationResult.Failed -> {
+                _message.value = "CRS CARF Declaration failed: ${result.error.message}"
+            }
+            is OnrampCrsCarfDeclarationResult.Cancelled -> {
+                _message.value = "CRS CARF Declaration cancelled, please try again"
+            }
+        }
+    }
+
     fun onVerifyKycResult(result: OnrampVerifyKycInfoResult) {
         when (result) {
             is OnrampVerifyKycInfoResult.Confirmed -> {
diff --git a/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt b/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt
index 4f2412f16ce..c3b14d00938 100644
--- a/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt
+++ b/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt
@@ -65,8 +65,8 @@ fun CrsCarfDeclarationScreen(
                         verticalAlignment = Alignment.CenterVertically
                     ) {
                         Text(
-                            text = "Tax declaration",
-                            style = LinkTheme.typography.bodyEmphasized,
+                            text = "Declarations",
+                            style = LinkTheme.typography.title,
                             color = LinkTheme.colors.textPrimary
                         )
                         TextButton(onClick = onClose) {

From 939b6d483ebedbbf2a5ab3f267ada19281c1e36b Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 27 Apr 2026 16:27:40 -0400
Subject: [PATCH 06/57] Adds in some KYC collection fields to the example app

---
 .../crypto/onramp/example/OnrampActivity.kt   | 54 ++++++++++++++++++-
 .../crypto/onramp/example/OnrampViewModel.kt  | 21 ++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
index 1a69d49a0cb..36d26cbc85e 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
@@ -76,6 +76,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.lifecycleScope
+import com.stripe.android.core.model.CountryCode
 import com.stripe.android.core.utils.FeatureFlags
 import com.stripe.android.crypto.onramp.OnrampCoordinator
 import com.stripe.android.crypto.onramp.example.network.OnrampSessionResponse
@@ -502,6 +503,12 @@ internal fun OnrampScreen(
                     onKycFirstNameChange = viewModel::updateKycFirstName,
                     kycLastName = uiState.kycLastName,
                     onKycLastNameChange = viewModel::updateKycLastName,
+                    kycBirthCountry = uiState.kycBirthCountry,
+                    onKycBirthCountryChange = viewModel::updateKycBirthCountry,
+                    kycBirthCity = uiState.kycBirthCity,
+                    onKycBirthCityChange = viewModel::updateKycBirthCity,
+                    kycNationalities = uiState.kycNationalities,
+                    onKycNationalitiesChange = viewModel::updateKycNationalities,
                     kycAddress = uiState.kycAddress,
                     onKycAddressChange = viewModel::updateKycAddress,
                     onAuthenticate = onAuthenticateUser,
@@ -734,6 +741,12 @@ private fun AuthenticatedOperationsScreen(
     onKycFirstNameChange: (String) -> Unit,
     kycLastName: String,
     onKycLastNameChange: (String) -> Unit,
+    kycBirthCountry: String,
+    onKycBirthCountryChange: (String) -> Unit,
+    kycBirthCity: String,
+    onKycBirthCityChange: (String) -> Unit,
+    kycNationalities: String,
+    onKycNationalitiesChange: (String) -> Unit,
     kycAddress: PaymentSheet.Address,
     onKycAddressChange: (PaymentSheet.Address) -> Unit,
     onAuthenticate: (oauthScopes: String) -> Unit,
@@ -964,6 +977,12 @@ private fun AuthenticatedOperationsScreen(
                     onFirstNameChange = onKycFirstNameChange,
                     lastName = kycLastName,
                     onLastNameChange = onKycLastNameChange,
+                    birthCountry = kycBirthCountry,
+                    onBirthCountryChange = onKycBirthCountryChange,
+                    birthCity = kycBirthCity,
+                    onBirthCityChange = onKycBirthCityChange,
+                    nationalities = kycNationalities,
+                    onNationalitiesChange = onKycNationalitiesChange,
                     address = kycAddress,
                     onAddressChange = onKycAddressChange,
                     onCollectKYC = onCollectKYC,
@@ -1103,6 +1122,12 @@ private fun KYCScreen(
     onFirstNameChange: (String) -> Unit,
     lastName: String,
     onLastNameChange: (String) -> Unit,
+    birthCountry: String,
+    onBirthCountryChange: (String) -> Unit,
+    birthCity: String,
+    onBirthCityChange: (String) -> Unit,
+    nationalities: String,
+    onNationalitiesChange: (String) -> Unit,
     address: PaymentSheet.Address,
     onAddressChange: (PaymentSheet.Address) -> Unit,
     onCollectKYC: (KycInfo) -> Unit
@@ -1129,6 +1154,18 @@ private fun KYCScreen(
             KYCTextField(dobYear, "Year", Modifier.weight(2f), KeyboardType.Number) { dobYear = it }
         }
 
+        Text(
+            text = "Birth Details",
+            fontWeight = FontWeight.SemiBold,
+            modifier = Modifier.padding(bottom = 8.dp, top = 8.dp)
+        )
+
+        KYCTextField(birthCountry, "Birth Country (ISO)") { onBirthCountryChange(it) }
+        KYCTextField(birthCity, "Birth City") { onBirthCityChange(it) }
+        KYCTextField(nationalities, "Nationalities (ISO, comma-separated)") {
+            onNationalitiesChange(it)
+        }
+
         Text(
             text = "Address",
             fontWeight = FontWeight.SemiBold,
@@ -1160,7 +1197,10 @@ private fun KYCScreen(
                         lastName = lastName,
                         idNumber = ssn,
                         dateOfBirth = dateOfBirth,
-                        address = address
+                        address = address,
+                        birthCountry = birthCountry.toCountryCodeOrNull(),
+                        birthCity = birthCity.trim().takeIf { it.isNotEmpty() },
+                        nationalities = nationalities.toCountryCodesOrNull()
                     )
                 )
             },
@@ -1192,6 +1232,18 @@ private fun KYCTextField(
     )
 }
 
+private fun String.toCountryCodeOrNull(): CountryCode? {
+    return trim()
+        .takeIf { it.isNotEmpty() }
+        ?.let(CountryCode::create)
+}
+
+private fun String.toCountryCodesOrNull(): List<CountryCode>? {
+    return split(",")
+        .mapNotNull { it.toCountryCodeOrNull() }
+        .takeIf { it.isNotEmpty() }
+}
+
 @Composable
 private fun StartVerificationScreen(
     startVerification: () -> Unit,
diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index 786d731d136..12ffd0c34cd 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -386,6 +386,12 @@ internal class OnrampViewModel(
                         selectedPaymentData = result.displayData,
                         kycFirstName = result.kycInfo?.firstName ?: it.kycFirstName,
                         kycLastName = result.kycInfo?.lastName ?: it.kycLastName,
+                        kycBirthCountry = result.kycInfo?.birthCountry?.value ?: it.kycBirthCountry,
+                        kycBirthCity = result.kycInfo?.birthCity ?: it.kycBirthCity,
+                        kycNationalities = result.kycInfo?.nationalities
+                            ?.takeIf { nationalities -> nationalities.isNotEmpty() }
+                            ?.joinToString(", ") { nationality -> nationality.value }
+                            ?: it.kycNationalities,
                         kycAddress = result.kycInfo?.address ?: it.kycAddress
                     )
                 }
@@ -714,6 +720,18 @@ internal class OnrampViewModel(
         _uiState.update { it.copy(kycLastName = value) }
     }
 
+    fun updateKycBirthCountry(value: String) {
+        _uiState.update { it.copy(kycBirthCountry = value) }
+    }
+
+    fun updateKycBirthCity(value: String) {
+        _uiState.update { it.copy(kycBirthCity = value) }
+    }
+
+    fun updateKycNationalities(value: String) {
+        _uiState.update { it.copy(kycNationalities = value) }
+    }
+
     fun updateKycAddress(address: PaymentSheet.Address) {
         _uiState.update { it.copy(kycAddress = address) }
     }
@@ -841,6 +859,9 @@ data class OnrampUiState(
     val googlePayIsReady: Boolean = false,
     val kycFirstName: String = "",
     val kycLastName: String = "",
+    val kycBirthCountry: String = "",
+    val kycBirthCity: String = "",
+    val kycNationalities: String = "",
     val kycAddress: PaymentSheet.Address = PaymentSheet.Address(),
 ) : Parcelable
 

From e1121b0b2422e078ecbefbe18b060b7106b0cf98 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 28 Apr 2026 10:42:02 -0400
Subject: [PATCH 07/57] Changes to API spec

---
 crypto-onramp/api/crypto-onramp.api           |  1 +
 .../onramp/analytics/OnrampAnalyticsEvent.kt  |  2 +-
 .../crypto/onramp/model/Identifiers.kt        | 24 +++++++++++++++----
 .../repositories/CryptoApiRepository.kt       |  6 ++++-
 .../crypto/onramp/CryptoApiRepositoryTest.kt  |  4 +++-
 5 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index e581f27b986..620405efc3c 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -84,6 +84,7 @@ public final class com/stripe/android/crypto/onramp/model/Identifier {
 	public fun <init> ()V
 	public final fun country (Lcom/stripe/android/core/model/CountryCode;)Lcom/stripe/android/crypto/onramp/model/Identifier;
 	public final fun identifier (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Identifier;
+	public final fun identifierType (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Identifier;
 }
 
 public final class com/stripe/android/crypto/onramp/model/IdentifierRequirements {
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
index 2b04f374367..2c18913a037 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
@@ -178,7 +178,7 @@ internal sealed class OnrampAnalyticsEvent(
             PerformCheckout("perform_checkout"),
             LogOut("log_out"),
             VerifyKyc("verify_kyc_info"),
-            GetIdentifierRequirements("get_identifier_requirements"),
+            GetIdentifierRequirements("identifier_requirements"),
             CollectEuIdentifiers("collect_eu_identifiers"),
             ConfirmCrsCarfDeclaration("confirm_crs_carf_declaration")
         }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
index 1e6af14c386..b2398cffc4b 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
@@ -49,11 +49,13 @@ class Identifiers {
  *
  * @property country ISO 3166-1 alpha-2 country code associated with the identifier.
  * @property identifier The identifier value.
+ * @property identifierType Optional subtype for classifying the identifier.
  */
 @ExperimentalCryptoOnramp
 class Identifier {
     private var country: CountryCode? = null
     private var identifier: String? = null
+    private var identifierType: String? = null
 
     /**
      * Sets the ISO 3166-1 alpha-2 country code associated with the identifier.
@@ -69,9 +71,17 @@ class Identifier {
         this.identifier = identifier
     }
 
+    /**
+     * Sets an optional subtype for the identifier.
+     */
+    fun identifierType(identifierType: String) = apply {
+        this.identifierType = identifierType
+    }
+
     internal class State(
         val country: CountryCode,
-        val identifier: String
+        val identifier: String,
+        val identifierType: String?
     )
 
     internal fun build(): State {
@@ -81,7 +91,8 @@ class Identifier {
             },
             identifier = requireNotNull(identifier) {
                 "identifier must not be null"
-            }
+            },
+            identifierType = identifierType
         )
     }
 }
@@ -117,7 +128,7 @@ class MissingIdentifiers internal constructor(
  *
  * @property valid Whether the submitted identifiers were accepted.
  * @property missingIdentifiers Missing identifiers, if more are required.
- * @property errors Invalid country codes for identifiers that were rejected.
+ * @property errors Validation errors returned by the API.
  */
 @ExperimentalCryptoOnramp
 @Poko
@@ -142,7 +153,9 @@ internal data class IdentifierRequest(
     @SerialName("country")
     val country: String,
     @SerialName("identifier")
-    val identifier: String
+    val identifier: String,
+    @SerialName("identifier_type")
+    val identifierType: String? = null
 )
 
 @Serializable
@@ -208,6 +221,7 @@ internal fun Identifiers.toRequest(
 private fun Identifier.State.toRequest(): IdentifierRequest {
     return IdentifierRequest(
         country = country.value,
-        identifier = identifier
+        identifier = identifier,
+        identifierType = identifierType
     )
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index 3267b169432..13cbf732f8a 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -77,6 +77,10 @@ internal class CryptoApiRepository @Inject constructor(
         encodeDefaults = true
     }
 
+    private val nullOmittingJson = Json {
+        explicitNulls = false
+    }
+
     /**
      * Grants the provided session merchant permissions.
      *
@@ -149,7 +153,7 @@ internal class CryptoApiRepository @Inject constructor(
         return executePost(
             updateKycInfoUrl,
             JsonObject(
-                Json.encodeToJsonElement(
+                nullOmittingJson.encodeToJsonElement(
                     identifiers.toRequest(
                         credentials = CryptoCustomerRequestParams.Credentials(consumerSessionClientSecret)
                     )
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index b850b9f0035..8b005df8bd5 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -210,6 +210,7 @@ class CryptoApiRepositoryTest {
                             Identifier()
                                 .country(CountryCode.create("IE"))
                                 .identifier("mica_123")
+                                .identifierType("tax_id")
                         )
                     )
                     .identifiersCarf(
@@ -656,7 +657,8 @@ class CryptoApiRepositoryTest {
                     "identifiers_mica" to listOf(
                         mapOf(
                             "country" to "IE",
-                            "identifier" to "mica_123"
+                            "identifier" to "mica_123",
+                            "identifier_type" to "tax_id"
                         )
                     ),
                     "identifiers_carf" to listOf(

From d8294571ff282a84ef7ac9fe13d66f672d092c0a Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 28 Apr 2026 10:44:05 -0400
Subject: [PATCH 08/57] linting

---
 .../com/stripe/android/crypto/onramp/example/OnrampActivity.kt   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
index 36d26cbc85e..53a97893eb1 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
@@ -1117,6 +1117,7 @@ private fun AuthenticatedOperationsScreen(
 }
 
 @Composable
+@Suppress("LongMethod")
 private fun KYCScreen(
     firstName: String,
     onFirstNameChange: (String) -> Unit,

From d63da715649fbfa7befb955ceffadc3c032fbdb8 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 28 Apr 2026 11:03:32 -0400
Subject: [PATCH 09/57] Updating example app with identifier submission

---
 .../crypto/onramp/example/OnrampActivity.kt   | 218 ++++++++++++++----
 .../crypto/onramp/example/OnrampViewModel.kt  | 198 ++++++++++++++++
 2 files changed, 374 insertions(+), 42 deletions(-)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
index 53a97893eb1..0bc8ce403d1 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
@@ -493,27 +493,24 @@ internal fun OnrampScreen(
             }
             Screen.AuthenticatedOperations -> {
                 AuthenticatedOperationsScreen(
-                    email = uiState.email,
-                    consentedLinkAuthIntentIds = uiState.consentedLinkAuthIntentIds,
-                    onrampSessionResponse = uiState.onrampSession,
-                    selectedSettlementSpeed = uiState.settlementSpeed,
-                    selectedPaymentData = uiState.selectedPaymentData,
-                    googlePayIsReady = uiState.googlePayIsReady,
-                    kycFirstName = uiState.kycFirstName,
+                    state = uiState,
                     onKycFirstNameChange = viewModel::updateKycFirstName,
-                    kycLastName = uiState.kycLastName,
                     onKycLastNameChange = viewModel::updateKycLastName,
-                    kycBirthCountry = uiState.kycBirthCountry,
                     onKycBirthCountryChange = viewModel::updateKycBirthCountry,
-                    kycBirthCity = uiState.kycBirthCity,
                     onKycBirthCityChange = viewModel::updateKycBirthCity,
-                    kycNationalities = uiState.kycNationalities,
                     onKycNationalitiesChange = viewModel::updateKycNationalities,
-                    kycAddress = uiState.kycAddress,
                     onKycAddressChange = viewModel::updateKycAddress,
+                    onMicaIdentifierCountryChange = viewModel::updateMicaIdentifierCountry,
+                    onMicaIdentifierValueChange = viewModel::updateMicaIdentifierValue,
+                    onMicaIdentifierTypeChange = viewModel::updateMicaIdentifierType,
+                    onCarfIdentifierCountryChange = viewModel::updateCarfIdentifierCountry,
+                    onCarfIdentifierValueChange = viewModel::updateCarfIdentifierValue,
+                    onCarfIdentifierTypeChange = viewModel::updateCarfIdentifierType,
                     onAuthenticate = onAuthenticateUser,
                     onRegisterWalletAddress = onRegisterWalletAddress,
                     onCollectKYC = { kycInfo -> viewModel.collectKycInfo(kycInfo) },
+                    onGetIdentifierRequirements = viewModel::getIdentifierRequirements,
+                    onUpdateKycInfo = viewModel::updateIdentifierInfo,
                     onVerifyKyc = onVerifyKyc,
                     onStartVerification = onStartVerification,
                     onShowCRSCARFDeclaration = onShowCRSCARFDeclaration,
@@ -731,27 +728,24 @@ fun AuthenticateSection(
 @Composable
 @Suppress("LongMethod")
 private fun AuthenticatedOperationsScreen(
-    email: String,
-    consentedLinkAuthIntentIds: List<String>,
-    onrampSessionResponse: OnrampSessionResponse?,
-    selectedPaymentData: PaymentMethodDisplayData?,
-    selectedSettlementSpeed: SettlementSpeed?,
-    googlePayIsReady: Boolean,
-    kycFirstName: String,
+    state: OnrampUiState,
     onKycFirstNameChange: (String) -> Unit,
-    kycLastName: String,
     onKycLastNameChange: (String) -> Unit,
-    kycBirthCountry: String,
     onKycBirthCountryChange: (String) -> Unit,
-    kycBirthCity: String,
     onKycBirthCityChange: (String) -> Unit,
-    kycNationalities: String,
     onKycNationalitiesChange: (String) -> Unit,
-    kycAddress: PaymentSheet.Address,
     onKycAddressChange: (PaymentSheet.Address) -> Unit,
+    onMicaIdentifierCountryChange: (String) -> Unit,
+    onMicaIdentifierValueChange: (String) -> Unit,
+    onMicaIdentifierTypeChange: (String) -> Unit,
+    onCarfIdentifierCountryChange: (String) -> Unit,
+    onCarfIdentifierValueChange: (String) -> Unit,
+    onCarfIdentifierTypeChange: (String) -> Unit,
     onAuthenticate: (oauthScopes: String) -> Unit,
     onRegisterWalletAddress: (String, CryptoNetwork) -> Unit,
     onCollectKYC: (KycInfo) -> Unit,
+    onGetIdentifierRequirements: () -> Unit,
+    onUpdateKycInfo: () -> Unit,
     onVerifyKyc: () -> Unit,
     onStartVerification: () -> Unit,
     onShowCRSCARFDeclaration: () -> Unit,
@@ -783,16 +777,16 @@ private fun AuthenticatedOperationsScreen(
         )
 
         Text(
-            text = "Email: $email",
+            text = "Email: ${state.email}",
             modifier = Modifier.padding(bottom = 8.dp)
         )
 
         Text(
-            text = "Consented LAIs:\n${consentedLinkAuthIntentIds.joinToString("\n")}",
+            text = "Consented LAIs:\n${state.consentedLinkAuthIntentIds.joinToString("\n")}",
             modifier = Modifier.padding(bottom = 8.dp)
         )
 
-        onrampSessionResponse?.let { response ->
+        state.onrampSession?.let { response ->
             Text(
                 text = "Onramp Session ID: ${response.id}",
                 modifier = Modifier.padding(bottom = 24.dp)
@@ -832,7 +826,7 @@ private fun AuthenticatedOperationsScreen(
             Spacer(modifier = Modifier.height(16.dp))
         }
 
-        selectedPaymentData?.let {
+        state.selectedPaymentData?.let {
             when (it.type) {
                 PaymentMethodDisplayData.Type.Card, PaymentMethodDisplayData.Type.GooglePay -> { }
                 PaymentMethodDisplayData.Type.BankAccount -> {
@@ -847,7 +841,7 @@ private fun AuthenticatedOperationsScreen(
                         modifier = Modifier.padding(bottom = 16.dp)
                     ) {
                         SettlementSpeed.entries.forEach { speed ->
-                            val isSelected = selectedSettlementSpeed == speed
+                            val isSelected = state.settlementSpeed == speed
                             Box(
                                 modifier = Modifier
                                     .background(if (isSelected) MaterialTheme.colors.primary else Color.LightGray)
@@ -865,20 +859,20 @@ private fun AuthenticatedOperationsScreen(
             }
 
             Image(
-                painter = selectedPaymentData.iconPainter,
-                contentDescription = selectedPaymentData.label,
+                painter = it.iconPainter,
+                contentDescription = it.label,
                 modifier = Modifier
                     .height(24.dp)
                     .padding(end = 8.dp)
             )
 
             Text(
-                text = "Selected Payment Type: ${selectedPaymentData.label}",
+                text = "Selected Payment Type: ${it.label}",
                 modifier = Modifier.padding(bottom = 24.dp)
             )
 
             Text(
-                text = "Selected Payment Value: ${selectedPaymentData.sublabel}",
+                text = "Selected Payment Value: ${it.sublabel}",
                 modifier = Modifier.padding(bottom = 24.dp)
             )
         }
@@ -973,17 +967,17 @@ private fun AuthenticatedOperationsScreen(
         AnimatedVisibility(visible = kycExpanded) {
             Column {
                 KYCScreen(
-                    firstName = kycFirstName,
+                    firstName = state.kycFirstName,
                     onFirstNameChange = onKycFirstNameChange,
-                    lastName = kycLastName,
+                    lastName = state.kycLastName,
                     onLastNameChange = onKycLastNameChange,
-                    birthCountry = kycBirthCountry,
+                    birthCountry = state.kycBirthCountry,
                     onBirthCountryChange = onKycBirthCountryChange,
-                    birthCity = kycBirthCity,
+                    birthCity = state.kycBirthCity,
                     onBirthCityChange = onKycBirthCityChange,
-                    nationalities = kycNationalities,
+                    nationalities = state.kycNationalities,
                     onNationalitiesChange = onKycNationalitiesChange,
-                    address = kycAddress,
+                    address = state.kycAddress,
                     onAddressChange = onKycAddressChange,
                     onCollectKYC = onCollectKYC,
                 )
@@ -999,6 +993,44 @@ private fun AuthenticatedOperationsScreen(
             }
         }
 
+        var identifiersExpanded by remember { mutableStateOf(false) }
+
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .clickable { identifiersExpanded = !identifiersExpanded }
+                .padding(vertical = 20.dp),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Text(
+                text = "Identifier Info",
+                fontWeight = FontWeight.Bold,
+            )
+            Text(text = if (identifiersExpanded) "▲" else "▼")
+        }
+
+        AnimatedVisibility(visible = identifiersExpanded) {
+            IdentifierInfoScreen(
+                micaIdentifierCountry = state.micaIdentifierCountry,
+                onMicaIdentifierCountryChange = onMicaIdentifierCountryChange,
+                micaIdentifierValue = state.micaIdentifierValue,
+                onMicaIdentifierValueChange = onMicaIdentifierValueChange,
+                micaIdentifierType = state.micaIdentifierType,
+                onMicaIdentifierTypeChange = onMicaIdentifierTypeChange,
+                carfIdentifierCountry = state.carfIdentifierCountry,
+                onCarfIdentifierCountryChange = onCarfIdentifierCountryChange,
+                carfIdentifierValue = state.carfIdentifierValue,
+                onCarfIdentifierValueChange = onCarfIdentifierValueChange,
+                carfIdentifierType = state.carfIdentifierType,
+                onCarfIdentifierTypeChange = onCarfIdentifierTypeChange,
+                identifierRequirementsSummary = state.identifierRequirementsSummary,
+                updateKycInfoSummary = state.updateKycInfoSummary,
+                onGetIdentifierRequirements = onGetIdentifierRequirements,
+                onUpdateKycInfo = onUpdateKycInfo,
+            )
+        }
+
         StartVerificationScreen(
             startVerification = {
                 onStartVerification()
@@ -1043,7 +1075,7 @@ private fun AuthenticatedOperationsScreen(
         }
 
         GooglePayButton(
-            enabled = googlePayIsReady,
+            enabled = state.googlePayIsReady,
             modifier = Modifier
                 .fillMaxWidth()
                 .height(48.dp)
@@ -1081,14 +1113,14 @@ private fun AuthenticatedOperationsScreen(
 
         Button(
             onClick = onPerformCheckout,
-            enabled = onrampSessionResponse != null,
+            enabled = state.onrampSession != null,
             modifier = Modifier
                 .testTag(CHECKOUT_BUTTON_TAG)
                 .fillMaxWidth()
                 .padding(bottom = 8.dp)
         ) {
             Text(
-                if (onrampSessionResponse != null) {
+                if (state.onrampSession != null) {
                     "🚀 Checkout"
                 } else {
                     "🚀 Checkout (Create session first)"
@@ -1116,6 +1148,108 @@ private fun AuthenticatedOperationsScreen(
     }
 }
 
+@Composable
+private fun IdentifierInfoScreen(
+    micaIdentifierCountry: String,
+    onMicaIdentifierCountryChange: (String) -> Unit,
+    micaIdentifierValue: String,
+    onMicaIdentifierValueChange: (String) -> Unit,
+    micaIdentifierType: String,
+    onMicaIdentifierTypeChange: (String) -> Unit,
+    carfIdentifierCountry: String,
+    onCarfIdentifierCountryChange: (String) -> Unit,
+    carfIdentifierValue: String,
+    onCarfIdentifierValueChange: (String) -> Unit,
+    carfIdentifierType: String,
+    onCarfIdentifierTypeChange: (String) -> Unit,
+    identifierRequirementsSummary: String?,
+    updateKycInfoSummary: String?,
+    onGetIdentifierRequirements: () -> Unit,
+    onUpdateKycInfo: () -> Unit,
+) {
+    Column {
+        Text(
+            text = "Identifier Requirements",
+            fontWeight = FontWeight.SemiBold,
+            modifier = Modifier.padding(bottom = 8.dp)
+        )
+
+        Text(
+            text = "Fetch missing MiCA and CARF identifier fields for the current Link user.",
+            modifier = Modifier.padding(bottom = 12.dp)
+        )
+
+        Button(
+            onClick = onGetIdentifierRequirements,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 12.dp)
+        ) {
+            Text("Get Identifier Requirements")
+        }
+
+        identifierRequirementsSummary?.let { summary ->
+            Text(
+                text = "Latest requirements:\n$summary",
+                modifier = Modifier.padding(bottom = 20.dp)
+            )
+        }
+
+        Text(
+            text = "Update Identifier Info",
+            fontWeight = FontWeight.SemiBold,
+            modifier = Modifier.padding(bottom = 8.dp)
+        )
+
+        Text(
+            text = "This sample app submits one MiCA entry and one CARF entry.",
+            modifier = Modifier.padding(bottom = 12.dp)
+        )
+
+        Text(
+            text = "MiCA",
+            fontWeight = FontWeight.SemiBold,
+            modifier = Modifier.padding(bottom = 8.dp)
+        )
+        KYCTextField(micaIdentifierCountry, "MiCA Country (ISO)", onChange = onMicaIdentifierCountryChange)
+        KYCTextField(micaIdentifierValue, "MiCA Identifier", onChange = onMicaIdentifierValueChange)
+        KYCTextField(
+            micaIdentifierType,
+            "MiCA Identifier Type (optional)",
+            onChange = onMicaIdentifierTypeChange
+        )
+
+        Text(
+            text = "CARF",
+            fontWeight = FontWeight.SemiBold,
+            modifier = Modifier.padding(bottom = 8.dp)
+        )
+        KYCTextField(carfIdentifierCountry, "CARF Country (ISO)", onChange = onCarfIdentifierCountryChange)
+        KYCTextField(carfIdentifierValue, "CARF Identifier", onChange = onCarfIdentifierValueChange)
+        KYCTextField(
+            carfIdentifierType,
+            "CARF Identifier Type (optional)",
+            onChange = onCarfIdentifierTypeChange
+        )
+
+        Button(
+            onClick = onUpdateKycInfo,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 12.dp)
+        ) {
+            Text("Update Identifier Info")
+        }
+
+        updateKycInfoSummary?.let { summary ->
+            Text(
+                text = "Latest update result:\n$summary",
+                modifier = Modifier.padding(bottom = 24.dp)
+            )
+        }
+    }
+}
+
 @Composable
 @Suppress("LongMethod")
 private fun KYCScreen(
diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index 12ffd0c34cd..3aec200f6fb 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -15,10 +15,14 @@ import androidx.lifecycle.createSavedStateHandle
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.CreationExtras
 import com.github.kittinunf.result.Result
+import com.stripe.android.core.model.CountryCode
 import com.stripe.android.core.utils.requireApplication
 import com.stripe.android.crypto.onramp.OnrampCoordinator
 import com.stripe.android.crypto.onramp.example.network.OnrampSessionResponse
 import com.stripe.android.crypto.onramp.example.network.SettlementSpeed
+import com.stripe.android.crypto.onramp.model.Identifier
+import com.stripe.android.crypto.onramp.model.IdentifierRequirements
+import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.example.network.TestBackendRepository
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
@@ -31,15 +35,18 @@ import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
 import com.stripe.android.crypto.onramp.model.OnrampCrsCarfDeclarationResult
+import com.stripe.android.crypto.onramp.model.OnrampGetIdentifierRequirementsResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterWalletAddressResult
 import com.stripe.android.crypto.onramp.model.OnrampTokenAuthenticationResult
+import com.stripe.android.crypto.onramp.model.OnrampUpdateKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodDisplayData
+import com.stripe.android.crypto.onramp.model.UpdateKycInfoResult
 import com.stripe.android.googlepaylauncher.GooglePayEnvironment
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
 import com.stripe.android.link.LinkAppearance
@@ -555,6 +562,78 @@ internal class OnrampViewModel(
         }
     }
 
+    fun getIdentifierRequirements() {
+        _uiState.update {
+            it.copy(
+                screen = Screen.Loading,
+                loadingMessage = "Retrieving identifier requirements..."
+            )
+        }
+
+        viewModelScope.launch {
+            val result = onrampCoordinator.getIdentifierRequirements()
+
+            when (result) {
+                is OnrampGetIdentifierRequirementsResult.Completed -> {
+                    _message.value = "Identifier requirements retrieved"
+                    _uiState.update {
+                        it.copy(
+                            screen = Screen.AuthenticatedOperations,
+                            loadingMessage = null,
+                            identifierRequirementsSummary = formatIdentifierRequirements(result.requirements)
+                        )
+                    }
+                }
+                is OnrampGetIdentifierRequirementsResult.Failed -> handleError(result.error) {
+                    _message.value = "Failed to retrieve identifier requirements: ${result.error.message}"
+                    _uiState.update {
+                        it.copy(
+                            screen = Screen.AuthenticatedOperations,
+                            loadingMessage = null
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    fun updateIdentifierInfo() {
+        val identifiers = buildIdentifiersRequest(_uiState.value) ?: return
+
+        _uiState.update {
+            it.copy(
+                screen = Screen.Loading,
+                loadingMessage = "Updating identifier information..."
+            )
+        }
+
+        viewModelScope.launch {
+            val result = onrampCoordinator.updateKycInfo(identifiers)
+
+            when (result) {
+                is OnrampUpdateKycInfoResult.Completed -> {
+                    _message.value = "Identifier update completed"
+                    _uiState.update {
+                        it.copy(
+                            screen = Screen.AuthenticatedOperations,
+                            loadingMessage = null,
+                            updateKycInfoSummary = formatUpdateKycInfoResult(result.result)
+                        )
+                    }
+                }
+                is OnrampUpdateKycInfoResult.Failed -> handleError(result.error) {
+                    _message.value = "Identifier update failed: ${result.error.message}"
+                    _uiState.update {
+                        it.copy(
+                            screen = Screen.AuthenticatedOperations,
+                            loadingMessage = null
+                        )
+                    }
+                }
+            }
+        }
+    }
+
     fun updatePhoneNumber(phoneNumber: String) {
         if (phoneNumber.isBlank()) {
             _message.value = "Please enter a phone number"
@@ -736,6 +815,30 @@ internal class OnrampViewModel(
         _uiState.update { it.copy(kycAddress = address) }
     }
 
+    fun updateMicaIdentifierCountry(value: String) {
+        _uiState.update { it.copy(micaIdentifierCountry = value) }
+    }
+
+    fun updateMicaIdentifierValue(value: String) {
+        _uiState.update { it.copy(micaIdentifierValue = value) }
+    }
+
+    fun updateMicaIdentifierType(value: String) {
+        _uiState.update { it.copy(micaIdentifierType = value) }
+    }
+
+    fun updateCarfIdentifierCountry(value: String) {
+        _uiState.update { it.copy(carfIdentifierCountry = value) }
+    }
+
+    fun updateCarfIdentifierValue(value: String) {
+        _uiState.update { it.copy(carfIdentifierValue = value) }
+    }
+
+    fun updateCarfIdentifierType(value: String) {
+        _uiState.update { it.copy(carfIdentifierType = value) }
+    }
+
     fun clearCheckoutEvent() {
         _checkoutEvent.value = null
     }
@@ -824,6 +927,89 @@ internal class OnrampViewModel(
         getPrefs().edit { remove(userDataKey) }
     }
 
+    private fun buildIdentifiersRequest(state: OnrampUiState): Identifiers? {
+        val (micaIdentifier, micaError) = buildIdentifier(
+            label = "MiCA identifier",
+            country = state.micaIdentifierCountry,
+            value = state.micaIdentifierValue,
+            identifierType = state.micaIdentifierType
+        )
+        if (micaError != null) {
+            _message.value = micaError
+            return null
+        }
+
+        val (carfIdentifier, carfError) = buildIdentifier(
+            label = "CARF identifier",
+            country = state.carfIdentifierCountry,
+            value = state.carfIdentifierValue,
+            identifierType = state.carfIdentifierType
+        )
+        if (carfError != null) {
+            _message.value = carfError
+            return null
+        }
+
+        if (micaIdentifier == null && carfIdentifier == null) {
+            _message.value = "Enter at least one MiCA or CARF identifier"
+            return null
+        }
+
+        return Identifiers()
+            .identifiersMica(micaIdentifier?.let(::listOf))
+            .identifiersCarf(carfIdentifier?.let(::listOf))
+    }
+
+    private fun buildIdentifier(
+        label: String,
+        country: String,
+        value: String,
+        identifierType: String
+    ): Pair<Identifier?, String?> {
+        val trimmedCountry = country.trim()
+        val trimmedValue = value.trim()
+        val trimmedIdentifierType = identifierType.trim()
+
+        if (trimmedCountry.isEmpty() && trimmedValue.isEmpty() && trimmedIdentifierType.isEmpty()) {
+            return null to null
+        }
+
+        if (trimmedCountry.isEmpty() || trimmedValue.isEmpty()) {
+            return null to "$label requires both country and identifier"
+        }
+
+        val identifier = Identifier()
+            .country(CountryCode.create(trimmedCountry))
+            .identifier(trimmedValue)
+
+        if (trimmedIdentifierType.isNotEmpty()) {
+            identifier.identifierType(trimmedIdentifierType)
+        }
+
+        return identifier to null
+    }
+
+    private fun formatIdentifierRequirements(requirements: IdentifierRequirements): String {
+        return buildString {
+            append("MiCA missing: ")
+            append(requirements.missingIdentifiersMica.joinToStringOrNone())
+            append("\nCARF missing: ")
+            append(requirements.missingIdentifiersCarf.joinToStringOrNone())
+        }
+    }
+
+    private fun formatUpdateKycInfoResult(result: UpdateKycInfoResult): String {
+        return buildString {
+            append("Valid: ${result.valid}")
+            append("\nMiCA missing: ")
+            append(result.missingIdentifiers?.missingIdentifiersMica.orEmpty().joinToStringOrNone())
+            append("\nCARF missing: ")
+            append(result.missingIdentifiers?.missingIdentifiersCarf.orEmpty().joinToStringOrNone())
+            append("\nErrors: ")
+            append(result.errors.orEmpty().joinToStringOrNone())
+        }
+    }
+
     private fun getPrefs(): SharedPreferences {
         return application.applicationContext.getSharedPreferences(ONRAMP_PREFS_NAME, Context.MODE_PRIVATE)
     }
@@ -863,6 +1049,14 @@ data class OnrampUiState(
     val kycBirthCity: String = "",
     val kycNationalities: String = "",
     val kycAddress: PaymentSheet.Address = PaymentSheet.Address(),
+    val micaIdentifierCountry: String = "",
+    val micaIdentifierValue: String = "",
+    val micaIdentifierType: String = "",
+    val carfIdentifierCountry: String = "",
+    val carfIdentifierValue: String = "",
+    val carfIdentifierType: String = "",
+    val identifierRequirementsSummary: String? = null,
+    val updateKycInfoSummary: String? = null,
 ) : Parcelable
 
 enum class Screen {
@@ -901,3 +1095,7 @@ private object NullOnrampSessionResponseParceler : Parceler<OnrampSessionRespons
     override fun create(parcel: Parcel): OnrampSessionResponse? = null
     override fun OnrampSessionResponse?.write(parcel: Parcel, flags: Int) { /* no-op */ }
 }
+
+private fun List<String>.joinToStringOrNone(): String {
+    return takeIf { it.isNotEmpty() }?.joinToString(", ") ?: "None"
+}

From 98108dfbedbc6053f62ca82ce4ecfb6661531621 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 28 Apr 2026 11:04:21 -0400
Subject: [PATCH 10/57] linting

---
 .../stripe/android/crypto/onramp/example/OnrampActivity.kt    | 2 +-
 .../stripe/android/crypto/onramp/example/OnrampViewModel.kt   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
index 0bc8ce403d1..3f0706fe482 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
@@ -79,7 +79,6 @@ import androidx.lifecycle.lifecycleScope
 import com.stripe.android.core.model.CountryCode
 import com.stripe.android.core.utils.FeatureFlags
 import com.stripe.android.crypto.onramp.OnrampCoordinator
-import com.stripe.android.crypto.onramp.example.network.OnrampSessionResponse
 import com.stripe.android.crypto.onramp.example.network.SettlementSpeed
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
@@ -1149,6 +1148,7 @@ private fun AuthenticatedOperationsScreen(
 }
 
 @Composable
+@Suppress("LongMethod")
 private fun IdentifierInfoScreen(
     micaIdentifierCountry: String,
     onMicaIdentifierCountryChange: (String) -> Unit,
diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index 3aec200f6fb..3dfcc52eae4 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -20,11 +20,11 @@ import com.stripe.android.core.utils.requireApplication
 import com.stripe.android.crypto.onramp.OnrampCoordinator
 import com.stripe.android.crypto.onramp.example.network.OnrampSessionResponse
 import com.stripe.android.crypto.onramp.example.network.SettlementSpeed
+import com.stripe.android.crypto.onramp.example.network.TestBackendRepository
+import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.Identifier
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
 import com.stripe.android.crypto.onramp.model.Identifiers
-import com.stripe.android.crypto.onramp.example.network.TestBackendRepository
-import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult

From 5e1d27cb36f31803cad7f1a1bd29f78d391ff9b2 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 28 Apr 2026 15:10:02 -0400
Subject: [PATCH 11/57] Update for new identifier type

---
 .../crypto/onramp/example/OnrampActivity.kt   |  24 +-
 .../crypto/onramp/example/OnrampViewModel.kt  |  73 +++---
 crypto-onramp/api/crypto-onramp.api           |  79 ++++++-
 .../crypto/onramp/model/Identifiers.kt        | 223 +++++++++++++-----
 .../repositories/CryptoApiRepository.kt       |   4 +-
 .../crypto/onramp/CryptoApiRepositoryTest.kt  | 105 +++++++--
 .../crypto/onramp/OnrampInteractorTest.kt     |  40 +++-
 7 files changed, 388 insertions(+), 160 deletions(-)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
index 3f0706fe482..f3393298de4 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
@@ -499,10 +499,8 @@ internal fun OnrampScreen(
                     onKycBirthCityChange = viewModel::updateKycBirthCity,
                     onKycNationalitiesChange = viewModel::updateKycNationalities,
                     onKycAddressChange = viewModel::updateKycAddress,
-                    onMicaIdentifierCountryChange = viewModel::updateMicaIdentifierCountry,
                     onMicaIdentifierValueChange = viewModel::updateMicaIdentifierValue,
                     onMicaIdentifierTypeChange = viewModel::updateMicaIdentifierType,
-                    onCarfIdentifierCountryChange = viewModel::updateCarfIdentifierCountry,
                     onCarfIdentifierValueChange = viewModel::updateCarfIdentifierValue,
                     onCarfIdentifierTypeChange = viewModel::updateCarfIdentifierType,
                     onAuthenticate = onAuthenticateUser,
@@ -734,10 +732,8 @@ private fun AuthenticatedOperationsScreen(
     onKycBirthCityChange: (String) -> Unit,
     onKycNationalitiesChange: (String) -> Unit,
     onKycAddressChange: (PaymentSheet.Address) -> Unit,
-    onMicaIdentifierCountryChange: (String) -> Unit,
     onMicaIdentifierValueChange: (String) -> Unit,
     onMicaIdentifierTypeChange: (String) -> Unit,
-    onCarfIdentifierCountryChange: (String) -> Unit,
     onCarfIdentifierValueChange: (String) -> Unit,
     onCarfIdentifierTypeChange: (String) -> Unit,
     onAuthenticate: (oauthScopes: String) -> Unit,
@@ -1011,14 +1007,10 @@ private fun AuthenticatedOperationsScreen(
 
         AnimatedVisibility(visible = identifiersExpanded) {
             IdentifierInfoScreen(
-                micaIdentifierCountry = state.micaIdentifierCountry,
-                onMicaIdentifierCountryChange = onMicaIdentifierCountryChange,
                 micaIdentifierValue = state.micaIdentifierValue,
                 onMicaIdentifierValueChange = onMicaIdentifierValueChange,
                 micaIdentifierType = state.micaIdentifierType,
                 onMicaIdentifierTypeChange = onMicaIdentifierTypeChange,
-                carfIdentifierCountry = state.carfIdentifierCountry,
-                onCarfIdentifierCountryChange = onCarfIdentifierCountryChange,
                 carfIdentifierValue = state.carfIdentifierValue,
                 onCarfIdentifierValueChange = onCarfIdentifierValueChange,
                 carfIdentifierType = state.carfIdentifierType,
@@ -1150,14 +1142,10 @@ private fun AuthenticatedOperationsScreen(
 @Composable
 @Suppress("LongMethod")
 private fun IdentifierInfoScreen(
-    micaIdentifierCountry: String,
-    onMicaIdentifierCountryChange: (String) -> Unit,
     micaIdentifierValue: String,
     onMicaIdentifierValueChange: (String) -> Unit,
     micaIdentifierType: String,
     onMicaIdentifierTypeChange: (String) -> Unit,
-    carfIdentifierCountry: String,
-    onCarfIdentifierCountryChange: (String) -> Unit,
     carfIdentifierValue: String,
     onCarfIdentifierValueChange: (String) -> Unit,
     carfIdentifierType: String,
@@ -1175,7 +1163,7 @@ private fun IdentifierInfoScreen(
         )
 
         Text(
-            text = "Fetch missing MiCA and CARF identifier fields for the current Link user.",
+            text = "Fetch missing MiCA and CARF identifier requirements for the current Link user.",
             modifier = Modifier.padding(bottom = 12.dp)
         )
 
@@ -1211,26 +1199,24 @@ private fun IdentifierInfoScreen(
             fontWeight = FontWeight.SemiBold,
             modifier = Modifier.padding(bottom = 8.dp)
         )
-        KYCTextField(micaIdentifierCountry, "MiCA Country (ISO)", onChange = onMicaIdentifierCountryChange)
-        KYCTextField(micaIdentifierValue, "MiCA Identifier", onChange = onMicaIdentifierValueChange)
         KYCTextField(
             micaIdentifierType,
-            "MiCA Identifier Type (optional)",
+            "MiCA Identifier Type (e.g. mt_nic)",
             onChange = onMicaIdentifierTypeChange
         )
+        KYCTextField(micaIdentifierValue, "MiCA Identifier Value", onChange = onMicaIdentifierValueChange)
 
         Text(
             text = "CARF",
             fontWeight = FontWeight.SemiBold,
             modifier = Modifier.padding(bottom = 8.dp)
         )
-        KYCTextField(carfIdentifierCountry, "CARF Country (ISO)", onChange = onCarfIdentifierCountryChange)
-        KYCTextField(carfIdentifierValue, "CARF Identifier", onChange = onCarfIdentifierValueChange)
         KYCTextField(
             carfIdentifierType,
-            "CARF Identifier Type (optional)",
+            "CARF Identifier Type (e.g. fr_spi)",
             onChange = onCarfIdentifierTypeChange
         )
+        KYCTextField(carfIdentifierValue, "CARF Identifier Value", onChange = onCarfIdentifierValueChange)
 
         Button(
             onClick = onUpdateKycInfo,
diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index 3dfcc52eae4..1abd2d75caf 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -23,10 +23,12 @@ import com.stripe.android.crypto.onramp.example.network.SettlementSpeed
 import com.stripe.android.crypto.onramp.example.network.TestBackendRepository
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.Identifier
+import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
 import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
+import com.stripe.android.crypto.onramp.model.MissingIdentifier
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampAuthorizeResult
 import com.stripe.android.crypto.onramp.model.OnrampCallbacks
@@ -815,10 +817,6 @@ internal class OnrampViewModel(
         _uiState.update { it.copy(kycAddress = address) }
     }
 
-    fun updateMicaIdentifierCountry(value: String) {
-        _uiState.update { it.copy(micaIdentifierCountry = value) }
-    }
-
     fun updateMicaIdentifierValue(value: String) {
         _uiState.update { it.copy(micaIdentifierValue = value) }
     }
@@ -827,10 +825,6 @@ internal class OnrampViewModel(
         _uiState.update { it.copy(micaIdentifierType = value) }
     }
 
-    fun updateCarfIdentifierCountry(value: String) {
-        _uiState.update { it.copy(carfIdentifierCountry = value) }
-    }
-
     fun updateCarfIdentifierValue(value: String) {
         _uiState.update { it.copy(carfIdentifierValue = value) }
     }
@@ -930,9 +924,8 @@ internal class OnrampViewModel(
     private fun buildIdentifiersRequest(state: OnrampUiState): Identifiers? {
         val (micaIdentifier, micaError) = buildIdentifier(
             label = "MiCA identifier",
-            country = state.micaIdentifierCountry,
             value = state.micaIdentifierValue,
-            identifierType = state.micaIdentifierType
+            type = state.micaIdentifierType
         )
         if (micaError != null) {
             _message.value = micaError
@@ -941,9 +934,8 @@ internal class OnrampViewModel(
 
         val (carfIdentifier, carfError) = buildIdentifier(
             label = "CARF identifier",
-            country = state.carfIdentifierCountry,
             value = state.carfIdentifierValue,
-            identifierType = state.carfIdentifierType
+            type = state.carfIdentifierType
         )
         if (carfError != null) {
             _message.value = carfError
@@ -962,54 +954,59 @@ internal class OnrampViewModel(
 
     private fun buildIdentifier(
         label: String,
-        country: String,
         value: String,
-        identifierType: String
+        type: String
     ): Pair<Identifier?, String?> {
-        val trimmedCountry = country.trim()
         val trimmedValue = value.trim()
-        val trimmedIdentifierType = identifierType.trim()
+        val trimmedType = type.trim()
 
-        if (trimmedCountry.isEmpty() && trimmedValue.isEmpty() && trimmedIdentifierType.isEmpty()) {
+        if (trimmedValue.isEmpty() && trimmedType.isEmpty()) {
             return null to null
         }
 
-        if (trimmedCountry.isEmpty() || trimmedValue.isEmpty()) {
-            return null to "$label requires both country and identifier"
+        if (trimmedType.isEmpty() || trimmedValue.isEmpty()) {
+            return null to "$label requires both type and value"
         }
 
-        val identifier = Identifier()
-            .country(CountryCode.create(trimmedCountry))
-            .identifier(trimmedValue)
+        val identifierType = IdentifierType.fromValue(trimmedType)
+            ?: return null to "$label type must be a supported identifier type like fr_spi"
 
-        if (trimmedIdentifierType.isNotEmpty()) {
-            identifier.identifierType(trimmedIdentifierType)
-        }
+        val identifier = Identifier()
+            .type(identifierType)
+            .value(trimmedValue)
 
         return identifier to null
     }
 
     private fun formatIdentifierRequirements(requirements: IdentifierRequirements): String {
-        return buildString {
-            append("MiCA missing: ")
-            append(requirements.missingIdentifiersMica.joinToStringOrNone())
-            append("\nCARF missing: ")
-            append(requirements.missingIdentifiersCarf.joinToStringOrNone())
-        }
+        return formatMissingIdentifiers(requirements.missingIdentifiers)
     }
 
     private fun formatUpdateKycInfoResult(result: UpdateKycInfoResult): String {
         return buildString {
             append("Valid: ${result.valid}")
-            append("\nMiCA missing: ")
-            append(result.missingIdentifiers?.missingIdentifiersMica.orEmpty().joinToStringOrNone())
-            append("\nCARF missing: ")
-            append(result.missingIdentifiers?.missingIdentifiersCarf.orEmpty().joinToStringOrNone())
-            append("\nErrors: ")
-            append(result.errors.orEmpty().joinToStringOrNone())
+            append("\nMissing identifiers: ")
+            append(formatMissingIdentifiers(result.missingIdentifiers.orEmpty()))
+            append("\nInvalid identifiers: ")
+            append(result.invalidIdentifiers.orEmpty().map { it.value }.joinToStringOrNone())
         }
     }
 
+    private fun formatMissingIdentifiers(missingIdentifiers: List<MissingIdentifier>): String {
+        return missingIdentifiers
+            .takeIf { it.isNotEmpty() }
+            ?.joinToString(separator = "\n") { missingIdentifier ->
+                buildString {
+                    append("${missingIdentifier.regulation.value}: ${missingIdentifier.type.value}")
+                    append(" (${missingIdentifier.placeholder})")
+                    missingIdentifier.alternateIdentifier?.let { alternateIdentifier ->
+                        append(" or ${alternateIdentifier.type.value} (${alternateIdentifier.placeholder})")
+                    }
+                }
+            }
+            ?: "None"
+    }
+
     private fun getPrefs(): SharedPreferences {
         return application.applicationContext.getSharedPreferences(ONRAMP_PREFS_NAME, Context.MODE_PRIVATE)
     }
@@ -1049,10 +1046,8 @@ data class OnrampUiState(
     val kycBirthCity: String = "",
     val kycNationalities: String = "",
     val kycAddress: PaymentSheet.Address = PaymentSheet.Address(),
-    val micaIdentifierCountry: String = "",
     val micaIdentifierValue: String = "",
     val micaIdentifierType: String = "",
-    val carfIdentifierCountry: String = "",
     val carfIdentifierValue: String = "",
     val carfIdentifierType: String = "",
     val identifierRequirementsSummary: String? = null,
diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 620405efc3c..981b9dd77f8 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -82,20 +82,68 @@ public final class com/stripe/android/crypto/onramp/model/CryptoNetwork$Companio
 public final class com/stripe/android/crypto/onramp/model/Identifier {
 	public static final field $stable I
 	public fun <init> ()V
-	public final fun country (Lcom/stripe/android/core/model/CountryCode;)Lcom/stripe/android/crypto/onramp/model/Identifier;
-	public final fun identifier (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Identifier;
-	public final fun identifierType (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Identifier;
+	public final fun type (Lcom/stripe/android/crypto/onramp/model/IdentifierType;)Lcom/stripe/android/crypto/onramp/model/Identifier;
+	public final fun value (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Identifier;
+}
+
+public final class com/stripe/android/crypto/onramp/model/IdentifierHint {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getPlaceholder ()Ljava/lang/String;
+	public final fun getType ()Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
 }
 
 public final class com/stripe/android/crypto/onramp/model/IdentifierRequirements {
 	public static final field $stable I
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMissingIdentifiersCarf ()Ljava/util/List;
-	public final fun getMissingIdentifiersMica ()Ljava/util/List;
+	public final fun getMissingIdentifiers ()Ljava/util/List;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/stripe/android/crypto/onramp/model/IdentifierType : java/lang/Enum {
+	public static final field AT_STN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field BE_NRN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field BG_UCN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field CY_TIC Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field CZ_RC Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field Companion Lcom/stripe/android/crypto/onramp/model/IdentifierType$Companion;
+	public static final field DE_STN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field DK_CPR Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field EE_IK Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field FI_HETU Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field FR_SPI Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field GR_AFM Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field HR_OIB Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field HU_AD Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field IE_PPSN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field IS_KT Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field IT_CF Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field LT_AK Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field LU_NIF Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field LV_PK Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field MT_NIC Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field MT_PP Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field NL_BSN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field PL_NIP Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field PL_PESEL Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field PT_NIF Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field RO_CNP Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field SE_PIN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field SI_PIN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static final field SK_RC Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public final fun getValue ()Ljava/lang/String;
+	public static fun valueOf (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+}
+
+public final class com/stripe/android/crypto/onramp/model/IdentifierType$Companion {
+	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/IdentifierType;
+}
+
 public final class com/stripe/android/crypto/onramp/model/Identifiers {
 	public static final field $stable I
 	public fun <init> ()V
@@ -136,11 +184,13 @@ public final class com/stripe/android/crypto/onramp/model/LinkUserInfo : android
 	public final fun writeToParcel (Landroid/os/Parcel;I)V
 }
 
-public final class com/stripe/android/crypto/onramp/model/MissingIdentifiers {
+public final class com/stripe/android/crypto/onramp/model/MissingIdentifier {
 	public static final field $stable I
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMissingIdentifiersCarf ()Ljava/util/List;
-	public final fun getMissingIdentifiersMica ()Ljava/util/List;
+	public final fun getAlternateIdentifier ()Lcom/stripe/android/crypto/onramp/model/IdentifierHint;
+	public final fun getPlaceholder ()Ljava/lang/String;
+	public final fun getRegulation ()Lcom/stripe/android/crypto/onramp/model/RegulationType;
+	public final fun getType ()Lcom/stripe/android/crypto/onramp/model/IdentifierType;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
@@ -500,11 +550,20 @@ public final class com/stripe/android/crypto/onramp/model/PaymentMethodType : ja
 	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/PaymentMethodType;
 }
 
+public final class com/stripe/android/crypto/onramp/model/RegulationType : java/lang/Enum {
+	public static final field EuCarf Lcom/stripe/android/crypto/onramp/model/RegulationType;
+	public static final field EuMica Lcom/stripe/android/crypto/onramp/model/RegulationType;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public final fun getValue ()Ljava/lang/String;
+	public static fun valueOf (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/RegulationType;
+	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/RegulationType;
+}
+
 public final class com/stripe/android/crypto/onramp/model/UpdateKycInfoResult {
 	public static final field $stable I
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getErrors ()Ljava/util/List;
-	public final fun getMissingIdentifiers ()Lcom/stripe/android/crypto/onramp/model/MissingIdentifiers;
+	public final fun getInvalidIdentifiers ()Ljava/util/List;
+	public final fun getMissingIdentifiers ()Ljava/util/List;
 	public final fun getValid ()Z
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
index b2398cffc4b..06c3649195e 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
@@ -9,6 +9,10 @@ import kotlinx.serialization.Serializable
 /**
  * Identifier payload submitted to the Crypto Onramp API.
  *
+ * The current backend path is still specialized, so callers continue to separate
+ * MiCA and CARF submissions even though individual identifiers are modeled with
+ * the reviewed typed enum surface.
+ *
  * @property identifiersMica MiCA identifiers for the consumer.
  * @property identifiersCarf CARF identifiers for the consumer.
  */
@@ -45,82 +49,135 @@ class Identifiers {
 }
 
 /**
- * A country-scoped identifier entry.
+ * A typed identifier entry.
  *
- * @property country ISO 3166-1 alpha-2 country code associated with the identifier.
- * @property identifier The identifier value.
- * @property identifierType Optional subtype for classifying the identifier.
+ * @property type The reviewed identifier type.
+ * @property value The identifier value.
  */
 @ExperimentalCryptoOnramp
 class Identifier {
-    private var country: CountryCode? = null
-    private var identifier: String? = null
-    private var identifierType: String? = null
+    private var type: IdentifierType? = null
+    private var value: String? = null
 
     /**
-     * Sets the ISO 3166-1 alpha-2 country code associated with the identifier.
+     * Sets the identifier type.
      */
-    fun country(country: CountryCode) = apply {
-        this.country = country
+    fun type(type: IdentifierType) = apply {
+        this.type = type
     }
 
     /**
      * Sets the identifier value.
      */
-    fun identifier(identifier: String) = apply {
-        this.identifier = identifier
-    }
-
-    /**
-     * Sets an optional subtype for the identifier.
-     */
-    fun identifierType(identifierType: String) = apply {
-        this.identifierType = identifierType
+    fun value(value: String) = apply {
+        this.value = value
     }
 
     internal class State(
-        val country: CountryCode,
-        val identifier: String,
-        val identifierType: String?
+        val type: IdentifierType,
+        val value: String
     )
 
     internal fun build(): State {
         return State(
-            country = requireNotNull(country) {
-                "country must not be null"
-            },
-            identifier = requireNotNull(identifier) {
-                "identifier must not be null"
+            type = requireNotNull(type) {
+                "type must not be null"
             },
-            identifierType = identifierType
+            value = requireNotNull(value) {
+                "value must not be null"
+            }
         )
     }
 }
 
 /**
- * Identifier requirements returned by the Crypto Onramp API.
- *
- * @property missingIdentifiersMica Missing MiCA identifier field names.
- * @property missingIdentifiersCarf Missing CARF identifier field names.
+ * Supported identifier types for EU onramp compliance.
+ */
+@ExperimentalCryptoOnramp
+enum class IdentifierType(
+    val value: String,
+    private val countryCodeValue: String
+) {
+    AT_STN("at_stn", "AT"),
+    BE_NRN("be_nrn", "BE"),
+    BG_UCN("bg_ucn", "BG"),
+    HR_OIB("hr_oib", "HR"),
+    CY_TIC("cy_tic", "CY"),
+    CZ_RC("cz_rc", "CZ"),
+    DK_CPR("dk_cpr", "DK"),
+    EE_IK("ee_ik", "EE"),
+    FI_HETU("fi_hetu", "FI"),
+    FR_SPI("fr_spi", "FR"),
+    DE_STN("de_stn", "DE"),
+    GR_AFM("gr_afm", "GR"),
+    HU_AD("hu_ad", "HU"),
+    IS_KT("is_kt", "IS"),
+    IE_PPSN("ie_ppsn", "IE"),
+    IT_CF("it_cf", "IT"),
+    LV_PK("lv_pk", "LV"),
+    LT_AK("lt_ak", "LT"),
+    LU_NIF("lu_nif", "LU"),
+    MT_NIC("mt_nic", "MT"),
+    MT_PP("mt_pp", "MT"),
+    NL_BSN("nl_bsn", "NL"),
+    PL_PESEL("pl_pesel", "PL"),
+    PL_NIP("pl_nip", "PL"),
+    PT_NIF("pt_nif", "PT"),
+    RO_CNP("ro_cnp", "RO"),
+    SK_RC("sk_rc", "SK"),
+    SI_PIN("si_pin", "SI"),
+    SE_PIN("se_pin", "SE");
+
+    internal val countryCode: CountryCode
+        get() = CountryCode.create(countryCodeValue)
+
+    companion object {
+        fun fromValue(value: String): IdentifierType? {
+            return entries.firstOrNull { it.value == value.lowercase() }
+        }
+    }
+}
+
+/**
+ * Regulations that can require identifier collection.
+ */
+@ExperimentalCryptoOnramp
+enum class RegulationType(val value: String) {
+    EuCarf("eu_carf"),
+    EuMica("eu_mica")
+}
+
+/**
+ * A required identifier along with the merchant-facing placeholder shown to the user.
  */
 @ExperimentalCryptoOnramp
 @Poko
-class IdentifierRequirements internal constructor(
-    val missingIdentifiersMica: List<String>,
-    val missingIdentifiersCarf: List<String>
+class IdentifierHint internal constructor(
+    val type: IdentifierType,
+    val placeholder: String
 )
 
 /**
- * Missing identifiers returned by the KYC info update API.
+ * An identifier that is still required for a specific regulation.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class MissingIdentifier internal constructor(
+    val type: IdentifierType,
+    val placeholder: String,
+    val alternateIdentifier: IdentifierHint?,
+    val regulation: RegulationType
+)
+
+/**
+ * Identifier requirements returned by the Crypto Onramp API.
  *
- * @property missingIdentifiersMica Missing MiCA identifier field names.
- * @property missingIdentifiersCarf Missing CARF identifier field names.
+ * @property missingIdentifiers Missing MiCA and CARF identifiers still required.
  */
 @ExperimentalCryptoOnramp
 @Poko
-class MissingIdentifiers internal constructor(
-    val missingIdentifiersMica: List<String>,
-    val missingIdentifiersCarf: List<String>
+class IdentifierRequirements internal constructor(
+    val missingIdentifiers: List<MissingIdentifier>
 )
 
 /**
@@ -128,14 +185,14 @@ class MissingIdentifiers internal constructor(
  *
  * @property valid Whether the submitted identifiers were accepted.
  * @property missingIdentifiers Missing identifiers, if more are required.
- * @property errors Validation errors returned by the API.
+ * @property invalidIdentifiers Submitted identifier types rejected by the API.
  */
 @ExperimentalCryptoOnramp
 @Poko
 class UpdateKycInfoResult internal constructor(
     val valid: Boolean,
-    val missingIdentifiers: MissingIdentifiers?,
-    val errors: List<String>?
+    val missingIdentifiers: List<MissingIdentifier>?,
+    val invalidIdentifiers: List<IdentifierType>?
 )
 
 @Serializable
@@ -155,20 +212,23 @@ internal data class IdentifierRequest(
     @SerialName("identifier")
     val identifier: String,
     @SerialName("identifier_type")
-    val identifierType: String? = null
+    val identifierType: String
 )
 
 @Serializable
 internal data class IdentifierRequirementsResponse(
     @SerialName("missing_identifiers_mica")
-    val missingIdentifiersMica: List<String> = emptyList(),
+    val missingIdentifiersMica: List<MissingIdentifierResponse> = emptyList(),
     @SerialName("missing_identifiers_carf")
-    val missingIdentifiersCarf: List<String> = emptyList(),
+    val missingIdentifiersCarf: List<MissingIdentifierResponse> = emptyList(),
 ) {
     fun toIdentifierRequirements(): IdentifierRequirements {
         return IdentifierRequirements(
-            missingIdentifiersMica = missingIdentifiersMica,
-            missingIdentifiersCarf = missingIdentifiersCarf
+            missingIdentifiers = missingIdentifiersMica.map {
+                it.toMissingIdentifier(RegulationType.EuMica)
+            } + missingIdentifiersCarf.map {
+                it.toMissingIdentifier(RegulationType.EuCarf)
+            }
         )
     }
 }
@@ -186,7 +246,11 @@ internal data class UpdateKycInfoResponse(
         return UpdateKycInfoResult(
             valid = valid,
             missingIdentifiers = missingIdentifiers?.toMissingIdentifiers(),
-            errors = errors
+            invalidIdentifiers = errors?.map { identifierType ->
+                requireNotNull(IdentifierType.fromValue(identifierType)) {
+                    "Unrecognized identifier type: $identifierType"
+                }
+            }
         )
     }
 }
@@ -194,14 +258,55 @@ internal data class UpdateKycInfoResponse(
 @Serializable
 internal data class MissingIdentifiersResponse(
     @SerialName("missing_identifiers_mica")
-    val missingIdentifiersMica: List<String> = emptyList(),
+    val missingIdentifiersMica: List<MissingIdentifierResponse> = emptyList(),
     @SerialName("missing_identifiers_carf")
-    val missingIdentifiersCarf: List<String> = emptyList(),
+    val missingIdentifiersCarf: List<MissingIdentifierResponse> = emptyList(),
+) {
+    fun toMissingIdentifiers(): List<MissingIdentifier> {
+        return missingIdentifiersMica.map {
+            it.toMissingIdentifier(RegulationType.EuMica)
+        } + missingIdentifiersCarf.map {
+            it.toMissingIdentifier(RegulationType.EuCarf)
+        }
+    }
+}
+
+@Serializable
+internal data class MissingIdentifierResponse(
+    @SerialName("type")
+    val type: String,
+    @SerialName("placeholder")
+    val placeholder: String,
+    @SerialName("alternate_identifier")
+    val alternateIdentifier: IdentifierHintResponse? = null
 ) {
-    fun toMissingIdentifiers(): MissingIdentifiers {
-        return MissingIdentifiers(
-            missingIdentifiersMica = missingIdentifiersMica,
-            missingIdentifiersCarf = missingIdentifiersCarf
+    fun toMissingIdentifier(regulation: RegulationType): MissingIdentifier {
+        val identifierType = requireNotNull(IdentifierType.fromValue(type)) {
+            "Unrecognized identifier type: $type"
+        }
+
+        return MissingIdentifier(
+            type = identifierType,
+            placeholder = placeholder,
+            alternateIdentifier = alternateIdentifier?.toIdentifierHint(),
+            regulation = regulation
+        )
+    }
+}
+
+@Serializable
+internal data class IdentifierHintResponse(
+    @SerialName("type")
+    val type: String,
+    @SerialName("placeholder")
+    val placeholder: String
+) {
+    fun toIdentifierHint(): IdentifierHint {
+        return IdentifierHint(
+            type = requireNotNull(IdentifierType.fromValue(type)) {
+                "Unrecognized identifier type: $type"
+            },
+            placeholder = placeholder
         )
     }
 }
@@ -220,8 +325,8 @@ internal fun Identifiers.toRequest(
 
 private fun Identifier.State.toRequest(): IdentifierRequest {
     return IdentifierRequest(
-        country = country.value,
-        identifier = identifier,
-        identifierType = identifierType
+        country = type.countryCode.value,
+        identifier = value,
+        identifierType = type.value
     )
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index 13cbf732f8a..09948fed3ff 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -143,7 +143,7 @@ internal class CryptoApiRepository @Inject constructor(
         return execute(
             request = request,
             responseSerializer = IdentifierRequirementsResponse.serializer()
-        ).map { it.toIdentifierRequirements() }
+        ).mapCatching { it.toIdentifierRequirements() }
     }
 
     suspend fun updateKycInfo(
@@ -160,7 +160,7 @@ internal class CryptoApiRepository @Inject constructor(
                 ).jsonObject.filterValues { it != JsonNull }
             ),
             UpdateKycInfoResponse.serializer()
-        ).map { it.toUpdateKycInfoResult() }
+        ).mapCatching { it.toUpdateKycInfoResult() }
     }
 
     suspend fun retrieveCrsCarfDeclaration(
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 8b005df8bd5..31bedbf8c63 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -9,8 +9,12 @@ import com.stripe.android.core.networking.StripeResponse
 import com.stripe.android.core.version.StripeSdkVersion
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.Identifier
+import com.stripe.android.crypto.onramp.model.IdentifierHint
+import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
+import com.stripe.android.crypto.onramp.model.MissingIdentifier
+import com.stripe.android.crypto.onramp.model.RegulationType
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.UpdateKycInfoResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
@@ -152,8 +156,22 @@ class CryptoApiRepositoryTest {
                 200,
                 """
                     {
-                        "missing_identifiers_mica": ["tax_id"],
-                        "missing_identifiers_carf": ["nationalities"]
+                        "missing_identifiers_mica": [
+                            {
+                                "type": "mt_nic",
+                                "placeholder": "123456M",
+                                "alternate_identifier": {
+                                    "type": "mt_pp",
+                                    "placeholder": "AA1234567"
+                                }
+                            }
+                        ],
+                        "missing_identifiers_carf": [
+                            {
+                                "type": "fr_spi",
+                                "placeholder": "12 34 567 890 123"
+                            }
+                        ]
                     }
                     """,
                 emptyMap()
@@ -175,10 +193,24 @@ class CryptoApiRepositoryTest {
                 .isEqualTo(mapOf("credentials" to mapOf("consumer_session_client_secret" to "test-secret")))
 
             assertThat(result.isSuccess).isTrue()
-            assertThat(result.getOrThrow().missingIdentifiersMica)
-                .isEqualTo(listOf("tax_id"))
-            assertThat(result.getOrThrow().missingIdentifiersCarf)
-                .isEqualTo(listOf("nationalities"))
+            assertThat(result.getOrThrow().missingIdentifiers)
+                .containsExactly(
+                    MissingIdentifier(
+                        type = IdentifierType.MT_NIC,
+                        placeholder = "123456M",
+                        alternateIdentifier = IdentifierHint(
+                            type = IdentifierType.MT_PP,
+                            placeholder = "AA1234567"
+                        ),
+                        regulation = RegulationType.EuMica
+                    ),
+                    MissingIdentifier(
+                        type = IdentifierType.FR_SPI,
+                        placeholder = "12 34 567 890 123",
+                        alternateIdentifier = null,
+                        regulation = RegulationType.EuCarf
+                    )
+                )
         }
     }
 
@@ -191,10 +223,24 @@ class CryptoApiRepositoryTest {
                     {
                         "valid": false,
                         "missing_identifiers": {
-                            "missing_identifiers_mica": ["tax_id"],
-                            "missing_identifiers_carf": ["nationalities"]
+                            "missing_identifiers_mica": [
+                                {
+                                    "type": "mt_nic",
+                                    "placeholder": "123456M",
+                                    "alternate_identifier": {
+                                        "type": "mt_pp",
+                                        "placeholder": "AA1234567"
+                                    }
+                                }
+                            ],
+                            "missing_identifiers_carf": [
+                                {
+                                    "type": "fr_spi",
+                                    "placeholder": "12 34 567 890 123"
+                                }
+                            ]
                         },
-                        "errors": ["FR"]
+                        "errors": ["fr_spi"]
                     }
                     """,
                 emptyMap()
@@ -208,16 +254,15 @@ class CryptoApiRepositoryTest {
                     .identifiersMica(
                         listOf(
                             Identifier()
-                                .country(CountryCode.create("IE"))
-                                .identifier("mica_123")
-                                .identifierType("tax_id")
+                                .type(IdentifierType.MT_NIC)
+                                .value("mica_123")
                         )
                     )
                     .identifiersCarf(
                         listOf(
                             Identifier()
-                                .country(CountryCode.create("FR"))
-                                .identifier("carf_456")
+                                .type(IdentifierType.FR_SPI)
+                                .value("carf_456")
                         )
                     ),
                 consumerSessionClientSecret = "test-secret"
@@ -656,15 +701,17 @@ class CryptoApiRepositoryTest {
                     "credentials" to mapOf("consumer_session_client_secret" to "test-secret"),
                     "identifiers_mica" to listOf(
                         mapOf(
-                            "country" to "IE",
+                            "country" to "MT",
                             "identifier" to "mica_123",
-                            "identifier_type" to "tax_id"
+                            "identifier_type" to "mt_nic"
                         )
                     ),
                     "identifiers_carf" to listOf(
                         mapOf(
                             "country" to "FR",
                             "identifier" to "carf_456"
+                            ,
+                            "identifier_type" to "fr_spi"
                         )
                     )
                 )
@@ -673,11 +720,25 @@ class CryptoApiRepositoryTest {
 
     private fun assertUpdateKycInfoResult(result: UpdateKycInfoResult) {
         assertThat(result.valid).isFalse()
-        assertThat(result.missingIdentifiers?.missingIdentifiersMica)
-            .isEqualTo(listOf("tax_id"))
-        assertThat(result.missingIdentifiers?.missingIdentifiersCarf)
-            .isEqualTo(listOf("nationalities"))
-        assertThat(result.errors)
-            .isEqualTo(listOf("FR"))
+        assertThat(result.missingIdentifiers)
+            .containsExactly(
+                MissingIdentifier(
+                    type = IdentifierType.MT_NIC,
+                    placeholder = "123456M",
+                    alternateIdentifier = IdentifierHint(
+                        type = IdentifierType.MT_PP,
+                        placeholder = "AA1234567"
+                    ),
+                    regulation = RegulationType.EuMica
+                ),
+                MissingIdentifier(
+                    type = IdentifierType.FR_SPI,
+                    placeholder = "12 34 567 890 123",
+                    alternateIdentifier = null,
+                    regulation = RegulationType.EuCarf
+                )
+            )
+        assertThat(result.invalidIdentifiers)
+            .isEqualTo(listOf(IdentifierType.FR_SPI))
     }
 }
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 87b1585e74b..7d700a6b22a 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -15,12 +15,14 @@ import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
 import com.stripe.android.crypto.onramp.model.Identifier
+import com.stripe.android.crypto.onramp.model.IdentifierHint
+import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
 import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
-import com.stripe.android.crypto.onramp.model.MissingIdentifiers
+import com.stripe.android.crypto.onramp.model.MissingIdentifier
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampAuthorizeResult
 import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
@@ -40,6 +42,7 @@ import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
+import com.stripe.android.crypto.onramp.model.RegulationType
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
 import com.stripe.android.crypto.onramp.model.UpdateKycInfoResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
@@ -204,8 +207,23 @@ class OnrampInteractorTest {
     fun testGetIdentifierRequirementsIsSuccessful() = runTest {
         whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
         val requirements = IdentifierRequirements(
-            missingIdentifiersMica = listOf("tax_id"),
-            missingIdentifiersCarf = listOf("nationalities")
+            missingIdentifiers = listOf(
+                MissingIdentifier(
+                    type = IdentifierType.MT_NIC,
+                    placeholder = "123456M",
+                    alternateIdentifier = IdentifierHint(
+                        type = IdentifierType.MT_PP,
+                        placeholder = "AA1234567"
+                    ),
+                    regulation = RegulationType.EuMica
+                ),
+                MissingIdentifier(
+                    type = IdentifierType.FR_SPI,
+                    placeholder = "12 34 567 890 123",
+                    alternateIdentifier = null,
+                    regulation = RegulationType.EuCarf
+                )
+            )
         )
         whenever(cryptoApiRepository.getIdentifierRequirements(any()))
             .thenReturn(Result.success(requirements))
@@ -225,11 +243,15 @@ class OnrampInteractorTest {
         whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
         val submissionResult = UpdateKycInfoResult(
             valid = false,
-            missingIdentifiers = MissingIdentifiers(
-                missingIdentifiersMica = emptyList(),
-                missingIdentifiersCarf = listOf("nationalities")
+            missingIdentifiers = listOf(
+                MissingIdentifier(
+                    type = IdentifierType.FR_SPI,
+                    placeholder = "12 34 567 890 123",
+                    alternateIdentifier = null,
+                    regulation = RegulationType.EuCarf
+                )
             ),
-            errors = listOf("FR")
+            invalidIdentifiers = listOf(IdentifierType.FR_SPI)
         )
         whenever(cryptoApiRepository.updateKycInfo(any(), any()))
             .thenReturn(Result.success(submissionResult))
@@ -241,8 +263,8 @@ class OnrampInteractorTest {
                 .identifiersMica(
                     listOf(
                         Identifier()
-                            .country(CountryCode.create("IE"))
-                            .identifier("mica_123")
+                            .type(IdentifierType.MT_NIC)
+                            .value("mica_123")
                     )
                 )
         )

From bbf08df1026ede0ce0ca8d7ac94ad43c1ef5c148 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 28 Apr 2026 15:40:23 -0400
Subject: [PATCH 12/57] linting

---
 .../stripe/android/crypto/onramp/example/OnrampViewModel.kt | 3 +--
 .../stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt | 6 +++---
 .../stripe/android/crypto/onramp/OnrampInteractorTest.kt    | 3 +--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index 1abd2d75caf..e6f6eb28cfe 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -15,7 +15,6 @@ import androidx.lifecycle.createSavedStateHandle
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.CreationExtras
 import com.github.kittinunf.result.Result
-import com.stripe.android.core.model.CountryCode
 import com.stripe.android.core.utils.requireApplication
 import com.stripe.android.crypto.onramp.OnrampCoordinator
 import com.stripe.android.crypto.onramp.example.network.OnrampSessionResponse
@@ -23,8 +22,8 @@ import com.stripe.android.crypto.onramp.example.network.SettlementSpeed
 import com.stripe.android.crypto.onramp.example.network.TestBackendRepository
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.Identifier
-import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
+import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 31bedbf8c63..6b29ec40ed7 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -14,8 +14,8 @@ import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.MissingIdentifier
-import com.stripe.android.crypto.onramp.model.RegulationType
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
+import com.stripe.android.crypto.onramp.model.RegulationType
 import com.stripe.android.crypto.onramp.model.UpdateKycInfoResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.link.LinkController
@@ -34,6 +34,7 @@ import org.mockito.kotlin.whenever
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
+@Suppress("LargeClass")
 class CryptoApiRepositoryTest {
     private val stripeNetworkClient: StripeNetworkClient = mock()
     private val stripeRepository = mock<StripeRepository>()
@@ -709,8 +710,7 @@ class CryptoApiRepositoryTest {
                     "identifiers_carf" to listOf(
                         mapOf(
                             "country" to "FR",
-                            "identifier" to "carf_456"
-                            ,
+                            "identifier" to "carf_456",
                             "identifier_type" to "fr_spi"
                         )
                     )
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 7d700a6b22a..ea90d4170d6 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -4,7 +4,6 @@ import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
 import androidx.lifecycle.SavedStateHandle
 import com.google.common.truth.Truth.assertThat
-import com.stripe.android.core.model.CountryCode
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsService
 import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
@@ -16,8 +15,8 @@ import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
 import com.stripe.android.crypto.onramp.model.Identifier
 import com.stripe.android.crypto.onramp.model.IdentifierHint
-import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
+import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse

From 2eee7c3a221b5b003ebd776951d3d247b7e5b3fa Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 4 May 2026 12:02:48 -0400
Subject: [PATCH 13/57] Reworked the new format from the API review

---
 .../crypto/onramp/example/OnrampViewModel.kt  |  46 +++--
 crypto-onramp/api/crypto-onramp.api           |  35 ++--
 .../crypto/onramp/model/Identifiers.kt        | 136 +++++++-------
 .../crypto/onramp/CryptoApiRepositoryTest.kt  | 168 ++++++++++++------
 .../crypto/onramp/OnrampInteractorTest.kt     |  47 +++--
 5 files changed, 254 insertions(+), 178 deletions(-)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index e6f6eb28cfe..5ea770f878b 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -20,14 +20,15 @@ import com.stripe.android.crypto.onramp.OnrampCoordinator
 import com.stripe.android.crypto.onramp.example.network.OnrampSessionResponse
 import com.stripe.android.crypto.onramp.example.network.SettlementSpeed
 import com.stripe.android.crypto.onramp.example.network.TestBackendRepository
+import com.stripe.android.crypto.onramp.model.AlternativeGroup
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.Identifier
+import com.stripe.android.crypto.onramp.model.IdentifierRequirement
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
 import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
-import com.stripe.android.crypto.onramp.model.MissingIdentifier
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampAuthorizeResult
 import com.stripe.android.crypto.onramp.model.OnrampCallbacks
@@ -978,30 +979,41 @@ internal class OnrampViewModel(
     }
 
     private fun formatIdentifierRequirements(requirements: IdentifierRequirements): String {
-        return formatMissingIdentifiers(requirements.missingIdentifiers)
+        return buildString {
+            append("Identifiers: ")
+            append(formatIdentifierRequirements(requirements.identifiers))
+            append("\nAlternatives: ")
+            append(formatAlternativeGroups(requirements.alternatives))
+        }
     }
 
     private fun formatUpdateKycInfoResult(result: UpdateKycInfoResult): String {
         return buildString {
             append("Valid: ${result.valid}")
-            append("\nMissing identifiers: ")
-            append(formatMissingIdentifiers(result.missingIdentifiers.orEmpty()))
+            append("\nIdentifiers: ")
+            append(formatIdentifierRequirements(result.identifiers))
+            append("\nAlternatives: ")
+            append(formatAlternativeGroups(result.alternatives))
             append("\nInvalid identifiers: ")
-            append(result.invalidIdentifiers.orEmpty().map { it.value }.joinToStringOrNone())
+            append(result.invalidIdentifiers.map { it.value }.joinToStringOrNone())
         }
     }
 
-    private fun formatMissingIdentifiers(missingIdentifiers: List<MissingIdentifier>): String {
-        return missingIdentifiers
+    private fun formatIdentifierRequirements(identifierRequirements: List<IdentifierRequirement>): String {
+        return identifierRequirements
             .takeIf { it.isNotEmpty() }
-            ?.joinToString(separator = "\n") { missingIdentifier ->
-                buildString {
-                    append("${missingIdentifier.regulation.value}: ${missingIdentifier.type.value}")
-                    append(" (${missingIdentifier.placeholder})")
-                    missingIdentifier.alternateIdentifier?.let { alternateIdentifier ->
-                        append(" or ${alternateIdentifier.type.value} (${alternateIdentifier.placeholder})")
-                    }
-                }
+            ?.joinToString(separator = "\n") { identifierRequirement ->
+                "${identifierRequirement.regulation.value}: ${identifierRequirement.type.value}"
+            }
+            ?: "None"
+    }
+
+    private fun formatAlternativeGroups(alternativeGroups: List<AlternativeGroup>): String {
+        return alternativeGroups
+            .takeIf { it.isNotEmpty() }
+            ?.joinToString(separator = "\n") { alternativeGroup ->
+                "${alternativeGroup.originalMissingIdentifiers.joinToValueString()} -> " +
+                    alternativeGroup.alternativeMissingIdentifiers.joinToValueString()
             }
             ?: "None"
     }
@@ -1093,3 +1105,7 @@ private object NullOnrampSessionResponseParceler : Parceler<OnrampSessionRespons
 private fun List<String>.joinToStringOrNone(): String {
     return takeIf { it.isNotEmpty() }?.joinToString(", ") ?: "None"
 }
+
+private fun List<IdentifierType>.joinToValueString(): String {
+    return map { it.value }.joinToStringOrNone()
+}
diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 981b9dd77f8..dffb4fffdac 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -55,6 +55,15 @@ public final class com/stripe/android/crypto/onramp/exception/PaymentFailedExcep
 	public static final field $stable I
 }
 
+public final class com/stripe/android/crypto/onramp/model/AlternativeGroup {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAlternativeMissingIdentifiers ()Ljava/util/List;
+	public final fun getOriginalMissingIdentifiers ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class com/stripe/android/crypto/onramp/model/CryptoNetwork : java/lang/Enum {
 	public static final field Aptos Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;
 	public static final field Avalanche Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;
@@ -86,10 +95,10 @@ public final class com/stripe/android/crypto/onramp/model/Identifier {
 	public final fun value (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Identifier;
 }
 
-public final class com/stripe/android/crypto/onramp/model/IdentifierHint {
+public final class com/stripe/android/crypto/onramp/model/IdentifierRequirement {
 	public static final field $stable I
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getPlaceholder ()Ljava/lang/String;
+	public final fun getRegulation ()Lcom/stripe/android/crypto/onramp/model/RegulationType;
 	public final fun getType ()Lcom/stripe/android/crypto/onramp/model/IdentifierType;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -98,7 +107,8 @@ public final class com/stripe/android/crypto/onramp/model/IdentifierHint {
 public final class com/stripe/android/crypto/onramp/model/IdentifierRequirements {
 	public static final field $stable I
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getMissingIdentifiers ()Ljava/util/List;
+	public final fun getAlternatives ()Ljava/util/List;
+	public final fun getIdentifiers ()Ljava/util/List;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
@@ -184,17 +194,6 @@ public final class com/stripe/android/crypto/onramp/model/LinkUserInfo : android
 	public final fun writeToParcel (Landroid/os/Parcel;I)V
 }
 
-public final class com/stripe/android/crypto/onramp/model/MissingIdentifier {
-	public static final field $stable I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAlternateIdentifier ()Lcom/stripe/android/crypto/onramp/model/IdentifierHint;
-	public final fun getPlaceholder ()Ljava/lang/String;
-	public final fun getRegulation ()Lcom/stripe/android/crypto/onramp/model/RegulationType;
-	public final fun getType ()Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public abstract interface class com/stripe/android/crypto/onramp/model/OnrampAttachKycInfoResult {
 }
 
@@ -551,6 +550,7 @@ public final class com/stripe/android/crypto/onramp/model/PaymentMethodType : ja
 }
 
 public final class com/stripe/android/crypto/onramp/model/RegulationType : java/lang/Enum {
+	public static final field Companion Lcom/stripe/android/crypto/onramp/model/RegulationType$Companion;
 	public static final field EuCarf Lcom/stripe/android/crypto/onramp/model/RegulationType;
 	public static final field EuMica Lcom/stripe/android/crypto/onramp/model/RegulationType;
 	public static fun getEntries ()Lkotlin/enums/EnumEntries;
@@ -559,11 +559,16 @@ public final class com/stripe/android/crypto/onramp/model/RegulationType : java/
 	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/RegulationType;
 }
 
+public final class com/stripe/android/crypto/onramp/model/RegulationType$Companion {
+	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/RegulationType;
+}
+
 public final class com/stripe/android/crypto/onramp/model/UpdateKycInfoResult {
 	public static final field $stable I
 	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAlternatives ()Ljava/util/List;
+	public final fun getIdentifiers ()Ljava/util/List;
 	public final fun getInvalidIdentifiers ()Ljava/util/List;
-	public final fun getMissingIdentifiers ()Ljava/util/List;
 	public final fun getValid ()Z
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
index 06c3649195e..70de354ba51 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
@@ -144,55 +144,55 @@ enum class IdentifierType(
 @ExperimentalCryptoOnramp
 enum class RegulationType(val value: String) {
     EuCarf("eu_carf"),
-    EuMica("eu_mica")
+    EuMica("eu_mica");
+
+    companion object {
+        fun fromValue(value: String): RegulationType? {
+            return entries.firstOrNull { it.value == value.lowercase() }
+        }
+    }
 }
 
 /**
- * A required identifier along with the merchant-facing placeholder shown to the user.
+ * An identifier requirement returned by the Crypto Onramp API.
  */
 @ExperimentalCryptoOnramp
 @Poko
-class IdentifierHint internal constructor(
+class IdentifierRequirement internal constructor(
     val type: IdentifierType,
-    val placeholder: String
+    val regulation: RegulationType
 )
 
 /**
- * An identifier that is still required for a specific regulation.
+ * A set of alternative identifiers that can satisfy a missing requirement.
  */
 @ExperimentalCryptoOnramp
 @Poko
-class MissingIdentifier internal constructor(
-    val type: IdentifierType,
-    val placeholder: String,
-    val alternateIdentifier: IdentifierHint?,
-    val regulation: RegulationType
+class AlternativeGroup internal constructor(
+    val originalMissingIdentifiers: List<IdentifierType>,
+    val alternativeMissingIdentifiers: List<IdentifierType>
 )
 
 /**
  * Identifier requirements returned by the Crypto Onramp API.
- *
- * @property missingIdentifiers Missing MiCA and CARF identifiers still required.
  */
 @ExperimentalCryptoOnramp
 @Poko
 class IdentifierRequirements internal constructor(
-    val missingIdentifiers: List<MissingIdentifier>
+    val identifiers: List<IdentifierRequirement>,
+    val alternatives: List<AlternativeGroup>
 )
 
 /**
  * Validation result returned after updating KYC info.
- *
- * @property valid Whether the submitted identifiers were accepted.
- * @property missingIdentifiers Missing identifiers, if more are required.
- * @property invalidIdentifiers Submitted identifier types rejected by the API.
  */
 @ExperimentalCryptoOnramp
 @Poko
 class UpdateKycInfoResult internal constructor(
     val valid: Boolean,
-    val missingIdentifiers: List<MissingIdentifier>?,
-    val invalidIdentifiers: List<IdentifierType>?
+    val identifiers: List<IdentifierRequirement>,
+    val alternatives: List<AlternativeGroup>,
+    val invalidIdentifiers: List<IdentifierType>
 )
 
 @Serializable
@@ -217,18 +217,15 @@ internal data class IdentifierRequest(
 
 @Serializable
 internal data class IdentifierRequirementsResponse(
-    @SerialName("missing_identifiers_mica")
-    val missingIdentifiersMica: List<MissingIdentifierResponse> = emptyList(),
-    @SerialName("missing_identifiers_carf")
-    val missingIdentifiersCarf: List<MissingIdentifierResponse> = emptyList(),
+    @SerialName("identifiers")
+    val identifiers: List<IdentifierRequirementResponse> = emptyList(),
+    @SerialName("alternatives")
+    val alternatives: List<AlternativeGroupResponse> = emptyList(),
 ) {
     fun toIdentifierRequirements(): IdentifierRequirements {
         return IdentifierRequirements(
-            missingIdentifiers = missingIdentifiersMica.map {
-                it.toMissingIdentifier(RegulationType.EuMica)
-            } + missingIdentifiersCarf.map {
-                it.toMissingIdentifier(RegulationType.EuCarf)
-            }
+            identifiers = identifiers.map { it.toIdentifierRequirement() },
+            alternatives = alternatives.map { it.toAlternativeGroup() }
         )
     }
 }
@@ -237,16 +234,19 @@ internal data class IdentifierRequirementsResponse(
 internal data class UpdateKycInfoResponse(
     @SerialName("valid")
     val valid: Boolean = true,
-    @SerialName("missing_identifiers")
-    val missingIdentifiers: MissingIdentifiersResponse? = null,
-    @SerialName("errors")
-    val errors: List<String>? = null,
+    @SerialName("identifiers")
+    val identifiers: List<IdentifierRequirementResponse> = emptyList(),
+    @SerialName("alternatives")
+    val alternatives: List<AlternativeGroupResponse> = emptyList(),
+    @SerialName("invalid_identifiers")
+    val invalidIdentifiers: List<String> = emptyList(),
 ) {
     fun toUpdateKycInfoResult(): UpdateKycInfoResult {
         return UpdateKycInfoResult(
             valid = valid,
-            missingIdentifiers = missingIdentifiers?.toMissingIdentifiers(),
-            invalidIdentifiers = errors?.map { identifierType ->
+            identifiers = identifiers.map { it.toIdentifierRequirement() },
+            alternatives = alternatives.map { it.toAlternativeGroup() },
+            invalidIdentifiers = invalidIdentifiers.map { identifierType ->
                 requireNotNull(IdentifierType.fromValue(identifierType)) {
                     "Unrecognized identifier type: $identifierType"
                 }
@@ -256,57 +256,43 @@ internal data class UpdateKycInfoResponse(
 }
 
 @Serializable
-internal data class MissingIdentifiersResponse(
-    @SerialName("missing_identifiers_mica")
-    val missingIdentifiersMica: List<MissingIdentifierResponse> = emptyList(),
-    @SerialName("missing_identifiers_carf")
-    val missingIdentifiersCarf: List<MissingIdentifierResponse> = emptyList(),
-) {
-    fun toMissingIdentifiers(): List<MissingIdentifier> {
-        return missingIdentifiersMica.map {
-            it.toMissingIdentifier(RegulationType.EuMica)
-        } + missingIdentifiersCarf.map {
-            it.toMissingIdentifier(RegulationType.EuCarf)
-        }
-    }
-}
-
-@Serializable
-internal data class MissingIdentifierResponse(
+internal data class IdentifierRequirementResponse(
     @SerialName("type")
     val type: String,
-    @SerialName("placeholder")
-    val placeholder: String,
-    @SerialName("alternate_identifier")
-    val alternateIdentifier: IdentifierHintResponse? = null
+    @SerialName("regulation")
+    val regulation: String
 ) {
-    fun toMissingIdentifier(regulation: RegulationType): MissingIdentifier {
-        val identifierType = requireNotNull(IdentifierType.fromValue(type)) {
-            "Unrecognized identifier type: $type"
-        }
-
-        return MissingIdentifier(
-            type = identifierType,
-            placeholder = placeholder,
-            alternateIdentifier = alternateIdentifier?.toIdentifierHint(),
-            regulation = regulation
+    fun toIdentifierRequirement(): IdentifierRequirement {
+        return IdentifierRequirement(
+            type = requireNotNull(IdentifierType.fromValue(type)) {
+                "Unrecognized identifier type: $type"
+            },
+            regulation = requireNotNull(RegulationType.fromValue(regulation)) {
+                "Unrecognized regulation type: $regulation"
+            }
         )
     }
 }
 
 @Serializable
-internal data class IdentifierHintResponse(
-    @SerialName("type")
-    val type: String,
-    @SerialName("placeholder")
-    val placeholder: String
+internal data class AlternativeGroupResponse(
+    @SerialName("original_missing_identifiers")
+    val originalMissingIdentifiers: List<String>,
+    @SerialName("alternative_missing_identifiers")
+    val alternativeMissingIdentifiers: List<String>
 ) {
-    fun toIdentifierHint(): IdentifierHint {
-        return IdentifierHint(
-            type = requireNotNull(IdentifierType.fromValue(type)) {
-                "Unrecognized identifier type: $type"
+    fun toAlternativeGroup(): AlternativeGroup {
+        return AlternativeGroup(
+            originalMissingIdentifiers = originalMissingIdentifiers.map { identifierType ->
+                requireNotNull(IdentifierType.fromValue(identifierType)) {
+                    "Unrecognized identifier type: $identifierType"
+                }
             },
-            placeholder = placeholder
+            alternativeMissingIdentifiers = alternativeMissingIdentifiers.map { identifierType ->
+                requireNotNull(IdentifierType.fromValue(identifierType)) {
+                    "Unrecognized identifier type: $identifierType"
+                }
+            }
         )
     }
 }
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 6b29ec40ed7..2b90b616989 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -7,13 +7,13 @@ import com.stripe.android.core.networking.ApiRequest
 import com.stripe.android.core.networking.StripeNetworkClient
 import com.stripe.android.core.networking.StripeResponse
 import com.stripe.android.core.version.StripeSdkVersion
+import com.stripe.android.crypto.onramp.model.AlternativeGroup
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.Identifier
-import com.stripe.android.crypto.onramp.model.IdentifierHint
+import com.stripe.android.crypto.onramp.model.IdentifierRequirement
 import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
-import com.stripe.android.crypto.onramp.model.MissingIdentifier
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.RegulationType
 import com.stripe.android.crypto.onramp.model.UpdateKycInfoResult
@@ -157,20 +157,20 @@ class CryptoApiRepositoryTest {
                 200,
                 """
                     {
-                        "missing_identifiers_mica": [
+                        "alternatives": [
                             {
-                                "type": "mt_nic",
-                                "placeholder": "123456M",
-                                "alternate_identifier": {
-                                    "type": "mt_pp",
-                                    "placeholder": "AA1234567"
-                                }
+                                "alternative_missing_identifiers": ["mt_pp"],
+                                "original_missing_identifiers": ["mt_nic"]
                             }
                         ],
-                        "missing_identifiers_carf": [
+                        "identifiers": [
                             {
-                                "type": "fr_spi",
-                                "placeholder": "12 34 567 890 123"
+                                "regulation": "eu_mica",
+                                "type": "mt_nic"
+                            },
+                            {
+                                "regulation": "eu_carf",
+                                "type": "fr_spi"
                             }
                         ]
                     }
@@ -194,24 +194,24 @@ class CryptoApiRepositoryTest {
                 .isEqualTo(mapOf("credentials" to mapOf("consumer_session_client_secret" to "test-secret")))
 
             assertThat(result.isSuccess).isTrue()
-            assertThat(result.getOrThrow().missingIdentifiers)
+            assertThat(result.getOrThrow().identifiers)
                 .containsExactly(
-                    MissingIdentifier(
+                    IdentifierRequirement(
                         type = IdentifierType.MT_NIC,
-                        placeholder = "123456M",
-                        alternateIdentifier = IdentifierHint(
-                            type = IdentifierType.MT_PP,
-                            placeholder = "AA1234567"
-                        ),
                         regulation = RegulationType.EuMica
                     ),
-                    MissingIdentifier(
+                    IdentifierRequirement(
                         type = IdentifierType.FR_SPI,
-                        placeholder = "12 34 567 890 123",
-                        alternateIdentifier = null,
                         regulation = RegulationType.EuCarf
                     )
                 )
+            assertThat(result.getOrThrow().alternatives)
+                .containsExactly(
+                    AlternativeGroup(
+                        originalMissingIdentifiers = listOf(IdentifierType.MT_NIC),
+                        alternativeMissingIdentifiers = listOf(IdentifierType.MT_PP)
+                    )
+                )
         }
     }
 
@@ -222,26 +222,36 @@ class CryptoApiRepositoryTest {
                 200,
                 """
                     {
+                        "alternatives": [
+                            {
+                                "alternative_missing_identifiers": [
+                                    "mt_pp"
+                                ],
+                                "original_missing_identifiers": [
+                                    "mt_nic"
+                                ]
+                            }
+                        ],
+                        "identifiers": [
+                            {
+                                "regulation": "eu_carf",
+                                "type": "de_stn"
+                            },
+                            {
+                                "regulation": "eu_carf",
+                                "type": "mt_nic"
+                            },
+                            {
+                                "regulation": "eu_mica",
+                                "type": "mt_nic"
+                            }
+                        ],
+                        "invalid_identifiers": [
+                            "de_stn",
+                            "mt_nic"
+                        ],
                         "valid": false,
-                        "missing_identifiers": {
-                            "missing_identifiers_mica": [
-                                {
-                                    "type": "mt_nic",
-                                    "placeholder": "123456M",
-                                    "alternate_identifier": {
-                                        "type": "mt_pp",
-                                        "placeholder": "AA1234567"
-                                    }
-                                }
-                            ],
-                            "missing_identifiers_carf": [
-                                {
-                                    "type": "fr_spi",
-                                    "placeholder": "12 34 567 890 123"
-                                }
-                            ]
-                        },
-                        "errors": ["fr_spi"]
+                        "ignored_field": "ignored"
                     }
                     """,
                 emptyMap()
@@ -276,6 +286,50 @@ class CryptoApiRepositoryTest {
         }
     }
 
+    @Test
+    fun testUpdateKycInfoSucceedsWhenValid() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                """
+                    {
+                        "alternatives": [],
+                        "identifiers": [],
+                        "invalid_identifiers": [],
+                        "valid": true
+                    }
+                    """,
+                emptyMap()
+            )
+
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.updateKycInfo(
+                identifiers = Identifiers()
+                    .identifiersMica(
+                        listOf(
+                            Identifier()
+                                .type(IdentifierType.MT_NIC)
+                                .value("mica_123")
+                        )
+                    ),
+                consumerSessionClientSecret = "test-secret"
+            )
+
+            assertThat(result.isSuccess).isTrue()
+            assertThat(result.getOrThrow())
+                .isEqualTo(
+                    UpdateKycInfoResult(
+                        valid = true,
+                        identifiers = emptyList(),
+                        alternatives = emptyList(),
+                        invalidIdentifiers = emptyList()
+                    )
+                )
+        }
+    }
+
     @Test
     fun testRetrieveCrsCarfDeclarationSucceeds() {
         runTest {
@@ -720,25 +774,29 @@ class CryptoApiRepositoryTest {
 
     private fun assertUpdateKycInfoResult(result: UpdateKycInfoResult) {
         assertThat(result.valid).isFalse()
-        assertThat(result.missingIdentifiers)
+        assertThat(result.identifiers)
             .containsExactly(
-                MissingIdentifier(
-                    type = IdentifierType.MT_NIC,
-                    placeholder = "123456M",
-                    alternateIdentifier = IdentifierHint(
-                        type = IdentifierType.MT_PP,
-                        placeholder = "AA1234567"
-                    ),
-                    regulation = RegulationType.EuMica
+                IdentifierRequirement(
+                    type = IdentifierType.DE_STN,
+                    regulation = RegulationType.EuCarf
                 ),
-                MissingIdentifier(
-                    type = IdentifierType.FR_SPI,
-                    placeholder = "12 34 567 890 123",
-                    alternateIdentifier = null,
+                IdentifierRequirement(
+                    type = IdentifierType.MT_NIC,
                     regulation = RegulationType.EuCarf
+                ),
+                IdentifierRequirement(
+                    type = IdentifierType.MT_NIC,
+                    regulation = RegulationType.EuMica
+                )
+            )
+        assertThat(result.alternatives)
+            .containsExactly(
+                AlternativeGroup(
+                    originalMissingIdentifiers = listOf(IdentifierType.MT_NIC),
+                    alternativeMissingIdentifiers = listOf(IdentifierType.MT_PP)
                 )
             )
         assertThat(result.invalidIdentifiers)
-            .isEqualTo(listOf(IdentifierType.FR_SPI))
+            .isEqualTo(listOf(IdentifierType.DE_STN, IdentifierType.MT_NIC))
     }
 }
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index ea90d4170d6..8ab73ccee6b 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -13,15 +13,15 @@ import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
+import com.stripe.android.crypto.onramp.model.AlternativeGroup
 import com.stripe.android.crypto.onramp.model.Identifier
-import com.stripe.android.crypto.onramp.model.IdentifierHint
+import com.stripe.android.crypto.onramp.model.IdentifierRequirement
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
 import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
-import com.stripe.android.crypto.onramp.model.MissingIdentifier
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampAuthorizeResult
 import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
@@ -206,22 +206,21 @@ class OnrampInteractorTest {
     fun testGetIdentifierRequirementsIsSuccessful() = runTest {
         whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
         val requirements = IdentifierRequirements(
-            missingIdentifiers = listOf(
-                MissingIdentifier(
+            identifiers = listOf(
+                IdentifierRequirement(
                     type = IdentifierType.MT_NIC,
-                    placeholder = "123456M",
-                    alternateIdentifier = IdentifierHint(
-                        type = IdentifierType.MT_PP,
-                        placeholder = "AA1234567"
-                    ),
                     regulation = RegulationType.EuMica
                 ),
-                MissingIdentifier(
+                IdentifierRequirement(
                     type = IdentifierType.FR_SPI,
-                    placeholder = "12 34 567 890 123",
-                    alternateIdentifier = null,
                     regulation = RegulationType.EuCarf
                 )
+            ),
+            alternatives = listOf(
+                AlternativeGroup(
+                    originalMissingIdentifiers = listOf(IdentifierType.MT_NIC),
+                    alternativeMissingIdentifiers = listOf(IdentifierType.MT_PP)
+                )
             )
         )
         whenever(cryptoApiRepository.getIdentifierRequirements(any()))
@@ -242,15 +241,27 @@ class OnrampInteractorTest {
         whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
         val submissionResult = UpdateKycInfoResult(
             valid = false,
-            missingIdentifiers = listOf(
-                MissingIdentifier(
-                    type = IdentifierType.FR_SPI,
-                    placeholder = "12 34 567 890 123",
-                    alternateIdentifier = null,
+            identifiers = listOf(
+                IdentifierRequirement(
+                    type = IdentifierType.DE_STN,
+                    regulation = RegulationType.EuCarf
+                ),
+                IdentifierRequirement(
+                    type = IdentifierType.MT_NIC,
                     regulation = RegulationType.EuCarf
+                ),
+                IdentifierRequirement(
+                    type = IdentifierType.MT_NIC,
+                    regulation = RegulationType.EuMica
+                )
+            ),
+            alternatives = listOf(
+                AlternativeGroup(
+                    originalMissingIdentifiers = listOf(IdentifierType.MT_NIC),
+                    alternativeMissingIdentifiers = listOf(IdentifierType.MT_PP)
                 )
             ),
-            invalidIdentifiers = listOf(IdentifierType.FR_SPI)
+            invalidIdentifiers = listOf(IdentifierType.DE_STN, IdentifierType.MT_NIC)
         )
         whenever(cryptoApiRepository.updateKycInfo(any(), any()))
             .thenReturn(Result.success(submissionResult))

From 45257021af5f04eb5134649baf2891167488df69 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 4 May 2026 12:29:21 -0400
Subject: [PATCH 14/57] Further api review updates

---
 .../crypto/onramp/example/OnrampActivity.kt   |  99 ++++++------
 .../crypto/onramp/example/OnrampViewModel.kt  | 102 +++++++-----
 crypto-onramp/api/crypto-onramp.api           |   9 +-
 .../crypto/onramp/OnrampCoordinator.kt        |   6 +-
 .../android/crypto/onramp/OnrampInteractor.kt |   4 +-
 .../crypto/onramp/model/Identifiers.kt        | 147 +++++-------------
 .../repositories/CryptoApiRepository.kt       |  25 ++-
 .../crypto/onramp/CryptoApiRepositoryTest.kt  |  59 +++----
 .../crypto/onramp/OnrampInteractorTest.kt     |  14 +-
 9 files changed, 199 insertions(+), 266 deletions(-)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
index f3393298de4..3fc5c3d3cf6 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
@@ -499,10 +499,10 @@ internal fun OnrampScreen(
                     onKycBirthCityChange = viewModel::updateKycBirthCity,
                     onKycNationalitiesChange = viewModel::updateKycNationalities,
                     onKycAddressChange = viewModel::updateKycAddress,
-                    onMicaIdentifierValueChange = viewModel::updateMicaIdentifierValue,
-                    onMicaIdentifierTypeChange = viewModel::updateMicaIdentifierType,
-                    onCarfIdentifierValueChange = viewModel::updateCarfIdentifierValue,
-                    onCarfIdentifierTypeChange = viewModel::updateCarfIdentifierType,
+                    onIdentifierValueChange = viewModel::updateIdentifierValue,
+                    onIdentifierTypeChange = viewModel::updateIdentifierType,
+                    onAddIdentifier = viewModel::addIdentifierInput,
+                    onRemoveIdentifier = viewModel::removeIdentifierInput,
                     onAuthenticate = onAuthenticateUser,
                     onRegisterWalletAddress = onRegisterWalletAddress,
                     onCollectKYC = { kycInfo -> viewModel.collectKycInfo(kycInfo) },
@@ -732,10 +732,10 @@ private fun AuthenticatedOperationsScreen(
     onKycBirthCityChange: (String) -> Unit,
     onKycNationalitiesChange: (String) -> Unit,
     onKycAddressChange: (PaymentSheet.Address) -> Unit,
-    onMicaIdentifierValueChange: (String) -> Unit,
-    onMicaIdentifierTypeChange: (String) -> Unit,
-    onCarfIdentifierValueChange: (String) -> Unit,
-    onCarfIdentifierTypeChange: (String) -> Unit,
+    onIdentifierValueChange: (Int, String) -> Unit,
+    onIdentifierTypeChange: (Int, String) -> Unit,
+    onAddIdentifier: () -> Unit,
+    onRemoveIdentifier: (Int) -> Unit,
     onAuthenticate: (oauthScopes: String) -> Unit,
     onRegisterWalletAddress: (String, CryptoNetwork) -> Unit,
     onCollectKYC: (KycInfo) -> Unit,
@@ -1007,14 +1007,11 @@ private fun AuthenticatedOperationsScreen(
 
         AnimatedVisibility(visible = identifiersExpanded) {
             IdentifierInfoScreen(
-                micaIdentifierValue = state.micaIdentifierValue,
-                onMicaIdentifierValueChange = onMicaIdentifierValueChange,
-                micaIdentifierType = state.micaIdentifierType,
-                onMicaIdentifierTypeChange = onMicaIdentifierTypeChange,
-                carfIdentifierValue = state.carfIdentifierValue,
-                onCarfIdentifierValueChange = onCarfIdentifierValueChange,
-                carfIdentifierType = state.carfIdentifierType,
-                onCarfIdentifierTypeChange = onCarfIdentifierTypeChange,
+                identifierInputs = state.identifierInputs,
+                onIdentifierValueChange = onIdentifierValueChange,
+                onIdentifierTypeChange = onIdentifierTypeChange,
+                onAddIdentifier = onAddIdentifier,
+                onRemoveIdentifier = onRemoveIdentifier,
                 identifierRequirementsSummary = state.identifierRequirementsSummary,
                 updateKycInfoSummary = state.updateKycInfoSummary,
                 onGetIdentifierRequirements = onGetIdentifierRequirements,
@@ -1142,14 +1139,11 @@ private fun AuthenticatedOperationsScreen(
 @Composable
 @Suppress("LongMethod")
 private fun IdentifierInfoScreen(
-    micaIdentifierValue: String,
-    onMicaIdentifierValueChange: (String) -> Unit,
-    micaIdentifierType: String,
-    onMicaIdentifierTypeChange: (String) -> Unit,
-    carfIdentifierValue: String,
-    onCarfIdentifierValueChange: (String) -> Unit,
-    carfIdentifierType: String,
-    onCarfIdentifierTypeChange: (String) -> Unit,
+    identifierInputs: List<IdentifierInputEntry>,
+    onIdentifierValueChange: (Int, String) -> Unit,
+    onIdentifierTypeChange: (Int, String) -> Unit,
+    onAddIdentifier: () -> Unit,
+    onRemoveIdentifier: (Int) -> Unit,
     identifierRequirementsSummary: String?,
     updateKycInfoSummary: String?,
     onGetIdentifierRequirements: () -> Unit,
@@ -1163,7 +1157,7 @@ private fun IdentifierInfoScreen(
         )
 
         Text(
-            text = "Fetch missing MiCA and CARF identifier requirements for the current Link user.",
+            text = "Fetch missing identifier requirements for the current Link user.",
             modifier = Modifier.padding(bottom = 12.dp)
         )
 
@@ -1190,33 +1184,42 @@ private fun IdentifierInfoScreen(
         )
 
         Text(
-            text = "This sample app submits one MiCA entry and one CARF entry.",
+            text = "Add as many identifiers as needed and submit them as a list.",
             modifier = Modifier.padding(bottom = 12.dp)
         )
 
-        Text(
-            text = "MiCA",
-            fontWeight = FontWeight.SemiBold,
-            modifier = Modifier.padding(bottom = 8.dp)
-        )
-        KYCTextField(
-            micaIdentifierType,
-            "MiCA Identifier Type (e.g. mt_nic)",
-            onChange = onMicaIdentifierTypeChange
-        )
-        KYCTextField(micaIdentifierValue, "MiCA Identifier Value", onChange = onMicaIdentifierValueChange)
+        identifierInputs.forEachIndexed { index, identifierInput ->
+            Text(
+                text = "Identifier ${index + 1}",
+                fontWeight = FontWeight.SemiBold,
+                modifier = Modifier.padding(bottom = 8.dp)
+            )
+            KYCTextField(
+                identifierInput.type,
+                "Identifier Type (e.g. mt_nic)",
+                onChange = { onIdentifierTypeChange(index, it) }
+            )
+            KYCTextField(
+                identifierInput.value,
+                "Identifier Value",
+                onChange = { onIdentifierValueChange(index, it) }
+            )
+            TextButton(
+                onClick = { onRemoveIdentifier(index) },
+                modifier = Modifier.padding(bottom = 12.dp)
+            ) {
+                Text("Remove Identifier")
+            }
+        }
 
-        Text(
-            text = "CARF",
-            fontWeight = FontWeight.SemiBold,
-            modifier = Modifier.padding(bottom = 8.dp)
-        )
-        KYCTextField(
-            carfIdentifierType,
-            "CARF Identifier Type (e.g. fr_spi)",
-            onChange = onCarfIdentifierTypeChange
-        )
-        KYCTextField(carfIdentifierValue, "CARF Identifier Value", onChange = onCarfIdentifierValueChange)
+        Button(
+            onClick = onAddIdentifier,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(bottom = 12.dp)
+        ) {
+            Text("Add Identifier")
+        }
 
         Button(
             onClick = onUpdateKycInfo,
diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index 5ea770f878b..c06eac1da51 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -26,7 +26,6 @@ import com.stripe.android.crypto.onramp.model.Identifier
 import com.stripe.android.crypto.onramp.model.IdentifierRequirement
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
 import com.stripe.android.crypto.onramp.model.IdentifierType
-import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
@@ -817,20 +816,36 @@ internal class OnrampViewModel(
         _uiState.update { it.copy(kycAddress = address) }
     }
 
-    fun updateMicaIdentifierValue(value: String) {
-        _uiState.update { it.copy(micaIdentifierValue = value) }
+    fun updateIdentifierValue(index: Int, value: String) {
+        _uiState.update { state ->
+            state.copy(
+                identifierInputs = state.identifierInputs.replaceAt(index) { entry ->
+                    entry.copy(value = value)
+                }
+            )
+        }
     }
 
-    fun updateMicaIdentifierType(value: String) {
-        _uiState.update { it.copy(micaIdentifierType = value) }
+    fun updateIdentifierType(index: Int, value: String) {
+        _uiState.update { state ->
+            state.copy(
+                identifierInputs = state.identifierInputs.replaceAt(index) { entry ->
+                    entry.copy(type = value)
+                }
+            )
+        }
     }
 
-    fun updateCarfIdentifierValue(value: String) {
-        _uiState.update { it.copy(carfIdentifierValue = value) }
+    fun addIdentifierInput() {
+        _uiState.update { state ->
+            state.copy(identifierInputs = state.identifierInputs + IdentifierInputEntry())
+        }
     }
 
-    fun updateCarfIdentifierType(value: String) {
-        _uiState.update { it.copy(carfIdentifierType = value) }
+    fun removeIdentifierInput(index: Int) {
+        _uiState.update { state ->
+            state.copy(identifierInputs = state.identifierInputs.removeAt(index))
+        }
     }
 
     fun clearCheckoutEvent() {
@@ -921,35 +936,28 @@ internal class OnrampViewModel(
         getPrefs().edit { remove(userDataKey) }
     }
 
-    private fun buildIdentifiersRequest(state: OnrampUiState): Identifiers? {
-        val (micaIdentifier, micaError) = buildIdentifier(
-            label = "MiCA identifier",
-            value = state.micaIdentifierValue,
-            type = state.micaIdentifierType
-        )
-        if (micaError != null) {
-            _message.value = micaError
-            return null
-        }
+    private fun buildIdentifiersRequest(state: OnrampUiState): List<Identifier>? {
+        val identifiers = mutableListOf<Identifier>()
 
-        val (carfIdentifier, carfError) = buildIdentifier(
-            label = "CARF identifier",
-            value = state.carfIdentifierValue,
-            type = state.carfIdentifierType
-        )
-        if (carfError != null) {
-            _message.value = carfError
-            return null
+        state.identifierInputs.forEachIndexed { index, entry ->
+            val (identifier, error) = buildIdentifier(
+                label = "Identifier ${index + 1}",
+                value = entry.value,
+                type = entry.type
+            )
+            if (error != null) {
+                _message.value = error
+                return null
+            }
+            identifier?.let(identifiers::add)
         }
 
-        if (micaIdentifier == null && carfIdentifier == null) {
-            _message.value = "Enter at least one MiCA or CARF identifier"
+        if (identifiers.isEmpty()) {
+            _message.value = "Enter at least one identifier"
             return null
         }
 
-        return Identifiers()
-            .identifiersMica(micaIdentifier?.let(::listOf))
-            .identifiersCarf(carfIdentifier?.let(::listOf))
+        return identifiers
     }
 
     private fun buildIdentifier(
@@ -1057,14 +1065,17 @@ data class OnrampUiState(
     val kycBirthCity: String = "",
     val kycNationalities: String = "",
     val kycAddress: PaymentSheet.Address = PaymentSheet.Address(),
-    val micaIdentifierValue: String = "",
-    val micaIdentifierType: String = "",
-    val carfIdentifierValue: String = "",
-    val carfIdentifierType: String = "",
+    val identifierInputs: List<IdentifierInputEntry> = listOf(IdentifierInputEntry()),
     val identifierRequirementsSummary: String? = null,
     val updateKycInfoSummary: String? = null,
 ) : Parcelable
 
+@Parcelize
+data class IdentifierInputEntry(
+    val type: String = "",
+    val value: String = "",
+) : Parcelable
+
 enum class Screen {
     SeamlessSignIn,
     LoginSignup,
@@ -1109,3 +1120,22 @@ private fun List<String>.joinToStringOrNone(): String {
 private fun List<IdentifierType>.joinToValueString(): String {
     return map { it.value }.joinToStringOrNone()
 }
+
+private fun List<IdentifierInputEntry>.replaceAt(
+    index: Int,
+    transform: (IdentifierInputEntry) -> IdentifierInputEntry
+): List<IdentifierInputEntry> {
+    if (index !in indices) return this
+    return mapIndexed { currentIndex, entry ->
+        if (currentIndex == index) {
+            transform(entry)
+        } else {
+            entry
+        }
+    }
+}
+
+private fun List<IdentifierInputEntry>.removeAt(index: Int): List<IdentifierInputEntry> {
+    if (index !in indices) return this
+    return filterIndexed { currentIndex, _ -> currentIndex != index }
+}
diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index dffb4fffdac..c60f8dbb95e 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -13,7 +13,7 @@ public final class com/stripe/android/crypto/onramp/OnrampCoordinator {
 	public final fun logOut (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun registerLinkUser (Lcom/stripe/android/crypto/onramp/model/LinkUserInfo;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun registerWalletAddress (Ljava/lang/String;Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun updateKycInfo (Lcom/stripe/android/crypto/onramp/model/Identifiers;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun updateKycInfo (Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun updatePhoneNumber (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
@@ -154,13 +154,6 @@ public final class com/stripe/android/crypto/onramp/model/IdentifierType$Compani
 	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/IdentifierType;
 }
 
-public final class com/stripe/android/crypto/onramp/model/Identifiers {
-	public static final field $stable I
-	public fun <init> ()V
-	public final fun identifiersCarf (Ljava/util/List;)Lcom/stripe/android/crypto/onramp/model/Identifiers;
-	public final fun identifiersMica (Ljava/util/List;)Lcom/stripe/android/crypto/onramp/model/Identifiers;
-}
-
 public final class com/stripe/android/crypto/onramp/model/KycInfo {
 	public static final field $stable I
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;)V
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
index 641af886811..2dbe56f3ec0 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
@@ -6,7 +6,7 @@ import androidx.lifecycle.SavedStateHandle
 import com.stripe.android.crypto.onramp.di.OnrampComponentHolder
 import com.stripe.android.crypto.onramp.di.OnrampPresenterComponent
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
-import com.stripe.android.crypto.onramp.model.Identifiers
+import com.stripe.android.crypto.onramp.model.Identifier
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
@@ -127,10 +127,10 @@ class OnrampCoordinator @Inject internal constructor(
      * Updates KYC info for the current Link user.
      * Requires an authenticated Link user.
      *
-     * @param identifiers The identifier payload to submit.
+     * @param identifiers The identifiers to submit.
      */
     suspend fun updateKycInfo(
-        identifiers: Identifiers
+        identifiers: List<Identifier>
     ): OnrampUpdateKycInfoResult {
         return interactor.updateKycInfo(identifiers)
     }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
index 607e07bf250..ab561448a38 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
@@ -16,7 +16,7 @@ import com.stripe.android.crypto.onramp.exception.MissingPaymentMethodException
 import com.stripe.android.crypto.onramp.exception.PaymentFailedException
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
-import com.stripe.android.crypto.onramp.model.Identifiers
+import com.stripe.android.crypto.onramp.model.Identifier
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
@@ -367,7 +367,7 @@ internal class OnrampInteractor @Inject constructor(
             )
     }
 
-    suspend fun updateKycInfo(identifiers: Identifiers): OnrampUpdateKycInfoResult {
+    suspend fun updateKycInfo(identifiers: List<Identifier>): OnrampUpdateKycInfoResult {
         val secret = consumerSessionClientSecret()
         if (secret == null) {
             val error = MissingConsumerSecretException()
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
index 70de354ba51..a9d465afb55 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
@@ -1,53 +1,10 @@
 package com.stripe.android.crypto.onramp.model
 
-import com.stripe.android.core.model.CountryCode
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import dev.drewhamilton.poko.Poko
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
-/**
- * Identifier payload submitted to the Crypto Onramp API.
- *
- * The current backend path is still specialized, so callers continue to separate
- * MiCA and CARF submissions even though individual identifiers are modeled with
- * the reviewed typed enum surface.
- *
- * @property identifiersMica MiCA identifiers for the consumer.
- * @property identifiersCarf CARF identifiers for the consumer.
- */
-@ExperimentalCryptoOnramp
-class Identifiers {
-    private var identifiersMica: List<Identifier>? = null
-    private var identifiersCarf: List<Identifier>? = null
-
-    /**
-     * Sets MiCA identifiers for the consumer.
-     */
-    fun identifiersMica(identifiersMica: List<Identifier>?) = apply {
-        this.identifiersMica = identifiersMica
-    }
-
-    /**
-     * Sets CARF identifiers for the consumer.
-     */
-    fun identifiersCarf(identifiersCarf: List<Identifier>?) = apply {
-        this.identifiersCarf = identifiersCarf
-    }
-
-    internal class State(
-        val identifiersMica: List<Identifier.State>?,
-        val identifiersCarf: List<Identifier.State>?
-    )
-
-    internal fun build(): State {
-        return State(
-            identifiersMica = identifiersMica?.map { it.build() },
-            identifiersCarf = identifiersCarf?.map { it.build() }
-        )
-    }
-}
-
 /**
  * A typed identifier entry.
  *
@@ -95,41 +52,37 @@ class Identifier {
  */
 @ExperimentalCryptoOnramp
 enum class IdentifierType(
-    val value: String,
-    private val countryCodeValue: String
+    val value: String
 ) {
-    AT_STN("at_stn", "AT"),
-    BE_NRN("be_nrn", "BE"),
-    BG_UCN("bg_ucn", "BG"),
-    HR_OIB("hr_oib", "HR"),
-    CY_TIC("cy_tic", "CY"),
-    CZ_RC("cz_rc", "CZ"),
-    DK_CPR("dk_cpr", "DK"),
-    EE_IK("ee_ik", "EE"),
-    FI_HETU("fi_hetu", "FI"),
-    FR_SPI("fr_spi", "FR"),
-    DE_STN("de_stn", "DE"),
-    GR_AFM("gr_afm", "GR"),
-    HU_AD("hu_ad", "HU"),
-    IS_KT("is_kt", "IS"),
-    IE_PPSN("ie_ppsn", "IE"),
-    IT_CF("it_cf", "IT"),
-    LV_PK("lv_pk", "LV"),
-    LT_AK("lt_ak", "LT"),
-    LU_NIF("lu_nif", "LU"),
-    MT_NIC("mt_nic", "MT"),
-    MT_PP("mt_pp", "MT"),
-    NL_BSN("nl_bsn", "NL"),
-    PL_PESEL("pl_pesel", "PL"),
-    PL_NIP("pl_nip", "PL"),
-    PT_NIF("pt_nif", "PT"),
-    RO_CNP("ro_cnp", "RO"),
-    SK_RC("sk_rc", "SK"),
-    SI_PIN("si_pin", "SI"),
-    SE_PIN("se_pin", "SE");
-
-    internal val countryCode: CountryCode
-        get() = CountryCode.create(countryCodeValue)
+    AT_STN("at_stn"),
+    BE_NRN("be_nrn"),
+    BG_UCN("bg_ucn"),
+    HR_OIB("hr_oib"),
+    CY_TIC("cy_tic"),
+    CZ_RC("cz_rc"),
+    DK_CPR("dk_cpr"),
+    EE_IK("ee_ik"),
+    FI_HETU("fi_hetu"),
+    FR_SPI("fr_spi"),
+    DE_STN("de_stn"),
+    GR_AFM("gr_afm"),
+    HU_AD("hu_ad"),
+    IS_KT("is_kt"),
+    IE_PPSN("ie_ppsn"),
+    IT_CF("it_cf"),
+    LV_PK("lv_pk"),
+    LT_AK("lt_ak"),
+    LU_NIF("lu_nif"),
+    MT_NIC("mt_nic"),
+    MT_PP("mt_pp"),
+    NL_BSN("nl_bsn"),
+    PL_PESEL("pl_pesel"),
+    PL_NIP("pl_nip"),
+    PT_NIF("pt_nif"),
+    RO_CNP("ro_cnp"),
+    SK_RC("sk_rc"),
+    SI_PIN("si_pin"),
+    SE_PIN("se_pin");
 
     companion object {
         fun fromValue(value: String): IdentifierType? {
@@ -196,30 +149,20 @@ class UpdateKycInfoResult internal constructor(
 )
 
 @Serializable
-internal data class IdentifiersRequest(
-    @SerialName("credentials")
+internal data class UpdateKycInfoRequest(
     val credentials: CryptoCustomerRequestParams.Credentials,
-    @SerialName("identifiers_mica")
-    val identifiersMica: List<IdentifierRequest>? = null,
-    @SerialName("identifiers_carf")
-    val identifiersCarf: List<IdentifierRequest>? = null
+    val identifiers: List<IdentifierRequest>
 )
 
 @Serializable
 internal data class IdentifierRequest(
-    @SerialName("country")
-    val country: String,
-    @SerialName("identifier")
-    val identifier: String,
-    @SerialName("identifier_type")
-    val identifierType: String
+    val type: String,
+    val value: String
 )
 
 @Serializable
 internal data class IdentifierRequirementsResponse(
-    @SerialName("identifiers")
     val identifiers: List<IdentifierRequirementResponse> = emptyList(),
-    @SerialName("alternatives")
     val alternatives: List<AlternativeGroupResponse> = emptyList(),
 ) {
     fun toIdentifierRequirements(): IdentifierRequirements {
@@ -232,13 +175,9 @@ internal data class IdentifierRequirementsResponse(
 
 @Serializable
 internal data class UpdateKycInfoResponse(
-    @SerialName("valid")
     val valid: Boolean = true,
-    @SerialName("identifiers")
     val identifiers: List<IdentifierRequirementResponse> = emptyList(),
-    @SerialName("alternatives")
     val alternatives: List<AlternativeGroupResponse> = emptyList(),
-    @SerialName("invalid_identifiers")
     val invalidIdentifiers: List<String> = emptyList(),
 ) {
     fun toUpdateKycInfoResult(): UpdateKycInfoResult {
@@ -257,9 +196,7 @@ internal data class UpdateKycInfoResponse(
 
 @Serializable
 internal data class IdentifierRequirementResponse(
-    @SerialName("type")
     val type: String,
-    @SerialName("regulation")
     val regulation: String
 ) {
     fun toIdentifierRequirement(): IdentifierRequirement {
@@ -297,22 +234,18 @@ internal data class AlternativeGroupResponse(
     }
 }
 
-internal fun Identifiers.toRequest(
+internal fun List<Identifier>.toRequest(
     credentials: CryptoCustomerRequestParams.Credentials
-): IdentifiersRequest {
-    val state = build()
-
-    return IdentifiersRequest(
+): UpdateKycInfoRequest {
+    return UpdateKycInfoRequest(
         credentials = credentials,
-        identifiersMica = state.identifiersMica?.map { it.toRequest() },
-        identifiersCarf = state.identifiersCarf?.map { it.toRequest() }
+        identifiers = map { it.build().toRequest() }
     )
 }
 
 private fun Identifier.State.toRequest(): IdentifierRequest {
     return IdentifierRequest(
-        country = type.countryCode.value,
-        identifier = value,
-        identifierType = type.value
+        type = type.value,
+        value = value
     )
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index 09948fed3ff..7bcbc74cda3 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -23,7 +23,7 @@ import com.stripe.android.crypto.onramp.model.GetOnrampSessionResponse
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
 import com.stripe.android.crypto.onramp.model.IdentifierRequirementsResponse
-import com.stripe.android.crypto.onramp.model.Identifiers
+import com.stripe.android.crypto.onramp.model.Identifier
 import com.stripe.android.crypto.onramp.model.KycCollectionRequest
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRefreshRequest
@@ -42,7 +42,6 @@ import com.stripe.android.utils.filterNotNullValues
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.json.Json
-import kotlinx.serialization.json.JsonNull
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.encodeToJsonElement
 import kotlinx.serialization.json.jsonObject
@@ -77,10 +76,6 @@ internal class CryptoApiRepository @Inject constructor(
         encodeDefaults = true
     }
 
-    private val nullOmittingJson = Json {
-        explicitNulls = false
-    }
-
     /**
      * Grants the provided session merchant permissions.
      *
@@ -147,18 +142,16 @@ internal class CryptoApiRepository @Inject constructor(
     }
 
     suspend fun updateKycInfo(
-        identifiers: Identifiers,
+        identifiers: List<Identifier>,
         consumerSessionClientSecret: String
     ): Result<UpdateKycInfoResult> {
         return executePost(
             updateKycInfoUrl,
-            JsonObject(
-                nullOmittingJson.encodeToJsonElement(
-                    identifiers.toRequest(
-                        credentials = CryptoCustomerRequestParams.Credentials(consumerSessionClientSecret)
-                    )
-                ).jsonObject.filterValues { it != JsonNull }
-            ),
+            Json.encodeToJsonElement(
+                identifiers.toRequest(
+                    credentials = CryptoCustomerRequestParams.Credentials(consumerSessionClientSecret)
+                )
+            ).jsonObject,
             UpdateKycInfoResponse.serializer()
         ).mapCatching { it.toUpdateKycInfoResult() }
     }
@@ -400,10 +393,10 @@ internal class CryptoApiRepository @Inject constructor(
             get() = getApiUrl("crypto/internal/identifier_requirements")
 
         /**
-         * @return `https://api.stripe.com/v1/crypto/internal/eu_identifiers`
+         * @return `https://api.stripe.com/v1/crypto/internal/tax_attestation`
          */
         internal val updateKycInfoUrl: String
-            get() = getApiUrl("crypto/internal/eu_identifiers")
+            get() = getApiUrl("crypto/internal/tax_attestation")
 
         /**
          * @return `https://api.stripe.com/v1/crypto/internal/crs_carf_declaration`
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 2b90b616989..0194c436563 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -12,7 +12,6 @@ import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.Identifier
 import com.stripe.android.crypto.onramp.model.IdentifierRequirement
 import com.stripe.android.crypto.onramp.model.IdentifierType
-import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.RegulationType
@@ -246,7 +245,7 @@ class CryptoApiRepositoryTest {
                                 "type": "mt_nic"
                             }
                         ],
-                        "invalid_identifiers": [
+                        "invalidIdentifiers": [
                             "de_stn",
                             "mt_nic"
                         ],
@@ -261,21 +260,14 @@ class CryptoApiRepositoryTest {
                 .thenReturn(stripeResponse)
 
             val result = cryptoApiRepository.updateKycInfo(
-                identifiers = Identifiers()
-                    .identifiersMica(
-                        listOf(
-                            Identifier()
-                                .type(IdentifierType.MT_NIC)
-                                .value("mica_123")
-                        )
-                    )
-                    .identifiersCarf(
-                        listOf(
-                            Identifier()
-                                .type(IdentifierType.FR_SPI)
-                                .value("carf_456")
-                        )
-                    ),
+                identifiers = listOf(
+                    Identifier()
+                        .type(IdentifierType.MT_NIC)
+                        .value("mica_123"),
+                    Identifier()
+                        .type(IdentifierType.FR_SPI)
+                        .value("carf_456")
+                ),
                 consumerSessionClientSecret = "test-secret"
             )
 
@@ -295,7 +287,7 @@ class CryptoApiRepositoryTest {
                     {
                         "alternatives": [],
                         "identifiers": [],
-                        "invalid_identifiers": [],
+                        "invalidIdentifiers": [],
                         "valid": true
                     }
                     """,
@@ -306,14 +298,11 @@ class CryptoApiRepositoryTest {
                 .thenReturn(stripeResponse)
 
             val result = cryptoApiRepository.updateKycInfo(
-                identifiers = Identifiers()
-                    .identifiersMica(
-                        listOf(
-                            Identifier()
-                                .type(IdentifierType.MT_NIC)
-                                .value("mica_123")
-                        )
-                    ),
+                identifiers = listOf(
+                    Identifier()
+                        .type(IdentifierType.MT_NIC)
+                        .value("mica_123")
+                ),
                 consumerSessionClientSecret = "test-secret"
             )
 
@@ -749,23 +738,19 @@ class CryptoApiRepositoryTest {
 
     private fun assertIdentifiersRequest(apiRequest: ApiRequest) {
         assertThat(apiRequest.baseUrl)
-            .isEqualTo("https://api.stripe.com/v1/crypto/internal/eu_identifiers")
+            .isEqualTo("https://api.stripe.com/v1/crypto/internal/tax_attestation")
         assertThat(apiRequest.params)
             .isEqualTo(
                 mapOf(
                     "credentials" to mapOf("consumer_session_client_secret" to "test-secret"),
-                    "identifiers_mica" to listOf(
+                    "identifiers" to listOf(
                         mapOf(
-                            "country" to "MT",
-                            "identifier" to "mica_123",
-                            "identifier_type" to "mt_nic"
-                        )
-                    ),
-                    "identifiers_carf" to listOf(
+                            "type" to "mt_nic",
+                            "value" to "mica_123"
+                        ),
                         mapOf(
-                            "country" to "FR",
-                            "identifier" to "carf_456",
-                            "identifier_type" to "fr_spi"
+                            "type" to "fr_spi",
+                            "value" to "carf_456"
                         )
                     )
                 )
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 8ab73ccee6b..1ab19979f0b 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -18,7 +18,6 @@ import com.stripe.android.crypto.onramp.model.Identifier
 import com.stripe.android.crypto.onramp.model.IdentifierRequirement
 import com.stripe.android.crypto.onramp.model.IdentifierRequirements
 import com.stripe.android.crypto.onramp.model.IdentifierType
-import com.stripe.android.crypto.onramp.model.Identifiers
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
@@ -269,14 +268,11 @@ class OnrampInteractorTest {
         interactor.onLinkControllerState(mockLinkStateWithAccount())
 
         val result = interactor.updateKycInfo(
-            Identifiers()
-                .identifiersMica(
-                    listOf(
-                        Identifier()
-                            .type(IdentifierType.MT_NIC)
-                            .value("mica_123")
-                    )
-                )
+            listOf(
+                Identifier()
+                    .type(IdentifierType.MT_NIC)
+                    .value("mica_123")
+            )
         )
 
         assertThat(result).isInstanceOf(OnrampUpdateKycInfoResult.Completed::class.java)

From 5bba36f626d6cf4109a1ab45890e049cfaedbf37 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 4 May 2026 13:21:12 -0400
Subject: [PATCH 15/57] Match naming / process to what's on iOS better

---
 .../crypto/onramp/example/OnrampActivity.kt   |  44 ++--
 .../crypto/onramp/example/OnrampViewModel.kt  |  73 +++---
 crypto-onramp/api/crypto-onramp.api           | 210 +++++++++---------
 .../crypto/onramp/OnrampCoordinator.kt        |  24 +-
 .../android/crypto/onramp/OnrampInteractor.kt |  38 ++--
 .../onramp/analytics/OnrampAnalyticsEvent.kt  |  12 +-
 .../crypto/onramp/model/Identifiers.kt        | 210 +++++++++---------
 .../OnrampGetIdentifierRequirementsResult.kt  |  25 ---
 .../OnrampRetrieveMissingIdentifiersResult.kt |  25 +++
 ...lt.kt => OnrampSubmitIdentifiersResult.kt} |  14 +-
 .../repositories/CryptoApiRepository.kt       |  36 +--
 .../crypto/onramp/CryptoApiRepositoryTest.kt  |  92 ++++----
 .../crypto/onramp/OnrampInteractorTest.kt     |  94 ++++----
 13 files changed, 446 insertions(+), 451 deletions(-)
 delete mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{OnrampUpdateKycInfoResult.kt => OnrampSubmitIdentifiersResult.kt} (51%)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
index 3fc5c3d3cf6..92ffca9199c 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampActivity.kt
@@ -506,8 +506,8 @@ internal fun OnrampScreen(
                     onAuthenticate = onAuthenticateUser,
                     onRegisterWalletAddress = onRegisterWalletAddress,
                     onCollectKYC = { kycInfo -> viewModel.collectKycInfo(kycInfo) },
-                    onGetIdentifierRequirements = viewModel::getIdentifierRequirements,
-                    onUpdateKycInfo = viewModel::updateIdentifierInfo,
+                    onRetrieveMissingIdentifiers = viewModel::retrieveMissingIdentifiers,
+                    onSubmitIdentifiers = viewModel::submitIdentifiers,
                     onVerifyKyc = onVerifyKyc,
                     onStartVerification = onStartVerification,
                     onShowCRSCARFDeclaration = onShowCRSCARFDeclaration,
@@ -739,8 +739,8 @@ private fun AuthenticatedOperationsScreen(
     onAuthenticate: (oauthScopes: String) -> Unit,
     onRegisterWalletAddress: (String, CryptoNetwork) -> Unit,
     onCollectKYC: (KycInfo) -> Unit,
-    onGetIdentifierRequirements: () -> Unit,
-    onUpdateKycInfo: () -> Unit,
+    onRetrieveMissingIdentifiers: () -> Unit,
+    onSubmitIdentifiers: () -> Unit,
     onVerifyKyc: () -> Unit,
     onStartVerification: () -> Unit,
     onShowCRSCARFDeclaration: () -> Unit,
@@ -1012,10 +1012,10 @@ private fun AuthenticatedOperationsScreen(
                 onIdentifierTypeChange = onIdentifierTypeChange,
                 onAddIdentifier = onAddIdentifier,
                 onRemoveIdentifier = onRemoveIdentifier,
-                identifierRequirementsSummary = state.identifierRequirementsSummary,
-                updateKycInfoSummary = state.updateKycInfoSummary,
-                onGetIdentifierRequirements = onGetIdentifierRequirements,
-                onUpdateKycInfo = onUpdateKycInfo,
+                missingIdentifiersSummary = state.missingIdentifiersSummary,
+                submitIdentifiersSummary = state.submitIdentifiersSummary,
+                onRetrieveMissingIdentifiers = onRetrieveMissingIdentifiers,
+                onSubmitIdentifiers = onSubmitIdentifiers,
             )
         }
 
@@ -1144,14 +1144,14 @@ private fun IdentifierInfoScreen(
     onIdentifierTypeChange: (Int, String) -> Unit,
     onAddIdentifier: () -> Unit,
     onRemoveIdentifier: (Int) -> Unit,
-    identifierRequirementsSummary: String?,
-    updateKycInfoSummary: String?,
-    onGetIdentifierRequirements: () -> Unit,
-    onUpdateKycInfo: () -> Unit,
+    missingIdentifiersSummary: String?,
+    submitIdentifiersSummary: String?,
+    onRetrieveMissingIdentifiers: () -> Unit,
+    onSubmitIdentifiers: () -> Unit,
 ) {
     Column {
         Text(
-            text = "Identifier Requirements",
+            text = "Missing Identifiers",
             fontWeight = FontWeight.SemiBold,
             modifier = Modifier.padding(bottom = 8.dp)
         )
@@ -1162,23 +1162,23 @@ private fun IdentifierInfoScreen(
         )
 
         Button(
-            onClick = onGetIdentifierRequirements,
+            onClick = onRetrieveMissingIdentifiers,
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(bottom = 12.dp)
         ) {
-            Text("Get Identifier Requirements")
+            Text("Retrieve Missing Identifiers")
         }
 
-        identifierRequirementsSummary?.let { summary ->
+        missingIdentifiersSummary?.let { summary ->
             Text(
-                text = "Latest requirements:\n$summary",
+                text = "Latest response:\n$summary",
                 modifier = Modifier.padding(bottom = 20.dp)
             )
         }
 
         Text(
-            text = "Update Identifier Info",
+            text = "Submit Identifiers",
             fontWeight = FontWeight.SemiBold,
             modifier = Modifier.padding(bottom = 8.dp)
         )
@@ -1222,17 +1222,17 @@ private fun IdentifierInfoScreen(
         }
 
         Button(
-            onClick = onUpdateKycInfo,
+            onClick = onSubmitIdentifiers,
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(bottom = 12.dp)
         ) {
-            Text("Update Identifier Info")
+            Text("Submit Identifiers")
         }
 
-        updateKycInfoSummary?.let { summary ->
+        submitIdentifiersSummary?.let { summary ->
             Text(
-                text = "Latest update result:\n$summary",
+                text = "Latest submission result:\n$summary",
                 modifier = Modifier.padding(bottom = 24.dp)
             )
         }
diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index c06eac1da51..056d0b6a5aa 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -20,12 +20,12 @@ import com.stripe.android.crypto.onramp.OnrampCoordinator
 import com.stripe.android.crypto.onramp.example.network.OnrampSessionResponse
 import com.stripe.android.crypto.onramp.example.network.SettlementSpeed
 import com.stripe.android.crypto.onramp.example.network.TestBackendRepository
-import com.stripe.android.crypto.onramp.model.AlternativeGroup
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierAlternativeGroup
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirement
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirements
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierType
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
-import com.stripe.android.crypto.onramp.model.Identifier
-import com.stripe.android.crypto.onramp.model.IdentifierRequirement
-import com.stripe.android.crypto.onramp.model.IdentifierRequirements
-import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
@@ -36,18 +36,18 @@ import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
 import com.stripe.android.crypto.onramp.model.OnrampCrsCarfDeclarationResult
-import com.stripe.android.crypto.onramp.model.OnrampGetIdentifierRequirementsResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterWalletAddressResult
+import com.stripe.android.crypto.onramp.model.OnrampRetrieveMissingIdentifiersResult
+import com.stripe.android.crypto.onramp.model.OnrampSubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampTokenAuthenticationResult
-import com.stripe.android.crypto.onramp.model.OnrampUpdateKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodDisplayData
-import com.stripe.android.crypto.onramp.model.UpdateKycInfoResult
+import com.stripe.android.crypto.onramp.model.SubmitIdentifiersResult
 import com.stripe.android.googlepaylauncher.GooglePayEnvironment
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
 import com.stripe.android.link.LinkAppearance
@@ -563,30 +563,30 @@ internal class OnrampViewModel(
         }
     }
 
-    fun getIdentifierRequirements() {
+    fun retrieveMissingIdentifiers() {
         _uiState.update {
             it.copy(
                 screen = Screen.Loading,
-                loadingMessage = "Retrieving identifier requirements..."
+                loadingMessage = "Retrieving missing identifiers..."
             )
         }
 
         viewModelScope.launch {
-            val result = onrampCoordinator.getIdentifierRequirements()
+            val result = onrampCoordinator.retrieveMissingIdentifiers()
 
             when (result) {
-                is OnrampGetIdentifierRequirementsResult.Completed -> {
-                    _message.value = "Identifier requirements retrieved"
+                is OnrampRetrieveMissingIdentifiersResult.Completed -> {
+                    _message.value = "Missing identifiers retrieved"
                     _uiState.update {
                         it.copy(
                             screen = Screen.AuthenticatedOperations,
                             loadingMessage = null,
-                            identifierRequirementsSummary = formatIdentifierRequirements(result.requirements)
+                            missingIdentifiersSummary = formatIdentifierRequirements(result.requirements)
                         )
                     }
                 }
-                is OnrampGetIdentifierRequirementsResult.Failed -> handleError(result.error) {
-                    _message.value = "Failed to retrieve identifier requirements: ${result.error.message}"
+                is OnrampRetrieveMissingIdentifiersResult.Failed -> handleError(result.error) {
+                    _message.value = "Failed to retrieve missing identifiers: ${result.error.message}"
                     _uiState.update {
                         it.copy(
                             screen = Screen.AuthenticatedOperations,
@@ -598,32 +598,32 @@ internal class OnrampViewModel(
         }
     }
 
-    fun updateIdentifierInfo() {
+    fun submitIdentifiers() {
         val identifiers = buildIdentifiersRequest(_uiState.value) ?: return
 
         _uiState.update {
             it.copy(
                 screen = Screen.Loading,
-                loadingMessage = "Updating identifier information..."
+                loadingMessage = "Submitting identifiers..."
             )
         }
 
         viewModelScope.launch {
-            val result = onrampCoordinator.updateKycInfo(identifiers)
+            val result = onrampCoordinator.submitIdentifiers(identifiers)
 
             when (result) {
-                is OnrampUpdateKycInfoResult.Completed -> {
-                    _message.value = "Identifier update completed"
+                is OnrampSubmitIdentifiersResult.Completed -> {
+                    _message.value = "Identifiers submitted"
                     _uiState.update {
                         it.copy(
                             screen = Screen.AuthenticatedOperations,
                             loadingMessage = null,
-                            updateKycInfoSummary = formatUpdateKycInfoResult(result.result)
+                            submitIdentifiersSummary = formatSubmitIdentifiersResult(result.result)
                         )
                     }
                 }
-                is OnrampUpdateKycInfoResult.Failed -> handleError(result.error) {
-                    _message.value = "Identifier update failed: ${result.error.message}"
+                is OnrampSubmitIdentifiersResult.Failed -> handleError(result.error) {
+                    _message.value = "Submit identifiers failed: ${result.error.message}"
                     _uiState.update {
                         it.copy(
                             screen = Screen.AuthenticatedOperations,
@@ -936,8 +936,8 @@ internal class OnrampViewModel(
         getPrefs().edit { remove(userDataKey) }
     }
 
-    private fun buildIdentifiersRequest(state: OnrampUiState): List<Identifier>? {
-        val identifiers = mutableListOf<Identifier>()
+    private fun buildIdentifiersRequest(state: OnrampUiState): List<ComplianceIdentifier>? {
+        val identifiers = mutableListOf<ComplianceIdentifier>()
 
         state.identifierInputs.forEachIndexed { index, entry ->
             val (identifier, error) = buildIdentifier(
@@ -964,7 +964,7 @@ internal class OnrampViewModel(
         label: String,
         value: String,
         type: String
-    ): Pair<Identifier?, String?> {
+    ): Pair<ComplianceIdentifier?, String?> {
         val trimmedValue = value.trim()
         val trimmedType = type.trim()
 
@@ -976,17 +976,16 @@ internal class OnrampViewModel(
             return null to "$label requires both type and value"
         }
 
-        val identifierType = IdentifierType.fromValue(trimmedType)
-            ?: return null to "$label type must be a supported identifier type like fr_spi"
+        val identifierType = ComplianceIdentifierType.fromValue(trimmedType)
 
-        val identifier = Identifier()
+        val identifier = ComplianceIdentifier()
             .type(identifierType)
             .value(trimmedValue)
 
         return identifier to null
     }
 
-    private fun formatIdentifierRequirements(requirements: IdentifierRequirements): String {
+    private fun formatIdentifierRequirements(requirements: ComplianceIdentifierRequirements): String {
         return buildString {
             append("Identifiers: ")
             append(formatIdentifierRequirements(requirements.identifiers))
@@ -995,7 +994,7 @@ internal class OnrampViewModel(
         }
     }
 
-    private fun formatUpdateKycInfoResult(result: UpdateKycInfoResult): String {
+    private fun formatSubmitIdentifiersResult(result: SubmitIdentifiersResult): String {
         return buildString {
             append("Valid: ${result.valid}")
             append("\nIdentifiers: ")
@@ -1007,7 +1006,7 @@ internal class OnrampViewModel(
         }
     }
 
-    private fun formatIdentifierRequirements(identifierRequirements: List<IdentifierRequirement>): String {
+    private fun formatIdentifierRequirements(identifierRequirements: List<ComplianceIdentifierRequirement>): String {
         return identifierRequirements
             .takeIf { it.isNotEmpty() }
             ?.joinToString(separator = "\n") { identifierRequirement ->
@@ -1016,7 +1015,7 @@ internal class OnrampViewModel(
             ?: "None"
     }
 
-    private fun formatAlternativeGroups(alternativeGroups: List<AlternativeGroup>): String {
+    private fun formatAlternativeGroups(alternativeGroups: List<ComplianceIdentifierAlternativeGroup>): String {
         return alternativeGroups
             .takeIf { it.isNotEmpty() }
             ?.joinToString(separator = "\n") { alternativeGroup ->
@@ -1066,8 +1065,8 @@ data class OnrampUiState(
     val kycNationalities: String = "",
     val kycAddress: PaymentSheet.Address = PaymentSheet.Address(),
     val identifierInputs: List<IdentifierInputEntry> = listOf(IdentifierInputEntry()),
-    val identifierRequirementsSummary: String? = null,
-    val updateKycInfoSummary: String? = null,
+    val missingIdentifiersSummary: String? = null,
+    val submitIdentifiersSummary: String? = null,
 ) : Parcelable
 
 @Parcelize
@@ -1117,7 +1116,7 @@ private fun List<String>.joinToStringOrNone(): String {
     return takeIf { it.isNotEmpty() }?.joinToString(", ") ?: "None"
 }
 
-private fun List<IdentifierType>.joinToValueString(): String {
+private fun List<ComplianceIdentifierType>.joinToValueString(): String {
     return map { it.value }.joinToStringOrNone()
 }
 
diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index c60f8dbb95e..3ba31eef714 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -8,12 +8,12 @@ public final class com/stripe/android/crypto/onramp/OnrampCoordinator {
 	public final fun configure (Lcom/stripe/android/crypto/onramp/model/OnrampConfiguration;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun createCryptoPaymentToken (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun createPresenter (Landroidx/activity/ComponentActivity;)Lcom/stripe/android/crypto/onramp/OnrampCoordinator$Presenter;
-	public final fun getIdentifierRequirements (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun hasLinkAccount (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun logOut (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun registerLinkUser (Lcom/stripe/android/crypto/onramp/model/LinkUserInfo;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun registerWalletAddress (Ljava/lang/String;Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
-	public final fun updateKycInfo (Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun retrieveMissingIdentifiers (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun submitIdentifiers (Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun updatePhoneNumber (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
@@ -55,7 +55,14 @@ public final class com/stripe/android/crypto/onramp/exception/PaymentFailedExcep
 	public static final field $stable I
 }
 
-public final class com/stripe/android/crypto/onramp/model/AlternativeGroup {
+public final class com/stripe/android/crypto/onramp/model/ComplianceIdentifier {
+	public static final field $stable I
+	public fun <init> ()V
+	public final fun type (Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;)Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifier;
+	public final fun value (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifier;
+}
+
+public final class com/stripe/android/crypto/onramp/model/ComplianceIdentifierAlternativeGroup {
 	public static final field $stable I
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAlternativeMissingIdentifiers ()Ljava/util/List;
@@ -64,6 +71,81 @@ public final class com/stripe/android/crypto/onramp/model/AlternativeGroup {
 	public fun toString ()Ljava/lang/String;
 }
 
+public final class com/stripe/android/crypto/onramp/model/ComplianceIdentifierRequirement {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getRegulation ()Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation;
+	public final fun getType ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/ComplianceIdentifierRequirements {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAlternatives ()Ljava/util/List;
+	public final fun getIdentifiers ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/ComplianceIdentifierType {
+	public static final field $stable I
+	public static final field Companion Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType$Companion;
+	public fun <init> (Ljava/lang/String;)V
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getValue ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/ComplianceIdentifierType$Companion {
+	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getAT_STN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getBE_NRN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getBG_UCN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getCY_TIC ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getCZ_RC ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getDE_STN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getDK_CPR ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getEE_IK ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getFI_HETU ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getFR_SPI ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getGR_AFM ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getHR_OIB ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getHU_AD ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getIE_PPSN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getIS_KT ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getIT_CF ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getLT_AK ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getLU_NIF ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getLV_PK ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getMT_NIC ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getMT_PP ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getNL_BSN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getPL_NIP ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getPL_PESEL ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getPT_NIF ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getRO_CNP ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getSE_PIN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getSI_PIN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+	public final fun getSK_RC ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
+}
+
+public final class com/stripe/android/crypto/onramp/model/ComplianceRegulation : java/lang/Enum {
+	public static final field Companion Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation$Companion;
+	public static final field EuCarf Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation;
+	public static final field EuMica Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public final fun getValue ()Ljava/lang/String;
+	public static fun valueOf (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation;
+	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation;
+}
+
+public final class com/stripe/android/crypto/onramp/model/ComplianceRegulation$Companion {
+	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation;
+}
+
 public final class com/stripe/android/crypto/onramp/model/CryptoNetwork : java/lang/Enum {
 	public static final field Aptos Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;
 	public static final field Avalanche Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;
@@ -88,72 +170,6 @@ public final class com/stripe/android/crypto/onramp/model/CryptoNetwork$Companio
 	public final fun serializer ()Lkotlinx/serialization/KSerializer;
 }
 
-public final class com/stripe/android/crypto/onramp/model/Identifier {
-	public static final field $stable I
-	public fun <init> ()V
-	public final fun type (Lcom/stripe/android/crypto/onramp/model/IdentifierType;)Lcom/stripe/android/crypto/onramp/model/Identifier;
-	public final fun value (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Identifier;
-}
-
-public final class com/stripe/android/crypto/onramp/model/IdentifierRequirement {
-	public static final field $stable I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getRegulation ()Lcom/stripe/android/crypto/onramp/model/RegulationType;
-	public final fun getType ()Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/stripe/android/crypto/onramp/model/IdentifierRequirements {
-	public static final field $stable I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAlternatives ()Ljava/util/List;
-	public final fun getIdentifiers ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/stripe/android/crypto/onramp/model/IdentifierType : java/lang/Enum {
-	public static final field AT_STN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field BE_NRN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field BG_UCN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field CY_TIC Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field CZ_RC Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field Companion Lcom/stripe/android/crypto/onramp/model/IdentifierType$Companion;
-	public static final field DE_STN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field DK_CPR Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field EE_IK Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field FI_HETU Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field FR_SPI Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field GR_AFM Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field HR_OIB Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field HU_AD Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field IE_PPSN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field IS_KT Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field IT_CF Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field LT_AK Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field LU_NIF Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field LV_PK Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field MT_NIC Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field MT_PP Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field NL_BSN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field PL_NIP Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field PL_PESEL Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field PT_NIF Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field RO_CNP Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field SE_PIN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field SI_PIN Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static final field SK_RC Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public final fun getValue ()Ljava/lang/String;
-	public static fun valueOf (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-}
-
-public final class com/stripe/android/crypto/onramp/model/IdentifierType$Companion {
-	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/IdentifierType;
-}
-
 public final class com/stripe/android/crypto/onramp/model/KycInfo {
 	public static final field $stable I
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;)V
@@ -336,19 +352,6 @@ public final class com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarati
 	public final fun getError ()Ljava/lang/Throwable;
 }
 
-public abstract interface class com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult {
-}
-
-public final class com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult$Completed : com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult {
-	public static final field $stable I
-	public final fun getRequirements ()Lcom/stripe/android/crypto/onramp/model/IdentifierRequirements;
-}
-
-public final class com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult$Failed : com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult {
-	public static final field $stable I
-	public final fun getError ()Ljava/lang/Throwable;
-}
-
 public abstract interface class com/stripe/android/crypto/onramp/model/OnrampHasLinkAccountResult {
 }
 
@@ -399,27 +402,40 @@ public final class com/stripe/android/crypto/onramp/model/OnrampRegisterWalletAd
 	public final fun getError ()Ljava/lang/Throwable;
 }
 
-public abstract interface class com/stripe/android/crypto/onramp/model/OnrampTokenAuthenticationResult {
+public abstract interface class com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult {
 }
 
-public final class com/stripe/android/crypto/onramp/model/OnrampTokenAuthenticationResult$Completed : com/stripe/android/crypto/onramp/model/OnrampTokenAuthenticationResult {
+public final class com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult$Completed : com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult {
 	public static final field $stable I
+	public final fun getRequirements ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierRequirements;
 }
 
-public final class com/stripe/android/crypto/onramp/model/OnrampTokenAuthenticationResult$Failed : com/stripe/android/crypto/onramp/model/OnrampTokenAuthenticationResult {
+public final class com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult$Failed : com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult {
 	public static final field $stable I
 	public final fun getError ()Ljava/lang/Throwable;
 }
 
-public abstract interface class com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult {
+public abstract interface class com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult {
 }
 
-public final class com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult$Completed : com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult {
+public final class com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult$Completed : com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult {
 	public static final field $stable I
-	public final fun getResult ()Lcom/stripe/android/crypto/onramp/model/UpdateKycInfoResult;
+	public final fun getResult ()Lcom/stripe/android/crypto/onramp/model/SubmitIdentifiersResult;
 }
 
-public final class com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult$Failed : com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult {
+public final class com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult$Failed : com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult {
+	public static final field $stable I
+	public final fun getError ()Ljava/lang/Throwable;
+}
+
+public abstract interface class com/stripe/android/crypto/onramp/model/OnrampTokenAuthenticationResult {
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampTokenAuthenticationResult$Completed : com/stripe/android/crypto/onramp/model/OnrampTokenAuthenticationResult {
+	public static final field $stable I
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampTokenAuthenticationResult$Failed : com/stripe/android/crypto/onramp/model/OnrampTokenAuthenticationResult {
 	public static final field $stable I
 	public final fun getError ()Ljava/lang/Throwable;
 }
@@ -542,21 +558,7 @@ public final class com/stripe/android/crypto/onramp/model/PaymentMethodType : ja
 	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/PaymentMethodType;
 }
 
-public final class com/stripe/android/crypto/onramp/model/RegulationType : java/lang/Enum {
-	public static final field Companion Lcom/stripe/android/crypto/onramp/model/RegulationType$Companion;
-	public static final field EuCarf Lcom/stripe/android/crypto/onramp/model/RegulationType;
-	public static final field EuMica Lcom/stripe/android/crypto/onramp/model/RegulationType;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public final fun getValue ()Ljava/lang/String;
-	public static fun valueOf (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/RegulationType;
-	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/RegulationType;
-}
-
-public final class com/stripe/android/crypto/onramp/model/RegulationType$Companion {
-	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/RegulationType;
-}
-
-public final class com/stripe/android/crypto/onramp/model/UpdateKycInfoResult {
+public final class com/stripe/android/crypto/onramp/model/SubmitIdentifiersResult {
 	public static final field $stable I
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAlternatives ()Ljava/util/List;
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
index 2dbe56f3ec0..54921b01623 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
@@ -5,8 +5,8 @@ import androidx.activity.ComponentActivity
 import androidx.lifecycle.SavedStateHandle
 import com.stripe.android.crypto.onramp.di.OnrampComponentHolder
 import com.stripe.android.crypto.onramp.di.OnrampPresenterComponent
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifier
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
-import com.stripe.android.crypto.onramp.model.Identifier
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
 import com.stripe.android.crypto.onramp.model.OnrampAttachKycInfoResult
@@ -14,13 +14,13 @@ import com.stripe.android.crypto.onramp.model.OnrampCallbacks
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
-import com.stripe.android.crypto.onramp.model.OnrampGetIdentifierRequirementsResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterWalletAddressResult
+import com.stripe.android.crypto.onramp.model.OnrampRetrieveMissingIdentifiersResult
+import com.stripe.android.crypto.onramp.model.OnrampSubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampTokenAuthenticationResult
-import com.stripe.android.crypto.onramp.model.OnrampUpdateKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodSelection
 import com.stripe.android.paymentsheet.PaymentSheet
@@ -116,23 +116,23 @@ class OnrampCoordinator @Inject internal constructor(
     }
 
     /**
-     * Retrieves identifier requirements for the current Link user.
+     * Retrieves compliance identifiers still required for MiCA and CRS/CARF compliance.
      * Requires an authenticated Link user.
      */
-    suspend fun getIdentifierRequirements(): OnrampGetIdentifierRequirementsResult {
-        return interactor.getIdentifierRequirements()
+    suspend fun retrieveMissingIdentifiers(): OnrampRetrieveMissingIdentifiersResult {
+        return interactor.retrieveMissingIdentifiers()
     }
 
     /**
-     * Updates KYC info for the current Link user.
+     * Submits compliance identifiers for MiCA and CRS/CARF compliance.
      * Requires an authenticated Link user.
      *
-     * @param identifiers The identifiers to submit.
+     * @param identifiers The compliance identifiers to submit.
      */
-    suspend fun updateKycInfo(
-        identifiers: List<Identifier>
-    ): OnrampUpdateKycInfoResult {
-        return interactor.updateKycInfo(identifiers)
+    suspend fun submitIdentifiers(
+        identifiers: List<ComplianceIdentifier>
+    ): OnrampSubmitIdentifiersResult {
+        return interactor.submitIdentifiers(identifiers)
     }
 
     /**
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
index ab561448a38..c8c7c1a6720 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
@@ -14,9 +14,9 @@ import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.exception.MissingPaymentMethodException
 import com.stripe.android.crypto.onramp.exception.PaymentFailedException
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifier
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
-import com.stripe.android.crypto.onramp.model.Identifier
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
@@ -28,15 +28,15 @@ import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
 import com.stripe.android.crypto.onramp.model.OnrampCrsCarfDeclarationResult
-import com.stripe.android.crypto.onramp.model.OnrampGetIdentifierRequirementsResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterWalletAddressResult
+import com.stripe.android.crypto.onramp.model.OnrampRetrieveMissingIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampSessionClientSecretProvider
 import com.stripe.android.crypto.onramp.model.OnrampStartVerificationResult
+import com.stripe.android.crypto.onramp.model.OnrampSubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampTokenAuthenticationResult
-import com.stripe.android.crypto.onramp.model.OnrampUpdateKycInfoResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
@@ -336,64 +336,64 @@ internal class OnrampInteractor @Inject constructor(
             )
     }
 
-    suspend fun getIdentifierRequirements(): OnrampGetIdentifierRequirementsResult {
+    suspend fun retrieveMissingIdentifiers(): OnrampRetrieveMissingIdentifiersResult {
         val secret = consumerSessionClientSecret()
         if (secret == null) {
             val error = MissingConsumerSecretException()
             analyticsService?.track(
                 OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.GetIdentifierRequirements,
+                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.RetrieveMissingIdentifiers,
                     error = error,
                 )
             )
-            return OnrampGetIdentifierRequirementsResult.Failed(error)
+            return OnrampRetrieveMissingIdentifiersResult.Failed(error)
         }
 
-        return cryptoApiRepository.getIdentifierRequirements(secret)
+        return cryptoApiRepository.retrieveMissingIdentifiers(secret)
             .fold(
                 onSuccess = { requirements ->
-                    analyticsService?.track(OnrampAnalyticsEvent.IdentifierRequirementsRetrieved)
-                    OnrampGetIdentifierRequirementsResult.Completed(requirements)
+                    analyticsService?.track(OnrampAnalyticsEvent.MissingIdentifiersRetrieved)
+                    OnrampRetrieveMissingIdentifiersResult.Completed(requirements)
                 },
                 onFailure = { error ->
                     analyticsService?.track(
                         OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.GetIdentifierRequirements,
+                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.RetrieveMissingIdentifiers,
                             error = error,
                         )
                     )
-                    OnrampGetIdentifierRequirementsResult.Failed(error)
+                    OnrampRetrieveMissingIdentifiersResult.Failed(error)
                 }
             )
     }
 
-    suspend fun updateKycInfo(identifiers: List<Identifier>): OnrampUpdateKycInfoResult {
+    suspend fun submitIdentifiers(identifiers: List<ComplianceIdentifier>): OnrampSubmitIdentifiersResult {
         val secret = consumerSessionClientSecret()
         if (secret == null) {
             val error = MissingConsumerSecretException()
             analyticsService?.track(
                 OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.CollectEuIdentifiers,
+                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.SubmitIdentifiers,
                     error = error,
                 )
             )
-            return OnrampUpdateKycInfoResult.Failed(error)
+            return OnrampSubmitIdentifiersResult.Failed(error)
         }
 
-        return cryptoApiRepository.updateKycInfo(identifiers, secret)
+        return cryptoApiRepository.submitIdentifiers(identifiers, secret)
             .fold(
                 onSuccess = { result ->
-                    analyticsService?.track(OnrampAnalyticsEvent.EuIdentifiersSubmitted)
-                    OnrampUpdateKycInfoResult.Completed(result)
+                    analyticsService?.track(OnrampAnalyticsEvent.IdentifiersSubmitted)
+                    OnrampSubmitIdentifiersResult.Completed(result)
                 },
                 onFailure = { error ->
                     analyticsService?.track(
                         OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.CollectEuIdentifiers,
+                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.SubmitIdentifiers,
                             error = error,
                         )
                     )
-                    OnrampUpdateKycInfoResult.Failed(error)
+                    OnrampSubmitIdentifiersResult.Failed(error)
                 }
             )
     }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
index 2c18913a037..6afc20e1751 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
@@ -73,12 +73,12 @@ internal sealed class OnrampAnalyticsEvent(
         name = "kyc_info_verification_completed"
     )
 
-    data object IdentifierRequirementsRetrieved : OnrampAnalyticsEvent(
-        name = "identifier_requirements_retrieved"
+    data object MissingIdentifiersRetrieved : OnrampAnalyticsEvent(
+        name = "missing_identifiers_retrieved"
     )
 
-    data object EuIdentifiersSubmitted : OnrampAnalyticsEvent(
-        name = "eu_identifiers_submitted"
+    data object IdentifiersSubmitted : OnrampAnalyticsEvent(
+        name = "identifiers_submitted"
     )
 
     data object CrsCarfDeclarationStarted : OnrampAnalyticsEvent(
@@ -178,8 +178,8 @@ internal sealed class OnrampAnalyticsEvent(
             PerformCheckout("perform_checkout"),
             LogOut("log_out"),
             VerifyKyc("verify_kyc_info"),
-            GetIdentifierRequirements("identifier_requirements"),
-            CollectEuIdentifiers("collect_eu_identifiers"),
+            RetrieveMissingIdentifiers("retrieve_missing_identifiers"),
+            SubmitIdentifiers("submit_identifiers"),
             ConfirmCrsCarfDeclaration("confirm_crs_carf_declaration")
         }
     }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
index a9d465afb55..8972a31da0d 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
@@ -6,20 +6,20 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 /**
- * A typed identifier entry.
+ * A compliance identifier collected for MiCA or CRS/CARF compliance.
  *
- * @property type The reviewed identifier type.
+ * @property type The type of identifier provided.
  * @property value The identifier value.
  */
 @ExperimentalCryptoOnramp
-class Identifier {
-    private var type: IdentifierType? = null
+class ComplianceIdentifier {
+    private var type: ComplianceIdentifierType? = null
     private var value: String? = null
 
     /**
      * Sets the identifier type.
      */
-    fun type(type: IdentifierType) = apply {
+    fun type(type: ComplianceIdentifierType) = apply {
         this.type = type
     }
 
@@ -31,7 +31,7 @@ class Identifier {
     }
 
     internal class State(
-        val type: IdentifierType,
+        val type: ComplianceIdentifierType,
         val value: String
     )
 
@@ -48,203 +48,197 @@ class Identifier {
 }
 
 /**
- * Supported identifier types for EU onramp compliance.
+ * The type of compliance identifier required or submitted for regulatory compliance.
  */
 @ExperimentalCryptoOnramp
-enum class IdentifierType(
+@Poko
+class ComplianceIdentifierType(
     val value: String
 ) {
-    AT_STN("at_stn"),
-    BE_NRN("be_nrn"),
-    BG_UCN("bg_ucn"),
-    HR_OIB("hr_oib"),
-    CY_TIC("cy_tic"),
-    CZ_RC("cz_rc"),
-    DK_CPR("dk_cpr"),
-    EE_IK("ee_ik"),
-    FI_HETU("fi_hetu"),
-    FR_SPI("fr_spi"),
-    DE_STN("de_stn"),
-    GR_AFM("gr_afm"),
-    HU_AD("hu_ad"),
-    IS_KT("is_kt"),
-    IE_PPSN("ie_ppsn"),
-    IT_CF("it_cf"),
-    LV_PK("lv_pk"),
-    LT_AK("lt_ak"),
-    LU_NIF("lu_nif"),
-    MT_NIC("mt_nic"),
-    MT_PP("mt_pp"),
-    NL_BSN("nl_bsn"),
-    PL_PESEL("pl_pesel"),
-    PL_NIP("pl_nip"),
-    PT_NIF("pt_nif"),
-    RO_CNP("ro_cnp"),
-    SK_RC("sk_rc"),
-    SI_PIN("si_pin"),
-    SE_PIN("se_pin");
+    init {
+        require(value.isNotBlank()) {
+            "value must not be blank"
+        }
+    }
 
     companion object {
-        fun fromValue(value: String): IdentifierType? {
-            return entries.firstOrNull { it.value == value.lowercase() }
+        val AT_STN = ComplianceIdentifierType("at_stn")
+        val BE_NRN = ComplianceIdentifierType("be_nrn")
+        val BG_UCN = ComplianceIdentifierType("bg_ucn")
+        val HR_OIB = ComplianceIdentifierType("hr_oib")
+        val CY_TIC = ComplianceIdentifierType("cy_tic")
+        val CZ_RC = ComplianceIdentifierType("cz_rc")
+        val DK_CPR = ComplianceIdentifierType("dk_cpr")
+        val EE_IK = ComplianceIdentifierType("ee_ik")
+        val FI_HETU = ComplianceIdentifierType("fi_hetu")
+        val FR_SPI = ComplianceIdentifierType("fr_spi")
+        val DE_STN = ComplianceIdentifierType("de_stn")
+        val GR_AFM = ComplianceIdentifierType("gr_afm")
+        val HU_AD = ComplianceIdentifierType("hu_ad")
+        val IS_KT = ComplianceIdentifierType("is_kt")
+        val IE_PPSN = ComplianceIdentifierType("ie_ppsn")
+        val IT_CF = ComplianceIdentifierType("it_cf")
+        val LV_PK = ComplianceIdentifierType("lv_pk")
+        val LT_AK = ComplianceIdentifierType("lt_ak")
+        val LU_NIF = ComplianceIdentifierType("lu_nif")
+        val MT_NIC = ComplianceIdentifierType("mt_nic")
+        val MT_PP = ComplianceIdentifierType("mt_pp")
+        val NL_BSN = ComplianceIdentifierType("nl_bsn")
+        val PL_PESEL = ComplianceIdentifierType("pl_pesel")
+        val PL_NIP = ComplianceIdentifierType("pl_nip")
+        val PT_NIF = ComplianceIdentifierType("pt_nif")
+        val RO_CNP = ComplianceIdentifierType("ro_cnp")
+        val SK_RC = ComplianceIdentifierType("sk_rc")
+        val SI_PIN = ComplianceIdentifierType("si_pin")
+        val SE_PIN = ComplianceIdentifierType("se_pin")
+
+        fun fromValue(value: String): ComplianceIdentifierType {
+            return ComplianceIdentifierType(value)
         }
     }
 }
 
 /**
- * Regulations that can require identifier collection.
+ * The regulation requiring a compliance identifier.
  */
 @ExperimentalCryptoOnramp
-enum class RegulationType(val value: String) {
+enum class ComplianceRegulation(val value: String) {
     EuCarf("eu_carf"),
     EuMica("eu_mica");
 
     companion object {
-        fun fromValue(value: String): RegulationType? {
-            return entries.firstOrNull { it.value == value.lowercase() }
+        fun fromValue(value: String): ComplianceRegulation? {
+            return entries.firstOrNull { it.value == value }
         }
     }
 }
 
 /**
- * An identifier requirement returned by the Crypto Onramp API.
+ * A compliance identifier the customer still needs to provide.
  */
 @ExperimentalCryptoOnramp
 @Poko
-class IdentifierRequirement internal constructor(
-    val type: IdentifierType,
-    val regulation: RegulationType
+class ComplianceIdentifierRequirement internal constructor(
+    val type: ComplianceIdentifierType,
+    val regulation: ComplianceRegulation
 )
 
 /**
- * A set of alternative identifiers that can satisfy a missing requirement.
+ * A group describing alternative identifier types that may satisfy a requirement.
  */
 @ExperimentalCryptoOnramp
 @Poko
-class AlternativeGroup internal constructor(
-    val originalMissingIdentifiers: List<IdentifierType>,
-    val alternativeMissingIdentifiers: List<IdentifierType>
+class ComplianceIdentifierAlternativeGroup internal constructor(
+    val originalMissingIdentifiers: List<ComplianceIdentifierType>,
+    val alternativeMissingIdentifiers: List<ComplianceIdentifierType>
 )
 
 /**
- * Identifier requirements returned by the Crypto Onramp API.
+ * The compliance identifiers a customer still needs to provide.
  */
 @ExperimentalCryptoOnramp
 @Poko
-class IdentifierRequirements internal constructor(
-    val identifiers: List<IdentifierRequirement>,
-    val alternatives: List<AlternativeGroup>
+class ComplianceIdentifierRequirements internal constructor(
+    val identifiers: List<ComplianceIdentifierRequirement>,
+    val alternatives: List<ComplianceIdentifierAlternativeGroup>
 )
 
 /**
- * Validation result returned after updating KYC info.
+ * The result of submitting compliance identifiers for MiCA and CRS/CARF compliance.
  */
 @ExperimentalCryptoOnramp
 @Poko
-class UpdateKycInfoResult internal constructor(
+class SubmitIdentifiersResult internal constructor(
     val valid: Boolean,
-    val identifiers: List<IdentifierRequirement>,
-    val alternatives: List<AlternativeGroup>,
-    val invalidIdentifiers: List<IdentifierType>
+    val identifiers: List<ComplianceIdentifierRequirement>,
+    val alternatives: List<ComplianceIdentifierAlternativeGroup>,
+    val invalidIdentifiers: List<ComplianceIdentifierType>
 )
 
 @Serializable
-internal data class UpdateKycInfoRequest(
+internal data class SubmitIdentifiersRequest(
     val credentials: CryptoCustomerRequestParams.Credentials,
-    val identifiers: List<IdentifierRequest>
+    val identifiers: List<ComplianceIdentifierRequest>
 )
 
 @Serializable
-internal data class IdentifierRequest(
+internal data class ComplianceIdentifierRequest(
     val type: String,
     val value: String
 )
 
 @Serializable
-internal data class IdentifierRequirementsResponse(
-    val identifiers: List<IdentifierRequirementResponse> = emptyList(),
-    val alternatives: List<AlternativeGroupResponse> = emptyList(),
+internal data class ComplianceIdentifierRequirementsResponse(
+    val identifiers: List<ComplianceIdentifierRequirementResponse> = emptyList(),
+    val alternatives: List<ComplianceIdentifierAlternativeGroupResponse> = emptyList(),
 ) {
-    fun toIdentifierRequirements(): IdentifierRequirements {
-        return IdentifierRequirements(
-            identifiers = identifiers.map { it.toIdentifierRequirement() },
-            alternatives = alternatives.map { it.toAlternativeGroup() }
+    fun toComplianceIdentifierRequirements(): ComplianceIdentifierRequirements {
+        return ComplianceIdentifierRequirements(
+            identifiers = identifiers.map { it.toComplianceIdentifierRequirement() },
+            alternatives = alternatives.map { it.toComplianceIdentifierAlternativeGroup() }
         )
     }
 }
 
 @Serializable
-internal data class UpdateKycInfoResponse(
+internal data class SubmitIdentifiersResponse(
     val valid: Boolean = true,
-    val identifiers: List<IdentifierRequirementResponse> = emptyList(),
-    val alternatives: List<AlternativeGroupResponse> = emptyList(),
+    val identifiers: List<ComplianceIdentifierRequirementResponse> = emptyList(),
+    val alternatives: List<ComplianceIdentifierAlternativeGroupResponse> = emptyList(),
+    @SerialName("invalid_identifiers")
     val invalidIdentifiers: List<String> = emptyList(),
 ) {
-    fun toUpdateKycInfoResult(): UpdateKycInfoResult {
-        return UpdateKycInfoResult(
+    fun toSubmitIdentifiersResult(): SubmitIdentifiersResult {
+        return SubmitIdentifiersResult(
             valid = valid,
-            identifiers = identifiers.map { it.toIdentifierRequirement() },
-            alternatives = alternatives.map { it.toAlternativeGroup() },
-            invalidIdentifiers = invalidIdentifiers.map { identifierType ->
-                requireNotNull(IdentifierType.fromValue(identifierType)) {
-                    "Unrecognized identifier type: $identifierType"
-                }
-            }
+            identifiers = identifiers.map { it.toComplianceIdentifierRequirement() },
+            alternatives = alternatives.map { it.toComplianceIdentifierAlternativeGroup() },
+            invalidIdentifiers = invalidIdentifiers.map(ComplianceIdentifierType::fromValue)
         )
     }
 }
 
 @Serializable
-internal data class IdentifierRequirementResponse(
+internal data class ComplianceIdentifierRequirementResponse(
     val type: String,
     val regulation: String
 ) {
-    fun toIdentifierRequirement(): IdentifierRequirement {
-        return IdentifierRequirement(
-            type = requireNotNull(IdentifierType.fromValue(type)) {
-                "Unrecognized identifier type: $type"
-            },
-            regulation = requireNotNull(RegulationType.fromValue(regulation)) {
-                "Unrecognized regulation type: $regulation"
+    fun toComplianceIdentifierRequirement(): ComplianceIdentifierRequirement {
+        return ComplianceIdentifierRequirement(
+            type = ComplianceIdentifierType.fromValue(type),
+            regulation = requireNotNull(ComplianceRegulation.fromValue(regulation)) {
+                "Unrecognized compliance regulation: $regulation"
             }
         )
     }
 }
 
 @Serializable
-internal data class AlternativeGroupResponse(
+internal data class ComplianceIdentifierAlternativeGroupResponse(
     @SerialName("original_missing_identifiers")
     val originalMissingIdentifiers: List<String>,
     @SerialName("alternative_missing_identifiers")
     val alternativeMissingIdentifiers: List<String>
 ) {
-    fun toAlternativeGroup(): AlternativeGroup {
-        return AlternativeGroup(
-            originalMissingIdentifiers = originalMissingIdentifiers.map { identifierType ->
-                requireNotNull(IdentifierType.fromValue(identifierType)) {
-                    "Unrecognized identifier type: $identifierType"
-                }
-            },
-            alternativeMissingIdentifiers = alternativeMissingIdentifiers.map { identifierType ->
-                requireNotNull(IdentifierType.fromValue(identifierType)) {
-                    "Unrecognized identifier type: $identifierType"
-                }
-            }
+    fun toComplianceIdentifierAlternativeGroup(): ComplianceIdentifierAlternativeGroup {
+        return ComplianceIdentifierAlternativeGroup(
+            originalMissingIdentifiers = originalMissingIdentifiers.map(ComplianceIdentifierType::fromValue),
+            alternativeMissingIdentifiers = alternativeMissingIdentifiers.map(ComplianceIdentifierType::fromValue)
         )
     }
 }
 
-internal fun List<Identifier>.toRequest(
+internal fun List<ComplianceIdentifier>.toRequest(
     credentials: CryptoCustomerRequestParams.Credentials
-): UpdateKycInfoRequest {
-    return UpdateKycInfoRequest(
+): SubmitIdentifiersRequest {
+    return SubmitIdentifiersRequest(
         credentials = credentials,
         identifiers = map { it.build().toRequest() }
     )
 }
 
-private fun Identifier.State.toRequest(): IdentifierRequest {
-    return IdentifierRequest(
+private fun ComplianceIdentifier.State.toRequest(): ComplianceIdentifierRequest {
+    return ComplianceIdentifierRequest(
         type = type.value,
         value = value
     )
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult.kt
deleted file mode 100644
index 482ee560972..00000000000
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampGetIdentifierRequirementsResult.kt
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.stripe.android.crypto.onramp.model
-
-import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
-
-/**
- * Result of retrieving identifier requirements.
- */
-@ExperimentalCryptoOnramp
-sealed interface OnrampGetIdentifierRequirementsResult {
-    /**
-     * Identifier requirements were retrieved.
-     */
-    @ExperimentalCryptoOnramp
-    class Completed internal constructor(
-        val requirements: IdentifierRequirements
-    ) : OnrampGetIdentifierRequirementsResult
-
-    /**
-     * Identifier requirement retrieval failed.
-     */
-    @ExperimentalCryptoOnramp
-    class Failed internal constructor(
-        val error: Throwable
-    ) : OnrampGetIdentifierRequirementsResult
-}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt
new file mode 100644
index 00000000000..8dbd896e09b
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt
@@ -0,0 +1,25 @@
+package com.stripe.android.crypto.onramp.model
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * Result of retrieving missing compliance identifiers.
+ */
+@ExperimentalCryptoOnramp
+sealed interface OnrampRetrieveMissingIdentifiersResult {
+    /**
+     * Missing compliance identifiers were retrieved.
+     */
+    @ExperimentalCryptoOnramp
+    class Completed internal constructor(
+        val requirements: ComplianceIdentifierRequirements
+    ) : OnrampRetrieveMissingIdentifiersResult
+
+    /**
+     * Missing compliance identifier retrieval failed.
+     */
+    @ExperimentalCryptoOnramp
+    class Failed internal constructor(
+        val error: Throwable
+    ) : OnrampRetrieveMissingIdentifiersResult
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt
similarity index 51%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt
index 3232beaba34..a0ece1ce739 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampUpdateKycInfoResult.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt
@@ -3,23 +3,23 @@ package com.stripe.android.crypto.onramp.model
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 
 /**
- * Result of updating KYC info.
+ * Result of submitting compliance identifiers.
  */
 @ExperimentalCryptoOnramp
-sealed interface OnrampUpdateKycInfoResult {
+sealed interface OnrampSubmitIdentifiersResult {
     /**
-     * KYC info update completed and returned a validation result.
+     * Identifier submission completed and returned a validation result.
      */
     @ExperimentalCryptoOnramp
     class Completed internal constructor(
-        val result: UpdateKycInfoResult
-    ) : OnrampUpdateKycInfoResult
+        val result: SubmitIdentifiersResult
+    ) : OnrampSubmitIdentifiersResult
 
     /**
-     * KYC info update failed.
+     * Identifier submission failed.
      */
     @ExperimentalCryptoOnramp
     class Failed internal constructor(
         val error: Throwable
-    ) : OnrampUpdateKycInfoResult
+    ) : OnrampSubmitIdentifiersResult
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index 7bcbc74cda3..c41aa848bcd 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -11,6 +11,9 @@ import com.stripe.android.core.networking.StripeRequest
 import com.stripe.android.core.networking.executeRequestWithKSerializerParser
 import com.stripe.android.core.networking.toMap
 import com.stripe.android.core.version.StripeSdkVersion
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirements
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirementsResponse
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenRequest
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
@@ -21,9 +24,6 @@ import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.CryptoWalletRequestParams
 import com.stripe.android.crypto.onramp.model.GetOnrampSessionResponse
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
-import com.stripe.android.crypto.onramp.model.IdentifierRequirements
-import com.stripe.android.crypto.onramp.model.IdentifierRequirementsResponse
-import com.stripe.android.crypto.onramp.model.Identifier
 import com.stripe.android.crypto.onramp.model.KycCollectionRequest
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRefreshRequest
@@ -31,8 +31,8 @@ import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationRequest
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
-import com.stripe.android.crypto.onramp.model.UpdateKycInfoResponse
-import com.stripe.android.crypto.onramp.model.UpdateKycInfoResult
+import com.stripe.android.crypto.onramp.model.SubmitIdentifiersResponse
+import com.stripe.android.crypto.onramp.model.SubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.model.toRequest
 import com.stripe.android.link.LinkController
 import com.stripe.android.link.utils.isLinkAuthorizationError
@@ -126,9 +126,9 @@ internal class CryptoApiRepository @Inject constructor(
         )
     }
 
-    suspend fun getIdentifierRequirements(
+    suspend fun retrieveMissingIdentifiers(
         consumerSessionClientSecret: String
-    ): Result<IdentifierRequirements> {
+    ): Result<ComplianceIdentifierRequirements> {
         val request = apiRequestFactory.createGet(
             url = identifierRequirementsUrl,
             options = buildRequestOptions(),
@@ -137,23 +137,23 @@ internal class CryptoApiRepository @Inject constructor(
 
         return execute(
             request = request,
-            responseSerializer = IdentifierRequirementsResponse.serializer()
-        ).mapCatching { it.toIdentifierRequirements() }
+            responseSerializer = ComplianceIdentifierRequirementsResponse.serializer()
+        ).mapCatching { it.toComplianceIdentifierRequirements() }
     }
 
-    suspend fun updateKycInfo(
-        identifiers: List<Identifier>,
+    suspend fun submitIdentifiers(
+        identifiers: List<ComplianceIdentifier>,
         consumerSessionClientSecret: String
-    ): Result<UpdateKycInfoResult> {
+    ): Result<SubmitIdentifiersResult> {
         return executePost(
-            updateKycInfoUrl,
+            submitIdentifiersUrl,
             Json.encodeToJsonElement(
                 identifiers.toRequest(
                     credentials = CryptoCustomerRequestParams.Credentials(consumerSessionClientSecret)
                 )
             ).jsonObject,
-            UpdateKycInfoResponse.serializer()
-        ).mapCatching { it.toUpdateKycInfoResult() }
+            SubmitIdentifiersResponse.serializer()
+        ).mapCatching { it.toSubmitIdentifiersResult() }
     }
 
     suspend fun retrieveCrsCarfDeclaration(
@@ -393,10 +393,10 @@ internal class CryptoApiRepository @Inject constructor(
             get() = getApiUrl("crypto/internal/identifier_requirements")
 
         /**
-         * @return `https://api.stripe.com/v1/crypto/internal/tax_attestation`
+         * @return `https://api.stripe.com/v1/crypto/internal/eu_identifiers`
          */
-        internal val updateKycInfoUrl: String
-            get() = getApiUrl("crypto/internal/tax_attestation")
+        internal val submitIdentifiersUrl: String
+            get() = getApiUrl("crypto/internal/eu_identifiers")
 
         /**
          * @return `https://api.stripe.com/v1/crypto/internal/crs_carf_declaration`
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 0194c436563..971c8d709fe 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -7,15 +7,15 @@ import com.stripe.android.core.networking.ApiRequest
 import com.stripe.android.core.networking.StripeNetworkClient
 import com.stripe.android.core.networking.StripeResponse
 import com.stripe.android.core.version.StripeSdkVersion
-import com.stripe.android.crypto.onramp.model.AlternativeGroup
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierAlternativeGroup
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirement
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierType
+import com.stripe.android.crypto.onramp.model.ComplianceRegulation
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
-import com.stripe.android.crypto.onramp.model.Identifier
-import com.stripe.android.crypto.onramp.model.IdentifierRequirement
-import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
-import com.stripe.android.crypto.onramp.model.RegulationType
-import com.stripe.android.crypto.onramp.model.UpdateKycInfoResult
+import com.stripe.android.crypto.onramp.model.SubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.link.LinkController
 import com.stripe.android.model.DateOfBirth
@@ -150,7 +150,7 @@ class CryptoApiRepositoryTest {
     }
 
     @Test
-    fun testGetIdentifierRequirementsSucceeds() {
+    fun testRetrieveMissingIdentifiersSucceeds() {
         runTest {
             val stripeResponse = StripeResponse(
                 200,
@@ -180,7 +180,7 @@ class CryptoApiRepositoryTest {
             whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
                 .thenReturn(stripeResponse)
 
-            val result = cryptoApiRepository.getIdentifierRequirements(
+            val result = cryptoApiRepository.retrieveMissingIdentifiers(
                 consumerSessionClientSecret = "test-secret"
             )
 
@@ -195,27 +195,27 @@ class CryptoApiRepositoryTest {
             assertThat(result.isSuccess).isTrue()
             assertThat(result.getOrThrow().identifiers)
                 .containsExactly(
-                    IdentifierRequirement(
-                        type = IdentifierType.MT_NIC,
-                        regulation = RegulationType.EuMica
+                    ComplianceIdentifierRequirement(
+                        type = ComplianceIdentifierType.MT_NIC,
+                        regulation = ComplianceRegulation.EuMica
                     ),
-                    IdentifierRequirement(
-                        type = IdentifierType.FR_SPI,
-                        regulation = RegulationType.EuCarf
+                    ComplianceIdentifierRequirement(
+                        type = ComplianceIdentifierType.FR_SPI,
+                        regulation = ComplianceRegulation.EuCarf
                     )
                 )
             assertThat(result.getOrThrow().alternatives)
                 .containsExactly(
-                    AlternativeGroup(
-                        originalMissingIdentifiers = listOf(IdentifierType.MT_NIC),
-                        alternativeMissingIdentifiers = listOf(IdentifierType.MT_PP)
+                    ComplianceIdentifierAlternativeGroup(
+                        originalMissingIdentifiers = listOf(ComplianceIdentifierType.MT_NIC),
+                        alternativeMissingIdentifiers = listOf(ComplianceIdentifierType.MT_PP)
                     )
                 )
         }
     }
 
     @Test
-    fun testUpdateKycInfoSucceeds() {
+    fun testSubmitIdentifiersSucceeds() {
         runTest {
             val stripeResponse = StripeResponse(
                 200,
@@ -245,7 +245,7 @@ class CryptoApiRepositoryTest {
                                 "type": "mt_nic"
                             }
                         ],
-                        "invalidIdentifiers": [
+                        "invalid_identifiers": [
                             "de_stn",
                             "mt_nic"
                         ],
@@ -259,13 +259,13 @@ class CryptoApiRepositoryTest {
             whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
                 .thenReturn(stripeResponse)
 
-            val result = cryptoApiRepository.updateKycInfo(
+            val result = cryptoApiRepository.submitIdentifiers(
                 identifiers = listOf(
-                    Identifier()
-                        .type(IdentifierType.MT_NIC)
+                    ComplianceIdentifier()
+                        .type(ComplianceIdentifierType.MT_NIC)
                         .value("mica_123"),
-                    Identifier()
-                        .type(IdentifierType.FR_SPI)
+                    ComplianceIdentifier()
+                        .type(ComplianceIdentifierType.FR_SPI)
                         .value("carf_456")
                 ),
                 consumerSessionClientSecret = "test-secret"
@@ -274,12 +274,12 @@ class CryptoApiRepositoryTest {
             verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
             assertIdentifiersRequest(apiRequestArgumentCaptor.firstValue)
             assertThat(result.isSuccess).isTrue()
-            assertUpdateKycInfoResult(result.getOrThrow())
+            assertSubmitIdentifiersResult(result.getOrThrow())
         }
     }
 
     @Test
-    fun testUpdateKycInfoSucceedsWhenValid() {
+    fun testSubmitIdentifiersSucceedsWhenValid() {
         runTest {
             val stripeResponse = StripeResponse(
                 200,
@@ -287,7 +287,7 @@ class CryptoApiRepositoryTest {
                     {
                         "alternatives": [],
                         "identifiers": [],
-                        "invalidIdentifiers": [],
+                        "invalid_identifiers": [],
                         "valid": true
                     }
                     """,
@@ -297,10 +297,10 @@ class CryptoApiRepositoryTest {
             whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
                 .thenReturn(stripeResponse)
 
-            val result = cryptoApiRepository.updateKycInfo(
+            val result = cryptoApiRepository.submitIdentifiers(
                 identifiers = listOf(
-                    Identifier()
-                        .type(IdentifierType.MT_NIC)
+                    ComplianceIdentifier()
+                        .type(ComplianceIdentifierType.MT_NIC)
                         .value("mica_123")
                 ),
                 consumerSessionClientSecret = "test-secret"
@@ -309,7 +309,7 @@ class CryptoApiRepositoryTest {
             assertThat(result.isSuccess).isTrue()
             assertThat(result.getOrThrow())
                 .isEqualTo(
-                    UpdateKycInfoResult(
+                    SubmitIdentifiersResult(
                         valid = true,
                         identifiers = emptyList(),
                         alternatives = emptyList(),
@@ -738,7 +738,7 @@ class CryptoApiRepositoryTest {
 
     private fun assertIdentifiersRequest(apiRequest: ApiRequest) {
         assertThat(apiRequest.baseUrl)
-            .isEqualTo("https://api.stripe.com/v1/crypto/internal/tax_attestation")
+            .isEqualTo("https://api.stripe.com/v1/crypto/internal/eu_identifiers")
         assertThat(apiRequest.params)
             .isEqualTo(
                 mapOf(
@@ -757,31 +757,31 @@ class CryptoApiRepositoryTest {
             )
     }
 
-    private fun assertUpdateKycInfoResult(result: UpdateKycInfoResult) {
+    private fun assertSubmitIdentifiersResult(result: SubmitIdentifiersResult) {
         assertThat(result.valid).isFalse()
         assertThat(result.identifiers)
             .containsExactly(
-                IdentifierRequirement(
-                    type = IdentifierType.DE_STN,
-                    regulation = RegulationType.EuCarf
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.DE_STN,
+                    regulation = ComplianceRegulation.EuCarf
                 ),
-                IdentifierRequirement(
-                    type = IdentifierType.MT_NIC,
-                    regulation = RegulationType.EuCarf
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.MT_NIC,
+                    regulation = ComplianceRegulation.EuCarf
                 ),
-                IdentifierRequirement(
-                    type = IdentifierType.MT_NIC,
-                    regulation = RegulationType.EuMica
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.MT_NIC,
+                    regulation = ComplianceRegulation.EuMica
                 )
             )
         assertThat(result.alternatives)
             .containsExactly(
-                AlternativeGroup(
-                    originalMissingIdentifiers = listOf(IdentifierType.MT_NIC),
-                    alternativeMissingIdentifiers = listOf(IdentifierType.MT_PP)
+                ComplianceIdentifierAlternativeGroup(
+                    originalMissingIdentifiers = listOf(ComplianceIdentifierType.MT_NIC),
+                    alternativeMissingIdentifiers = listOf(ComplianceIdentifierType.MT_PP)
                 )
             )
         assertThat(result.invalidIdentifiers)
-            .isEqualTo(listOf(IdentifierType.DE_STN, IdentifierType.MT_NIC))
+            .isEqualTo(listOf(ComplianceIdentifierType.DE_STN, ComplianceIdentifierType.MT_NIC))
     }
 }
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 1ab19979f0b..4478e51d5b1 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -10,14 +10,15 @@ import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierAlternativeGroup
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirement
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirements
+import com.stripe.android.crypto.onramp.model.ComplianceIdentifierType
+import com.stripe.android.crypto.onramp.model.ComplianceRegulation
 import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
-import com.stripe.android.crypto.onramp.model.AlternativeGroup
-import com.stripe.android.crypto.onramp.model.Identifier
-import com.stripe.android.crypto.onramp.model.IdentifierRequirement
-import com.stripe.android.crypto.onramp.model.IdentifierRequirements
-import com.stripe.android.crypto.onramp.model.IdentifierType
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
@@ -28,21 +29,20 @@ import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
 import com.stripe.android.crypto.onramp.model.OnrampCrsCarfDeclarationResult
-import com.stripe.android.crypto.onramp.model.OnrampGetIdentifierRequirementsResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterWalletAddressResult
+import com.stripe.android.crypto.onramp.model.OnrampRetrieveMissingIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampSessionClientSecretProvider
 import com.stripe.android.crypto.onramp.model.OnrampStartVerificationResult
-import com.stripe.android.crypto.onramp.model.OnrampUpdateKycInfoResult
+import com.stripe.android.crypto.onramp.model.OnrampSubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
-import com.stripe.android.crypto.onramp.model.RegulationType
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
-import com.stripe.android.crypto.onramp.model.UpdateKycInfoResult
+import com.stripe.android.crypto.onramp.model.SubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityResult
 import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationScreenAction
@@ -202,83 +202,83 @@ class OnrampInteractorTest {
     }
 
     @Test
-    fun testGetIdentifierRequirementsIsSuccessful() = runTest {
+    fun testRetrieveMissingIdentifiersIsSuccessful() = runTest {
         whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
-        val requirements = IdentifierRequirements(
+        val requirements = ComplianceIdentifierRequirements(
             identifiers = listOf(
-                IdentifierRequirement(
-                    type = IdentifierType.MT_NIC,
-                    regulation = RegulationType.EuMica
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.MT_NIC,
+                    regulation = ComplianceRegulation.EuMica
                 ),
-                IdentifierRequirement(
-                    type = IdentifierType.FR_SPI,
-                    regulation = RegulationType.EuCarf
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.FR_SPI,
+                    regulation = ComplianceRegulation.EuCarf
                 )
             ),
             alternatives = listOf(
-                AlternativeGroup(
-                    originalMissingIdentifiers = listOf(IdentifierType.MT_NIC),
-                    alternativeMissingIdentifiers = listOf(IdentifierType.MT_PP)
+                ComplianceIdentifierAlternativeGroup(
+                    originalMissingIdentifiers = listOf(ComplianceIdentifierType.MT_NIC),
+                    alternativeMissingIdentifiers = listOf(ComplianceIdentifierType.MT_PP)
                 )
             )
         )
-        whenever(cryptoApiRepository.getIdentifierRequirements(any()))
+        whenever(cryptoApiRepository.retrieveMissingIdentifiers(any()))
             .thenReturn(Result.success(requirements))
 
         interactor.onLinkControllerState(mockLinkStateWithAccount())
 
-        val result = interactor.getIdentifierRequirements()
+        val result = interactor.retrieveMissingIdentifiers()
 
-        assertThat(result).isInstanceOf(OnrampGetIdentifierRequirementsResult.Completed::class.java)
-        val completed = result as OnrampGetIdentifierRequirementsResult.Completed
+        assertThat(result).isInstanceOf(OnrampRetrieveMissingIdentifiersResult.Completed::class.java)
+        val completed = result as OnrampRetrieveMissingIdentifiersResult.Completed
         assertThat(completed.requirements).isEqualTo(requirements)
-        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.IdentifierRequirementsRetrieved)
+        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.MissingIdentifiersRetrieved)
     }
 
     @Test
-    fun testUpdateKycInfoIsSuccessful() = runTest {
+    fun testSubmitIdentifiersIsSuccessful() = runTest {
         whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
-        val submissionResult = UpdateKycInfoResult(
+        val submissionResult = SubmitIdentifiersResult(
             valid = false,
             identifiers = listOf(
-                IdentifierRequirement(
-                    type = IdentifierType.DE_STN,
-                    regulation = RegulationType.EuCarf
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.DE_STN,
+                    regulation = ComplianceRegulation.EuCarf
                 ),
-                IdentifierRequirement(
-                    type = IdentifierType.MT_NIC,
-                    regulation = RegulationType.EuCarf
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.MT_NIC,
+                    regulation = ComplianceRegulation.EuCarf
                 ),
-                IdentifierRequirement(
-                    type = IdentifierType.MT_NIC,
-                    regulation = RegulationType.EuMica
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.MT_NIC,
+                    regulation = ComplianceRegulation.EuMica
                 )
             ),
             alternatives = listOf(
-                AlternativeGroup(
-                    originalMissingIdentifiers = listOf(IdentifierType.MT_NIC),
-                    alternativeMissingIdentifiers = listOf(IdentifierType.MT_PP)
+                ComplianceIdentifierAlternativeGroup(
+                    originalMissingIdentifiers = listOf(ComplianceIdentifierType.MT_NIC),
+                    alternativeMissingIdentifiers = listOf(ComplianceIdentifierType.MT_PP)
                 )
             ),
-            invalidIdentifiers = listOf(IdentifierType.DE_STN, IdentifierType.MT_NIC)
+            invalidIdentifiers = listOf(ComplianceIdentifierType.DE_STN, ComplianceIdentifierType.MT_NIC)
         )
-        whenever(cryptoApiRepository.updateKycInfo(any(), any()))
+        whenever(cryptoApiRepository.submitIdentifiers(any(), any()))
             .thenReturn(Result.success(submissionResult))
 
         interactor.onLinkControllerState(mockLinkStateWithAccount())
 
-        val result = interactor.updateKycInfo(
+        val result = interactor.submitIdentifiers(
             listOf(
-                Identifier()
-                    .type(IdentifierType.MT_NIC)
+                ComplianceIdentifier()
+                    .type(ComplianceIdentifierType.MT_NIC)
                     .value("mica_123")
             )
         )
 
-        assertThat(result).isInstanceOf(OnrampUpdateKycInfoResult.Completed::class.java)
-        val completed = result as OnrampUpdateKycInfoResult.Completed
+        assertThat(result).isInstanceOf(OnrampSubmitIdentifiersResult.Completed::class.java)
+        val completed = result as OnrampSubmitIdentifiersResult.Completed
         assertThat(completed.result).isEqualTo(submissionResult)
-        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.EuIdentifiersSubmitted)
+        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.IdentifiersSubmitted)
     }
 
     @Test

From d63aa0b74f43920ef236df5183431182de1b8e5b Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 4 May 2026 15:46:09 -0400
Subject: [PATCH 16/57] Make sure to include filtering out nationalities

---
 .../stripe/android/crypto/onramp/model/KycCollectionRequest.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt
index de40c48ecc2..8f09e9ac17b 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt
@@ -58,7 +58,7 @@ internal data class KycCollectionRequest(
                 dateOfBirth = kycInfo.dateOfBirth,
                 birthCountry = kycInfo.birthCountry?.value,
                 birthCity = kycInfo.birthCity.takeIf { !it.isNullOrEmpty() },
-                nationalities = kycInfo.nationalities?.map { it.value },
+                nationalities = kycInfo.nationalities?.map { it.value.trim() },
                 city = kycInfo.address?.city,
                 country = kycInfo.address?.country,
                 line1 = kycInfo.address?.line1,

From c0abbca86fa2c7c874cebbfb06684e11886f3334 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 4 May 2026 15:46:20 -0400
Subject: [PATCH 17/57] Update CryptoApiRepositoryTest.kt

---
 .../crypto/onramp/CryptoApiRepositoryTest.kt  | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 971c8d709fe..9563208b1ec 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -149,6 +149,41 @@ class CryptoApiRepositoryTest {
         }
     }
 
+    @Test
+    fun testCollectKycDataTrimsNationalities() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                "{}",
+                emptyMap()
+            )
+
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.collectKycData(
+                KycInfo(
+                    firstName = "Test",
+                    lastName = "User",
+                    idNumber = "999-88-7777",
+                    dateOfBirth = DateOfBirth(day = 1, month = 3, year = 1975),
+                    address = PaymentSheet.Address(city = "Orlando", state = "FL"),
+                    nationalities = listOf(
+                        CountryCode(" IE "),
+                        CountryCode("\nFR\t"),
+                    )
+                ),
+                consumerSessionClientSecret = "test-secret"
+            )
+
+            verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
+
+            assertThat(result.isSuccess).isTrue()
+            assertThat(apiRequestArgumentCaptor.firstValue.params?.get("nationalities"))
+                .isEqualTo(listOf("IE", "FR"))
+        }
+    }
+
     @Test
     fun testRetrieveMissingIdentifiersSucceeds() {
         runTest {

From 6aa70880c97427154adc7653f1ae367cd3bc21a7 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 4 May 2026 15:58:42 -0400
Subject: [PATCH 18/57] Refactor

---
 .../crypto/onramp/OnrampCoordinator.kt        |   2 +-
 .../android/crypto/onramp/OnrampInteractor.kt |   2 +-
 .../model/Compliance/ComplianceIdentifier.kt  |  45 ++++
 .../ComplianceIdentifierAlternativeGroup.kt   |  14 +
 ...ianceIdentifierAlternativeGroupResponse.kt |  19 ++
 .../ComplianceIdentifierRequirement.kt        |  14 +
 ...ComplianceIdentifierRequirementResponse.kt |  18 ++
 .../ComplianceIdentifierRequirements.kt       |  14 +
 ...omplianceIdentifierRequirementsResponse.kt |  16 ++
 .../Compliance/ComplianceIdentifierType.kt    |  55 ++++
 .../model/Compliance/ComplianceRegulation.kt  |  18 ++
 .../Compliance/SubmitIdentifiersRequest.kt    |  32 +++
 .../Compliance/SubmitIdentifiersResponse.kt   |  22 ++
 .../Compliance/SubmitIdentifiersResult.kt     |  16 ++
 .../crypto/onramp/model/Identifiers.kt        | 245 ------------------
 .../repositories/CryptoApiRepository.kt       |  12 +-
 .../crypto/onramp/CryptoApiRepositoryTest.kt  |  12 +-
 .../crypto/onramp/OnrampInteractorTest.kt     |  14 +-
 18 files changed, 304 insertions(+), 266 deletions(-)
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt
 delete mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
index 54921b01623..11893016dd7 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
@@ -5,7 +5,7 @@ import androidx.activity.ComponentActivity
 import androidx.lifecycle.SavedStateHandle
 import com.stripe.android.crypto.onramp.di.OnrampComponentHolder
 import com.stripe.android.crypto.onramp.di.OnrampPresenterComponent
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
index c8c7c1a6720..ed5f04b65cc 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
@@ -14,7 +14,7 @@ import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.exception.MissingPaymentMethodException
 import com.stripe.android.crypto.onramp.exception.PaymentFailedException
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt
new file mode 100644
index 00000000000..9c1dea8a770
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt
@@ -0,0 +1,45 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * A compliance identifier collected for MiCA or CRS/CARF compliance.
+ *
+ * @property type The type of identifier provided.
+ * @property value The identifier value.
+ */
+@ExperimentalCryptoOnramp
+class ComplianceIdentifier {
+    private var type: ComplianceIdentifierType? = null
+    private var value: String? = null
+
+    /**
+     * Sets the identifier type.
+     */
+    fun type(type: ComplianceIdentifierType) = apply {
+        this.type = type
+    }
+
+    /**
+     * Sets the identifier value.
+     */
+    fun value(value: String) = apply {
+        this.value = value
+    }
+
+    internal class State(
+        val type: ComplianceIdentifierType,
+        val value: String
+    )
+
+    internal fun build(): State {
+        return State(
+            type = requireNotNull(type) {
+                "type must not be null"
+            },
+            value = requireNotNull(value) {
+                "value must not be null"
+            }
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt
new file mode 100644
index 00000000000..0cec9834862
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt
@@ -0,0 +1,14 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import dev.drewhamilton.poko.Poko
+
+/**
+ * A group describing alternative identifier types that may satisfy a requirement.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class ComplianceIdentifierAlternativeGroup internal constructor(
+    val originalMissingIdentifiers: List<ComplianceIdentifierType>,
+    val alternativeMissingIdentifiers: List<ComplianceIdentifierType>
+)
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt
new file mode 100644
index 00000000000..7e4e3e14b16
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt
@@ -0,0 +1,19 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class ComplianceIdentifierAlternativeGroupResponse(
+    @SerialName("original_missing_identifiers")
+    val originalMissingIdentifiers: List<String>,
+    @SerialName("alternative_missing_identifiers")
+    val alternativeMissingIdentifiers: List<String>
+) {
+    fun toComplianceIdentifierAlternativeGroup(): ComplianceIdentifierAlternativeGroup {
+        return ComplianceIdentifierAlternativeGroup(
+            originalMissingIdentifiers = originalMissingIdentifiers.map(ComplianceIdentifierType::fromValue),
+            alternativeMissingIdentifiers = alternativeMissingIdentifiers.map(ComplianceIdentifierType::fromValue)
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt
new file mode 100644
index 00000000000..432b334cee3
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt
@@ -0,0 +1,14 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import dev.drewhamilton.poko.Poko
+
+/**
+ * A compliance identifier the customer still needs to provide.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class ComplianceIdentifierRequirement internal constructor(
+    val type: ComplianceIdentifierType,
+    val regulation: ComplianceRegulation
+)
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt
new file mode 100644
index 00000000000..2c469253b07
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt
@@ -0,0 +1,18 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class ComplianceIdentifierRequirementResponse(
+    val type: String,
+    val regulation: String
+) {
+    fun toComplianceIdentifierRequirement(): ComplianceIdentifierRequirement {
+        return ComplianceIdentifierRequirement(
+            type = ComplianceIdentifierType.fromValue(type),
+            regulation = requireNotNull(ComplianceRegulation.fromValue(regulation)) {
+                "Unrecognized compliance regulation: $regulation"
+            }
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt
new file mode 100644
index 00000000000..a1e8eedaed0
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt
@@ -0,0 +1,14 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import dev.drewhamilton.poko.Poko
+
+/**
+ * The compliance identifiers a customer still needs to provide.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class ComplianceIdentifierRequirements internal constructor(
+    val identifiers: List<ComplianceIdentifierRequirement>,
+    val alternatives: List<ComplianceIdentifierAlternativeGroup>
+)
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt
new file mode 100644
index 00000000000..89f6f23ac1c
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt
@@ -0,0 +1,16 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class ComplianceIdentifierRequirementsResponse(
+    val identifiers: List<ComplianceIdentifierRequirementResponse> = emptyList(),
+    val alternatives: List<ComplianceIdentifierAlternativeGroupResponse> = emptyList(),
+) {
+    fun toComplianceIdentifierRequirements(): ComplianceIdentifierRequirements {
+        return ComplianceIdentifierRequirements(
+            identifiers = identifiers.map { it.toComplianceIdentifierRequirement() },
+            alternatives = alternatives.map { it.toComplianceIdentifierAlternativeGroup() }
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt
new file mode 100644
index 00000000000..107b74ea611
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt
@@ -0,0 +1,55 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import dev.drewhamilton.poko.Poko
+
+/**
+ * The type of compliance identifier required or submitted for regulatory compliance.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class ComplianceIdentifierType(
+    val value: String
+) {
+    init {
+        require(value.isNotBlank()) {
+            "value must not be blank"
+        }
+    }
+
+    companion object {
+        val AT_STN = ComplianceIdentifierType("at_stn")
+        val BE_NRN = ComplianceIdentifierType("be_nrn")
+        val BG_UCN = ComplianceIdentifierType("bg_ucn")
+        val HR_OIB = ComplianceIdentifierType("hr_oib")
+        val CY_TIC = ComplianceIdentifierType("cy_tic")
+        val CZ_RC = ComplianceIdentifierType("cz_rc")
+        val DK_CPR = ComplianceIdentifierType("dk_cpr")
+        val EE_IK = ComplianceIdentifierType("ee_ik")
+        val FI_HETU = ComplianceIdentifierType("fi_hetu")
+        val FR_SPI = ComplianceIdentifierType("fr_spi")
+        val DE_STN = ComplianceIdentifierType("de_stn")
+        val GR_AFM = ComplianceIdentifierType("gr_afm")
+        val HU_AD = ComplianceIdentifierType("hu_ad")
+        val IS_KT = ComplianceIdentifierType("is_kt")
+        val IE_PPSN = ComplianceIdentifierType("ie_ppsn")
+        val IT_CF = ComplianceIdentifierType("it_cf")
+        val LV_PK = ComplianceIdentifierType("lv_pk")
+        val LT_AK = ComplianceIdentifierType("lt_ak")
+        val LU_NIF = ComplianceIdentifierType("lu_nif")
+        val MT_NIC = ComplianceIdentifierType("mt_nic")
+        val MT_PP = ComplianceIdentifierType("mt_pp")
+        val NL_BSN = ComplianceIdentifierType("nl_bsn")
+        val PL_PESEL = ComplianceIdentifierType("pl_pesel")
+        val PL_NIP = ComplianceIdentifierType("pl_nip")
+        val PT_NIF = ComplianceIdentifierType("pt_nif")
+        val RO_CNP = ComplianceIdentifierType("ro_cnp")
+        val SK_RC = ComplianceIdentifierType("sk_rc")
+        val SI_PIN = ComplianceIdentifierType("si_pin")
+        val SE_PIN = ComplianceIdentifierType("se_pin")
+
+        fun fromValue(value: String): ComplianceIdentifierType {
+            return ComplianceIdentifierType(value)
+        }
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt
new file mode 100644
index 00000000000..500e3bbc818
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt
@@ -0,0 +1,18 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * The regulation requiring a compliance identifier.
+ */
+@ExperimentalCryptoOnramp
+enum class ComplianceRegulation(val value: String) {
+    EuCarf("eu_carf"),
+    EuMica("eu_mica");
+
+    companion object {
+        fun fromValue(value: String): ComplianceRegulation? {
+            return entries.firstOrNull { it.value == value }
+        }
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt
new file mode 100644
index 00000000000..f777a2d6d72
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt
@@ -0,0 +1,32 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.model.CryptoCustomerRequestParams
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class SubmitIdentifiersRequest(
+    val credentials: CryptoCustomerRequestParams.Credentials,
+    val identifiers: List<ComplianceIdentifierRequest>
+)
+
+@Serializable
+internal data class ComplianceIdentifierRequest(
+    val type: String,
+    val value: String
+)
+
+internal fun List<ComplianceIdentifier>.toRequest(
+    credentials: CryptoCustomerRequestParams.Credentials
+): SubmitIdentifiersRequest {
+    return SubmitIdentifiersRequest(
+        credentials = credentials,
+        identifiers = map { it.build().toRequest() }
+    )
+}
+
+private fun ComplianceIdentifier.State.toRequest(): ComplianceIdentifierRequest {
+    return ComplianceIdentifierRequest(
+        type = type.value,
+        value = value
+    )
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt
new file mode 100644
index 00000000000..be3c5a8e132
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt
@@ -0,0 +1,22 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class SubmitIdentifiersResponse(
+    val valid: Boolean = true,
+    val identifiers: List<ComplianceIdentifierRequirementResponse> = emptyList(),
+    val alternatives: List<ComplianceIdentifierAlternativeGroupResponse> = emptyList(),
+    @SerialName("invalid_identifiers")
+    val invalidIdentifiers: List<String> = emptyList(),
+) {
+    fun toSubmitIdentifiersResult(): SubmitIdentifiersResult {
+        return SubmitIdentifiersResult(
+            valid = valid,
+            identifiers = identifiers.map { it.toComplianceIdentifierRequirement() },
+            alternatives = alternatives.map { it.toComplianceIdentifierAlternativeGroup() },
+            invalidIdentifiers = invalidIdentifiers.map(ComplianceIdentifierType::fromValue)
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt
new file mode 100644
index 00000000000..54aac5921c4
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt
@@ -0,0 +1,16 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import dev.drewhamilton.poko.Poko
+
+/**
+ * The result of submitting compliance identifiers for MiCA and CRS/CARF compliance.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class SubmitIdentifiersResult internal constructor(
+    val valid: Boolean,
+    val identifiers: List<ComplianceIdentifierRequirement>,
+    val alternatives: List<ComplianceIdentifierAlternativeGroup>,
+    val invalidIdentifiers: List<ComplianceIdentifierType>
+)
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
deleted file mode 100644
index 8972a31da0d..00000000000
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Identifiers.kt
+++ /dev/null
@@ -1,245 +0,0 @@
-package com.stripe.android.crypto.onramp.model
-
-import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
-import dev.drewhamilton.poko.Poko
-import kotlinx.serialization.SerialName
-import kotlinx.serialization.Serializable
-
-/**
- * A compliance identifier collected for MiCA or CRS/CARF compliance.
- *
- * @property type The type of identifier provided.
- * @property value The identifier value.
- */
-@ExperimentalCryptoOnramp
-class ComplianceIdentifier {
-    private var type: ComplianceIdentifierType? = null
-    private var value: String? = null
-
-    /**
-     * Sets the identifier type.
-     */
-    fun type(type: ComplianceIdentifierType) = apply {
-        this.type = type
-    }
-
-    /**
-     * Sets the identifier value.
-     */
-    fun value(value: String) = apply {
-        this.value = value
-    }
-
-    internal class State(
-        val type: ComplianceIdentifierType,
-        val value: String
-    )
-
-    internal fun build(): State {
-        return State(
-            type = requireNotNull(type) {
-                "type must not be null"
-            },
-            value = requireNotNull(value) {
-                "value must not be null"
-            }
-        )
-    }
-}
-
-/**
- * The type of compliance identifier required or submitted for regulatory compliance.
- */
-@ExperimentalCryptoOnramp
-@Poko
-class ComplianceIdentifierType(
-    val value: String
-) {
-    init {
-        require(value.isNotBlank()) {
-            "value must not be blank"
-        }
-    }
-
-    companion object {
-        val AT_STN = ComplianceIdentifierType("at_stn")
-        val BE_NRN = ComplianceIdentifierType("be_nrn")
-        val BG_UCN = ComplianceIdentifierType("bg_ucn")
-        val HR_OIB = ComplianceIdentifierType("hr_oib")
-        val CY_TIC = ComplianceIdentifierType("cy_tic")
-        val CZ_RC = ComplianceIdentifierType("cz_rc")
-        val DK_CPR = ComplianceIdentifierType("dk_cpr")
-        val EE_IK = ComplianceIdentifierType("ee_ik")
-        val FI_HETU = ComplianceIdentifierType("fi_hetu")
-        val FR_SPI = ComplianceIdentifierType("fr_spi")
-        val DE_STN = ComplianceIdentifierType("de_stn")
-        val GR_AFM = ComplianceIdentifierType("gr_afm")
-        val HU_AD = ComplianceIdentifierType("hu_ad")
-        val IS_KT = ComplianceIdentifierType("is_kt")
-        val IE_PPSN = ComplianceIdentifierType("ie_ppsn")
-        val IT_CF = ComplianceIdentifierType("it_cf")
-        val LV_PK = ComplianceIdentifierType("lv_pk")
-        val LT_AK = ComplianceIdentifierType("lt_ak")
-        val LU_NIF = ComplianceIdentifierType("lu_nif")
-        val MT_NIC = ComplianceIdentifierType("mt_nic")
-        val MT_PP = ComplianceIdentifierType("mt_pp")
-        val NL_BSN = ComplianceIdentifierType("nl_bsn")
-        val PL_PESEL = ComplianceIdentifierType("pl_pesel")
-        val PL_NIP = ComplianceIdentifierType("pl_nip")
-        val PT_NIF = ComplianceIdentifierType("pt_nif")
-        val RO_CNP = ComplianceIdentifierType("ro_cnp")
-        val SK_RC = ComplianceIdentifierType("sk_rc")
-        val SI_PIN = ComplianceIdentifierType("si_pin")
-        val SE_PIN = ComplianceIdentifierType("se_pin")
-
-        fun fromValue(value: String): ComplianceIdentifierType {
-            return ComplianceIdentifierType(value)
-        }
-    }
-}
-
-/**
- * The regulation requiring a compliance identifier.
- */
-@ExperimentalCryptoOnramp
-enum class ComplianceRegulation(val value: String) {
-    EuCarf("eu_carf"),
-    EuMica("eu_mica");
-
-    companion object {
-        fun fromValue(value: String): ComplianceRegulation? {
-            return entries.firstOrNull { it.value == value }
-        }
-    }
-}
-
-/**
- * A compliance identifier the customer still needs to provide.
- */
-@ExperimentalCryptoOnramp
-@Poko
-class ComplianceIdentifierRequirement internal constructor(
-    val type: ComplianceIdentifierType,
-    val regulation: ComplianceRegulation
-)
-
-/**
- * A group describing alternative identifier types that may satisfy a requirement.
- */
-@ExperimentalCryptoOnramp
-@Poko
-class ComplianceIdentifierAlternativeGroup internal constructor(
-    val originalMissingIdentifiers: List<ComplianceIdentifierType>,
-    val alternativeMissingIdentifiers: List<ComplianceIdentifierType>
-)
-
-/**
- * The compliance identifiers a customer still needs to provide.
- */
-@ExperimentalCryptoOnramp
-@Poko
-class ComplianceIdentifierRequirements internal constructor(
-    val identifiers: List<ComplianceIdentifierRequirement>,
-    val alternatives: List<ComplianceIdentifierAlternativeGroup>
-)
-
-/**
- * The result of submitting compliance identifiers for MiCA and CRS/CARF compliance.
- */
-@ExperimentalCryptoOnramp
-@Poko
-class SubmitIdentifiersResult internal constructor(
-    val valid: Boolean,
-    val identifiers: List<ComplianceIdentifierRequirement>,
-    val alternatives: List<ComplianceIdentifierAlternativeGroup>,
-    val invalidIdentifiers: List<ComplianceIdentifierType>
-)
-
-@Serializable
-internal data class SubmitIdentifiersRequest(
-    val credentials: CryptoCustomerRequestParams.Credentials,
-    val identifiers: List<ComplianceIdentifierRequest>
-)
-
-@Serializable
-internal data class ComplianceIdentifierRequest(
-    val type: String,
-    val value: String
-)
-
-@Serializable
-internal data class ComplianceIdentifierRequirementsResponse(
-    val identifiers: List<ComplianceIdentifierRequirementResponse> = emptyList(),
-    val alternatives: List<ComplianceIdentifierAlternativeGroupResponse> = emptyList(),
-) {
-    fun toComplianceIdentifierRequirements(): ComplianceIdentifierRequirements {
-        return ComplianceIdentifierRequirements(
-            identifiers = identifiers.map { it.toComplianceIdentifierRequirement() },
-            alternatives = alternatives.map { it.toComplianceIdentifierAlternativeGroup() }
-        )
-    }
-}
-
-@Serializable
-internal data class SubmitIdentifiersResponse(
-    val valid: Boolean = true,
-    val identifiers: List<ComplianceIdentifierRequirementResponse> = emptyList(),
-    val alternatives: List<ComplianceIdentifierAlternativeGroupResponse> = emptyList(),
-    @SerialName("invalid_identifiers")
-    val invalidIdentifiers: List<String> = emptyList(),
-) {
-    fun toSubmitIdentifiersResult(): SubmitIdentifiersResult {
-        return SubmitIdentifiersResult(
-            valid = valid,
-            identifiers = identifiers.map { it.toComplianceIdentifierRequirement() },
-            alternatives = alternatives.map { it.toComplianceIdentifierAlternativeGroup() },
-            invalidIdentifiers = invalidIdentifiers.map(ComplianceIdentifierType::fromValue)
-        )
-    }
-}
-
-@Serializable
-internal data class ComplianceIdentifierRequirementResponse(
-    val type: String,
-    val regulation: String
-) {
-    fun toComplianceIdentifierRequirement(): ComplianceIdentifierRequirement {
-        return ComplianceIdentifierRequirement(
-            type = ComplianceIdentifierType.fromValue(type),
-            regulation = requireNotNull(ComplianceRegulation.fromValue(regulation)) {
-                "Unrecognized compliance regulation: $regulation"
-            }
-        )
-    }
-}
-
-@Serializable
-internal data class ComplianceIdentifierAlternativeGroupResponse(
-    @SerialName("original_missing_identifiers")
-    val originalMissingIdentifiers: List<String>,
-    @SerialName("alternative_missing_identifiers")
-    val alternativeMissingIdentifiers: List<String>
-) {
-    fun toComplianceIdentifierAlternativeGroup(): ComplianceIdentifierAlternativeGroup {
-        return ComplianceIdentifierAlternativeGroup(
-            originalMissingIdentifiers = originalMissingIdentifiers.map(ComplianceIdentifierType::fromValue),
-            alternativeMissingIdentifiers = alternativeMissingIdentifiers.map(ComplianceIdentifierType::fromValue)
-        )
-    }
-}
-
-internal fun List<ComplianceIdentifier>.toRequest(
-    credentials: CryptoCustomerRequestParams.Credentials
-): SubmitIdentifiersRequest {
-    return SubmitIdentifiersRequest(
-        credentials = credentials,
-        identifiers = map { it.build().toRequest() }
-    )
-}
-
-private fun ComplianceIdentifier.State.toRequest(): ComplianceIdentifierRequest {
-    return ComplianceIdentifierRequest(
-        type = type.value,
-        value = value
-    )
-}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index c41aa848bcd..5413cbb4079 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -11,9 +11,9 @@ import com.stripe.android.core.networking.StripeRequest
 import com.stripe.android.core.networking.executeRequestWithKSerializerParser
 import com.stripe.android.core.networking.toMap
 import com.stripe.android.core.version.StripeSdkVersion
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifier
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirements
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirementsResponse
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirements
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirementsResponse
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenRequest
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
@@ -31,9 +31,9 @@ import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationRequest
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
-import com.stripe.android.crypto.onramp.model.SubmitIdentifiersResponse
-import com.stripe.android.crypto.onramp.model.SubmitIdentifiersResult
-import com.stripe.android.crypto.onramp.model.toRequest
+import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResponse
+import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResult
+import com.stripe.android.crypto.onramp.model.Compliance.toRequest
 import com.stripe.android.link.LinkController
 import com.stripe.android.link.utils.isLinkAuthorizationError
 import com.stripe.android.model.PaymentIntent
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 9563208b1ec..9c02b7541cd 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -7,15 +7,15 @@ import com.stripe.android.core.networking.ApiRequest
 import com.stripe.android.core.networking.StripeNetworkClient
 import com.stripe.android.core.networking.StripeResponse
 import com.stripe.android.core.version.StripeSdkVersion
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifier
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierAlternativeGroup
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirement
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierType
-import com.stripe.android.crypto.onramp.model.ComplianceRegulation
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierAlternativeGroup
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirement
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierType
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceRegulation
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
-import com.stripe.android.crypto.onramp.model.SubmitIdentifiersResult
+import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.link.LinkController
 import com.stripe.android.model.DateOfBirth
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 4478e51d5b1..44df02a6730 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -10,12 +10,12 @@ import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifier
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierAlternativeGroup
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirement
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirements
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierType
-import com.stripe.android.crypto.onramp.model.ComplianceRegulation
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierAlternativeGroup
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirement
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirements
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierType
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceRegulation
 import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
@@ -42,7 +42,7 @@ import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
-import com.stripe.android.crypto.onramp.model.SubmitIdentifiersResult
+import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityResult
 import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationScreenAction

From 7f1b374ccbfb96dd93a76ff692c09d1ea57a0687 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 4 May 2026 16:00:29 -0400
Subject: [PATCH 19/57] Fixed missing imports

---
 .../onramp/model/OnrampRetrieveMissingIdentifiersResult.kt       | 1 +
 .../android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt | 1 +
 2 files changed, 2 insertions(+)

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt
index 8dbd896e09b..c364941f437 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt
@@ -1,6 +1,7 @@
 package com.stripe.android.crypto.onramp.model
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirements
 
 /**
  * Result of retrieving missing compliance identifiers.
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt
index a0ece1ce739..4eee15232d3 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt
@@ -1,6 +1,7 @@
 package com.stripe.android.crypto.onramp.model
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResult
 
 /**
  * Result of submitting compliance identifiers.

From fe68fa21ef2931e50372f4cc629e16f6119e1064 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 4 May 2026 16:16:27 -0400
Subject: [PATCH 20/57] Adds backend / model code

---
 crypto-onramp/api/crypto-onramp.api           | 149 +++++--
 .../model/Compliance/ComplianceIdentifier.kt  |  45 +++
 .../ComplianceIdentifierAlternativeGroup.kt   |  14 +
 ...ianceIdentifierAlternativeGroupResponse.kt |  19 +
 .../ComplianceIdentifierRequirement.kt        |  14 +
 ...ComplianceIdentifierRequirementResponse.kt |  18 +
 .../ComplianceIdentifierRequirements.kt       |  14 +
 ...omplianceIdentifierRequirementsResponse.kt |  16 +
 .../Compliance/ComplianceIdentifierType.kt    |  55 +++
 .../model/Compliance/ComplianceRegulation.kt  |  18 +
 .../Compliance/SubmitIdentifiersRequest.kt    |  32 ++
 .../Compliance/SubmitIdentifiersResponse.kt   |  22 +
 .../Compliance/SubmitIdentifiersResult.kt     |  16 +
 .../crypto/onramp/model/CrsCarfDeclaration.kt |  29 ++
 .../onramp/model/KycCollectionRequest.kt      |   9 +
 .../android/crypto/onramp/model/KycInfo.kt    |  28 +-
 .../onramp/model/KycRetrieveResponse.kt       |   4 +-
 .../repositories/CryptoApiRepository.kt       |  92 +++++
 .../crypto/onramp/CryptoApiRepositoryTest.kt  | 376 ++++++++++++++++--
 19 files changed, 899 insertions(+), 71 deletions(-)
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/CrsCarfDeclaration.kt

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 715e9837cfb..4d810dabe93 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -52,6 +52,108 @@ public final class com/stripe/android/crypto/onramp/exception/PaymentFailedExcep
 	public static final field $stable I
 }
 
+public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier {
+	public static final field $stable I
+	public fun <init> ()V
+	public final fun type (Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;)Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier;
+	public final fun value (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier;
+}
+
+public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAlternativeMissingIdentifiers ()Ljava/util/List;
+	public final fun getOriginalMissingIdentifiers ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getRegulation ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation;
+	public final fun getType ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAlternatives ()Ljava/util/List;
+	public final fun getIdentifiers ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType {
+	public static final field $stable I
+	public static final field Companion Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType$Companion;
+	public fun <init> (Ljava/lang/String;)V
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getValue ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType$Companion {
+	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getAT_STN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getBE_NRN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getBG_UCN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getCY_TIC ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getCZ_RC ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getDE_STN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getDK_CPR ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getEE_IK ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getFI_HETU ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getFR_SPI ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getGR_AFM ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getHR_OIB ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getHU_AD ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getIE_PPSN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getIS_KT ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getIT_CF ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getLT_AK ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getLU_NIF ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getLV_PK ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getMT_NIC ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getMT_PP ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getNL_BSN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getPL_NIP ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getPL_PESEL ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getPT_NIF ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getRO_CNP ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getSE_PIN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getSI_PIN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+	public final fun getSK_RC ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
+}
+
+public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation : java/lang/Enum {
+	public static final field Companion Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation$Companion;
+	public static final field EuCarf Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation;
+	public static final field EuMica Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public final fun getValue ()Ljava/lang/String;
+	public static fun valueOf (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation;
+	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation;
+}
+
+public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation$Companion {
+	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation;
+}
+
+public final class com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAlternatives ()Ljava/util/List;
+	public final fun getIdentifiers ()Ljava/util/List;
+	public final fun getInvalidIdentifiers ()Ljava/util/List;
+	public final fun getValid ()Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public final class com/stripe/android/crypto/onramp/model/CryptoNetwork : java/lang/Enum {
 	public static final field Aptos Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;
 	public static final field Avalanche Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;
@@ -79,58 +181,21 @@ public final class com/stripe/android/crypto/onramp/model/CryptoNetwork$Companio
 public final class com/stripe/android/crypto/onramp/model/KycInfo {
 	public static final field $stable I
 	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;Lcom/stripe/android/core/model/CountryCode;Ljava/lang/String;Ljava/util/List;)V
+	public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;Lcom/stripe/android/core/model/CountryCode;Ljava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAddress ()Lcom/stripe/android/paymentsheet/PaymentSheet$Address;
+	public final fun getBirthCity ()Ljava/lang/String;
+	public final fun getBirthCountry ()Lcom/stripe/android/core/model/CountryCode;
 	public final fun getDateOfBirth ()Lcom/stripe/android/model/DateOfBirth;
 	public final fun getFirstName ()Ljava/lang/String;
 	public final fun getIdNumber ()Ljava/lang/String;
 	public final fun getLastName ()Ljava/lang/String;
+	public final fun getNationalities ()Ljava/util/List;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/stripe/android/crypto/onramp/model/KycRetrieveResponse : android/os/Parcelable {
-	public static final field $stable I
-	public static final field CREATOR Landroid/os/Parcelable$Creator;
-	public static final field Companion Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse$Companion;
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;)V
-	public final fun component1 ()Ljava/lang/String;
-	public final fun component2 ()Ljava/lang/String;
-	public final fun component3 ()Ljava/lang/String;
-	public final fun component4 ()Ljava/lang/String;
-	public final fun component5 ()Lcom/stripe/android/model/DateOfBirth;
-	public final fun component6 ()Lcom/stripe/android/paymentsheet/PaymentSheet$Address;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;)Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse;
-	public static synthetic fun copy$default (Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/model/DateOfBirth;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;ILjava/lang/Object;)Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse;
-	public final fun describeContents ()I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAddress ()Lcom/stripe/android/paymentsheet/PaymentSheet$Address;
-	public final fun getDateOfBirth ()Lcom/stripe/android/model/DateOfBirth;
-	public final fun getFirstName ()Ljava/lang/String;
-	public final fun getIdNumberLastFour ()Ljava/lang/String;
-	public final fun getIdType ()Ljava/lang/String;
-	public final fun getLastName ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-	public final fun writeToParcel (Landroid/os/Parcel;I)V
-}
-
-public final synthetic class com/stripe/android/crypto/onramp/model/KycRetrieveResponse$$serializer : kotlinx/serialization/internal/GeneratedSerializer {
-	public static final field $stable I
-	public static final field INSTANCE Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse$$serializer;
-	public final fun childSerializers ()[Lkotlinx/serialization/KSerializer;
-	public final fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse;
-	public synthetic fun deserialize (Lkotlinx/serialization/encoding/Decoder;)Ljava/lang/Object;
-	public final fun getDescriptor ()Lkotlinx/serialization/descriptors/SerialDescriptor;
-	public final fun serialize (Lkotlinx/serialization/encoding/Encoder;Lcom/stripe/android/crypto/onramp/model/KycRetrieveResponse;)V
-	public synthetic fun serialize (Lkotlinx/serialization/encoding/Encoder;Ljava/lang/Object;)V
-	public fun typeParametersSerializers ()[Lkotlinx/serialization/KSerializer;
-}
-
-public final class com/stripe/android/crypto/onramp/model/KycRetrieveResponse$Companion {
-	public final fun serializer ()Lkotlinx/serialization/KSerializer;
-}
-
 public final class com/stripe/android/crypto/onramp/model/LinkUserInfo : android/os/Parcelable {
 	public static final field $stable I
 	public static final field CREATOR Landroid/os/Parcelable$Creator;
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt
new file mode 100644
index 00000000000..9c1dea8a770
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt
@@ -0,0 +1,45 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * A compliance identifier collected for MiCA or CRS/CARF compliance.
+ *
+ * @property type The type of identifier provided.
+ * @property value The identifier value.
+ */
+@ExperimentalCryptoOnramp
+class ComplianceIdentifier {
+    private var type: ComplianceIdentifierType? = null
+    private var value: String? = null
+
+    /**
+     * Sets the identifier type.
+     */
+    fun type(type: ComplianceIdentifierType) = apply {
+        this.type = type
+    }
+
+    /**
+     * Sets the identifier value.
+     */
+    fun value(value: String) = apply {
+        this.value = value
+    }
+
+    internal class State(
+        val type: ComplianceIdentifierType,
+        val value: String
+    )
+
+    internal fun build(): State {
+        return State(
+            type = requireNotNull(type) {
+                "type must not be null"
+            },
+            value = requireNotNull(value) {
+                "value must not be null"
+            }
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt
new file mode 100644
index 00000000000..0cec9834862
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt
@@ -0,0 +1,14 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import dev.drewhamilton.poko.Poko
+
+/**
+ * A group describing alternative identifier types that may satisfy a requirement.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class ComplianceIdentifierAlternativeGroup internal constructor(
+    val originalMissingIdentifiers: List<ComplianceIdentifierType>,
+    val alternativeMissingIdentifiers: List<ComplianceIdentifierType>
+)
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt
new file mode 100644
index 00000000000..7e4e3e14b16
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt
@@ -0,0 +1,19 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class ComplianceIdentifierAlternativeGroupResponse(
+    @SerialName("original_missing_identifiers")
+    val originalMissingIdentifiers: List<String>,
+    @SerialName("alternative_missing_identifiers")
+    val alternativeMissingIdentifiers: List<String>
+) {
+    fun toComplianceIdentifierAlternativeGroup(): ComplianceIdentifierAlternativeGroup {
+        return ComplianceIdentifierAlternativeGroup(
+            originalMissingIdentifiers = originalMissingIdentifiers.map(ComplianceIdentifierType::fromValue),
+            alternativeMissingIdentifiers = alternativeMissingIdentifiers.map(ComplianceIdentifierType::fromValue)
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt
new file mode 100644
index 00000000000..432b334cee3
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt
@@ -0,0 +1,14 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import dev.drewhamilton.poko.Poko
+
+/**
+ * A compliance identifier the customer still needs to provide.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class ComplianceIdentifierRequirement internal constructor(
+    val type: ComplianceIdentifierType,
+    val regulation: ComplianceRegulation
+)
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt
new file mode 100644
index 00000000000..2c469253b07
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt
@@ -0,0 +1,18 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class ComplianceIdentifierRequirementResponse(
+    val type: String,
+    val regulation: String
+) {
+    fun toComplianceIdentifierRequirement(): ComplianceIdentifierRequirement {
+        return ComplianceIdentifierRequirement(
+            type = ComplianceIdentifierType.fromValue(type),
+            regulation = requireNotNull(ComplianceRegulation.fromValue(regulation)) {
+                "Unrecognized compliance regulation: $regulation"
+            }
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt
new file mode 100644
index 00000000000..a1e8eedaed0
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt
@@ -0,0 +1,14 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import dev.drewhamilton.poko.Poko
+
+/**
+ * The compliance identifiers a customer still needs to provide.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class ComplianceIdentifierRequirements internal constructor(
+    val identifiers: List<ComplianceIdentifierRequirement>,
+    val alternatives: List<ComplianceIdentifierAlternativeGroup>
+)
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt
new file mode 100644
index 00000000000..89f6f23ac1c
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt
@@ -0,0 +1,16 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class ComplianceIdentifierRequirementsResponse(
+    val identifiers: List<ComplianceIdentifierRequirementResponse> = emptyList(),
+    val alternatives: List<ComplianceIdentifierAlternativeGroupResponse> = emptyList(),
+) {
+    fun toComplianceIdentifierRequirements(): ComplianceIdentifierRequirements {
+        return ComplianceIdentifierRequirements(
+            identifiers = identifiers.map { it.toComplianceIdentifierRequirement() },
+            alternatives = alternatives.map { it.toComplianceIdentifierAlternativeGroup() }
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt
new file mode 100644
index 00000000000..107b74ea611
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt
@@ -0,0 +1,55 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import dev.drewhamilton.poko.Poko
+
+/**
+ * The type of compliance identifier required or submitted for regulatory compliance.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class ComplianceIdentifierType(
+    val value: String
+) {
+    init {
+        require(value.isNotBlank()) {
+            "value must not be blank"
+        }
+    }
+
+    companion object {
+        val AT_STN = ComplianceIdentifierType("at_stn")
+        val BE_NRN = ComplianceIdentifierType("be_nrn")
+        val BG_UCN = ComplianceIdentifierType("bg_ucn")
+        val HR_OIB = ComplianceIdentifierType("hr_oib")
+        val CY_TIC = ComplianceIdentifierType("cy_tic")
+        val CZ_RC = ComplianceIdentifierType("cz_rc")
+        val DK_CPR = ComplianceIdentifierType("dk_cpr")
+        val EE_IK = ComplianceIdentifierType("ee_ik")
+        val FI_HETU = ComplianceIdentifierType("fi_hetu")
+        val FR_SPI = ComplianceIdentifierType("fr_spi")
+        val DE_STN = ComplianceIdentifierType("de_stn")
+        val GR_AFM = ComplianceIdentifierType("gr_afm")
+        val HU_AD = ComplianceIdentifierType("hu_ad")
+        val IS_KT = ComplianceIdentifierType("is_kt")
+        val IE_PPSN = ComplianceIdentifierType("ie_ppsn")
+        val IT_CF = ComplianceIdentifierType("it_cf")
+        val LV_PK = ComplianceIdentifierType("lv_pk")
+        val LT_AK = ComplianceIdentifierType("lt_ak")
+        val LU_NIF = ComplianceIdentifierType("lu_nif")
+        val MT_NIC = ComplianceIdentifierType("mt_nic")
+        val MT_PP = ComplianceIdentifierType("mt_pp")
+        val NL_BSN = ComplianceIdentifierType("nl_bsn")
+        val PL_PESEL = ComplianceIdentifierType("pl_pesel")
+        val PL_NIP = ComplianceIdentifierType("pl_nip")
+        val PT_NIF = ComplianceIdentifierType("pt_nif")
+        val RO_CNP = ComplianceIdentifierType("ro_cnp")
+        val SK_RC = ComplianceIdentifierType("sk_rc")
+        val SI_PIN = ComplianceIdentifierType("si_pin")
+        val SE_PIN = ComplianceIdentifierType("se_pin")
+
+        fun fromValue(value: String): ComplianceIdentifierType {
+            return ComplianceIdentifierType(value)
+        }
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt
new file mode 100644
index 00000000000..500e3bbc818
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt
@@ -0,0 +1,18 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * The regulation requiring a compliance identifier.
+ */
+@ExperimentalCryptoOnramp
+enum class ComplianceRegulation(val value: String) {
+    EuCarf("eu_carf"),
+    EuMica("eu_mica");
+
+    companion object {
+        fun fromValue(value: String): ComplianceRegulation? {
+            return entries.firstOrNull { it.value == value }
+        }
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt
new file mode 100644
index 00000000000..f777a2d6d72
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt
@@ -0,0 +1,32 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.model.CryptoCustomerRequestParams
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class SubmitIdentifiersRequest(
+    val credentials: CryptoCustomerRequestParams.Credentials,
+    val identifiers: List<ComplianceIdentifierRequest>
+)
+
+@Serializable
+internal data class ComplianceIdentifierRequest(
+    val type: String,
+    val value: String
+)
+
+internal fun List<ComplianceIdentifier>.toRequest(
+    credentials: CryptoCustomerRequestParams.Credentials
+): SubmitIdentifiersRequest {
+    return SubmitIdentifiersRequest(
+        credentials = credentials,
+        identifiers = map { it.build().toRequest() }
+    )
+}
+
+private fun ComplianceIdentifier.State.toRequest(): ComplianceIdentifierRequest {
+    return ComplianceIdentifierRequest(
+        type = type.value,
+        value = value
+    )
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt
new file mode 100644
index 00000000000..be3c5a8e132
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt
@@ -0,0 +1,22 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+internal data class SubmitIdentifiersResponse(
+    val valid: Boolean = true,
+    val identifiers: List<ComplianceIdentifierRequirementResponse> = emptyList(),
+    val alternatives: List<ComplianceIdentifierAlternativeGroupResponse> = emptyList(),
+    @SerialName("invalid_identifiers")
+    val invalidIdentifiers: List<String> = emptyList(),
+) {
+    fun toSubmitIdentifiersResult(): SubmitIdentifiersResult {
+        return SubmitIdentifiersResult(
+            valid = valid,
+            identifiers = identifiers.map { it.toComplianceIdentifierRequirement() },
+            alternatives = alternatives.map { it.toComplianceIdentifierAlternativeGroup() },
+            invalidIdentifiers = invalidIdentifiers.map(ComplianceIdentifierType::fromValue)
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt
new file mode 100644
index 00000000000..54aac5921c4
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt
@@ -0,0 +1,16 @@
+package com.stripe.android.crypto.onramp.model.Compliance
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import dev.drewhamilton.poko.Poko
+
+/**
+ * The result of submitting compliance identifiers for MiCA and CRS/CARF compliance.
+ */
+@ExperimentalCryptoOnramp
+@Poko
+class SubmitIdentifiersResult internal constructor(
+    val valid: Boolean,
+    val identifiers: List<ComplianceIdentifierRequirement>,
+    val alternatives: List<ComplianceIdentifierAlternativeGroup>,
+    val invalidIdentifiers: List<ComplianceIdentifierType>
+)
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/CrsCarfDeclaration.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/CrsCarfDeclaration.kt
new file mode 100644
index 00000000000..145739aa2bb
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/CrsCarfDeclaration.kt
@@ -0,0 +1,29 @@
+package com.stripe.android.crypto.onramp.model
+
+import dev.drewhamilton.poko.Poko
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+/**
+ * CRS/CARF declaration text that should be shown before recording acceptance.
+ */
+@Poko
+internal class CrsCarfDeclaration(
+    val text: String,
+    val version: String
+)
+
+@Serializable
+internal data class CrsCarfDeclarationResponse(
+    @SerialName("text")
+    val text: String,
+    @SerialName("version")
+    val version: String,
+) {
+    fun toDeclaration(): CrsCarfDeclaration {
+        return CrsCarfDeclaration(
+            text = text,
+            version = version
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt
index ffc2dcb8bc0..8f09e9ac17b 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt
@@ -21,6 +21,12 @@ internal data class KycCollectionRequest(
     @SerialName("dob")
     @Serializable(with = DateOfBirthSerializer::class)
     val dateOfBirth: DateOfBirth?,
+    @SerialName("birth_country")
+    val birthCountry: String?,
+    @SerialName("birth_city")
+    val birthCity: String?,
+    @SerialName("nationalities")
+    val nationalities: List<String>?,
     @SerialName("city")
     val city: String?,
     @SerialName("country")
@@ -50,6 +56,9 @@ internal data class KycCollectionRequest(
                 idNumber = kycInfo.idNumber.takeIf { !it.isNullOrEmpty() },
                 idType = SOCIAL_SECURITY_NUMBER.takeIf { !kycInfo.idNumber.isNullOrEmpty() },
                 dateOfBirth = kycInfo.dateOfBirth,
+                birthCountry = kycInfo.birthCountry?.value,
+                birthCity = kycInfo.birthCity.takeIf { !it.isNullOrEmpty() },
+                nationalities = kycInfo.nationalities?.map { it.value.trim() },
                 city = kycInfo.address?.city,
                 country = kycInfo.address?.country,
                 line1 = kycInfo.address?.line1,
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycInfo.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycInfo.kt
index ecd28f191f7..666aa7c47b7 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycInfo.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycInfo.kt
@@ -1,6 +1,7 @@
 package com.stripe.android.crypto.onramp.model
 
 import android.os.Parcelable
+import com.stripe.android.core.model.CountryCode
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import com.stripe.android.model.DateOfBirth
 import com.stripe.android.paymentsheet.PaymentSheet
@@ -15,6 +16,9 @@ import kotlinx.parcelize.Parcelize
  * @property idNumber The full identification number.
  * @property dateOfBirth The user’s date of birth.
  * @property address The user’s billing address.
+ * @property birthCountry The country where the user was born.
+ * @property birthCity The city where the user was born.
+ * @property nationalities The user's nationalities.
  */
 @ExperimentalCryptoOnramp
 @Poko
@@ -23,8 +27,28 @@ class KycInfo(
     val lastName: String?,
     val idNumber: String?,
     val dateOfBirth: DateOfBirth?,
-    val address: PaymentSheet.Address?
-)
+    val address: PaymentSheet.Address?,
+    val birthCountry: CountryCode? = null,
+    val birthCity: String? = null,
+    val nationalities: List<CountryCode>? = null
+) {
+    constructor(
+        firstName: String?,
+        lastName: String?,
+        idNumber: String?,
+        dateOfBirth: DateOfBirth?,
+        address: PaymentSheet.Address?
+    ) : this(
+        firstName = firstName,
+        lastName = lastName,
+        idNumber = idNumber,
+        dateOfBirth = dateOfBirth,
+        address = address,
+        birthCountry = null,
+        birthCity = null,
+        nationalities = null
+    )
+}
 
 /**
  * Represents a set of KYC information used when refreshing or revalidating
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycRetrieveResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycRetrieveResponse.kt
index fc55c2ea472..e7c8fbe5c1a 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycRetrieveResponse.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycRetrieveResponse.kt
@@ -1,7 +1,6 @@
 package com.stripe.android.crypto.onramp.model
 
 import android.os.Parcelable
-import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import com.stripe.android.model.DateOfBirth
 import com.stripe.android.paymentsheet.PaymentSheet
 import kotlinx.parcelize.Parcelize
@@ -14,8 +13,7 @@ import kotlinx.serialization.Serializable
  */
 @Serializable
 @Parcelize
-@ExperimentalCryptoOnramp
-data class KycRetrieveResponse(
+internal data class KycRetrieveResponse(
     @SerialName("first_name")
     val firstName: String,
     @SerialName("last_name")
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index d04bbdc564e..5413cbb4079 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -11,8 +11,13 @@ import com.stripe.android.core.networking.StripeRequest
 import com.stripe.android.core.networking.executeRequestWithKSerializerParser
 import com.stripe.android.core.networking.toMap
 import com.stripe.android.core.version.StripeSdkVersion
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirements
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirementsResponse
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenRequest
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
+import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
+import com.stripe.android.crypto.onramp.model.CrsCarfDeclarationResponse
 import com.stripe.android.crypto.onramp.model.CryptoCustomerRequestParams
 import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
@@ -26,6 +31,9 @@ import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationRequest
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
+import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResponse
+import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResult
+import com.stripe.android.crypto.onramp.model.Compliance.toRequest
 import com.stripe.android.link.LinkController
 import com.stripe.android.link.utils.isLinkAuthorizationError
 import com.stripe.android.model.PaymentIntent
@@ -46,6 +54,7 @@ import javax.inject.Singleton
 */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP_PREFIX)
 @Singleton
+@Suppress("TooManyFunctions")
 internal class CryptoApiRepository @Inject constructor(
     private val stripeNetworkClient: StripeNetworkClient,
     private val stripeRepository: StripeRepository,
@@ -117,6 +126,61 @@ internal class CryptoApiRepository @Inject constructor(
         )
     }
 
+    suspend fun retrieveMissingIdentifiers(
+        consumerSessionClientSecret: String
+    ): Result<ComplianceIdentifierRequirements> {
+        val request = apiRequestFactory.createGet(
+            url = identifierRequirementsUrl,
+            options = buildRequestOptions(),
+            params = credentialsParams(consumerSessionClientSecret).toMap(),
+        )
+
+        return execute(
+            request = request,
+            responseSerializer = ComplianceIdentifierRequirementsResponse.serializer()
+        ).mapCatching { it.toComplianceIdentifierRequirements() }
+    }
+
+    suspend fun submitIdentifiers(
+        identifiers: List<ComplianceIdentifier>,
+        consumerSessionClientSecret: String
+    ): Result<SubmitIdentifiersResult> {
+        return executePost(
+            submitIdentifiersUrl,
+            Json.encodeToJsonElement(
+                identifiers.toRequest(
+                    credentials = CryptoCustomerRequestParams.Credentials(consumerSessionClientSecret)
+                )
+            ).jsonObject,
+            SubmitIdentifiersResponse.serializer()
+        ).mapCatching { it.toSubmitIdentifiersResult() }
+    }
+
+    suspend fun retrieveCrsCarfDeclaration(
+        consumerSessionClientSecret: String
+    ): Result<CrsCarfDeclaration> {
+        val request = apiRequestFactory.createGet(
+            url = crsCarfDeclarationUrl,
+            options = buildRequestOptions(),
+            params = credentialsParams(consumerSessionClientSecret).toMap(),
+        )
+
+        return execute(
+            request = request,
+            responseSerializer = CrsCarfDeclarationResponse.serializer()
+        ).map { it.toDeclaration() }
+    }
+
+    suspend fun confirmCrsCarfDeclaration(
+        consumerSessionClientSecret: String
+    ): Result<Unit> {
+        return executePost(
+            crsCarfDeclarationUrl,
+            credentialsParams(consumerSessionClientSecret),
+            Unit.serializer()
+        )
+    }
+
     suspend fun refreshKycData(
         kycInfo: RefreshKycInfo,
         consumerSessionClientSecret: String
@@ -264,6 +328,16 @@ internal class CryptoApiRepository @Inject constructor(
         )
     }
 
+    private fun credentialsParams(
+        consumerSessionClientSecret: String
+    ): JsonObject {
+        return Json.encodeToJsonElement(
+            CryptoCustomerRequestParams(
+                CryptoCustomerRequestParams.Credentials(consumerSessionClientSecret)
+            )
+        ).jsonObject
+    }
+
     private suspend fun <Response> executePost(
         url: String,
         paramsJson: JsonObject,
@@ -312,6 +386,24 @@ internal class CryptoApiRepository @Inject constructor(
         internal val collectKycDataUrl: String
             get() = getApiUrl("crypto/internal/kyc_data_collection")
 
+        /**
+         * @return `https://api.stripe.com/v1/crypto/internal/identifier_requirements`
+         */
+        internal val identifierRequirementsUrl: String
+            get() = getApiUrl("crypto/internal/identifier_requirements")
+
+        /**
+         * @return `https://api.stripe.com/v1/crypto/internal/eu_identifiers`
+         */
+        internal val submitIdentifiersUrl: String
+            get() = getApiUrl("crypto/internal/eu_identifiers")
+
+        /**
+         * @return `https://api.stripe.com/v1/crypto/internal/crs_carf_declaration`
+         */
+        internal val crsCarfDeclarationUrl: String
+            get() = getApiUrl("crypto/internal/crs_carf_declaration")
+
         /**
          * @return `https://api.stripe.com/v1/crypto/internal/wallet`
          */
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 7ccf30fdbad..9c02b7541cd 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -2,13 +2,20 @@ package com.stripe.android.crypto.onramp
 
 import com.google.common.truth.Truth.assertThat
 import com.stripe.android.core.ApiVersion
+import com.stripe.android.core.model.CountryCode
 import com.stripe.android.core.networking.ApiRequest
 import com.stripe.android.core.networking.StripeNetworkClient
 import com.stripe.android.core.networking.StripeResponse
 import com.stripe.android.core.version.StripeSdkVersion
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierAlternativeGroup
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirement
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierType
+import com.stripe.android.crypto.onramp.model.Compliance.ComplianceRegulation
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
+import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.link.LinkController
 import com.stripe.android.model.DateOfBirth
@@ -26,6 +33,7 @@ import org.mockito.kotlin.whenever
 import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
+@Suppress("LargeClass")
 class CryptoApiRepositoryTest {
     private val stripeNetworkClient: StripeNetworkClient = mock()
     private val stripeRepository = mock<StripeRepository>()
@@ -125,42 +133,286 @@ class CryptoApiRepositoryTest {
                     lastName = "User",
                     idNumber = "999-88-7777",
                     dateOfBirth = DateOfBirth(day = 1, month = 3, year = 1975),
-                    address = PaymentSheet.Address(city = "Orlando", state = "FL")
+                    address = PaymentSheet.Address(city = "Orlando", state = "FL"),
+                    birthCountry = CountryCode.create("IE"),
+                    birthCity = "Dublin",
+                    nationalities = listOf(CountryCode.create("IE"), CountryCode.create("FR"))
                 ),
                 consumerSessionClientSecret = "test-secret"
             )
 
+            verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
+
+            assertThat(result.isSuccess)
+                .isEqualTo(true)
+            assertKycCollectionRequest(apiRequestArgumentCaptor.firstValue)
+        }
+    }
+
+    @Test
+    fun testCollectKycDataTrimsNationalities() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                "{}",
+                emptyMap()
+            )
+
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.collectKycData(
+                KycInfo(
+                    firstName = "Test",
+                    lastName = "User",
+                    idNumber = "999-88-7777",
+                    dateOfBirth = DateOfBirth(day = 1, month = 3, year = 1975),
+                    address = PaymentSheet.Address(city = "Orlando", state = "FL"),
+                    nationalities = listOf(
+                        CountryCode(" IE "),
+                        CountryCode("\nFR\t"),
+                    )
+                ),
+                consumerSessionClientSecret = "test-secret"
+            )
+
+            verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
+
+            assertThat(result.isSuccess).isTrue()
+            assertThat(apiRequestArgumentCaptor.firstValue.params?.get("nationalities"))
+                .isEqualTo(listOf("IE", "FR"))
+        }
+    }
+
+    @Test
+    fun testRetrieveMissingIdentifiersSucceeds() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                """
+                    {
+                        "alternatives": [
+                            {
+                                "alternative_missing_identifiers": ["mt_pp"],
+                                "original_missing_identifiers": ["mt_nic"]
+                            }
+                        ],
+                        "identifiers": [
+                            {
+                                "regulation": "eu_mica",
+                                "type": "mt_nic"
+                            },
+                            {
+                                "regulation": "eu_carf",
+                                "type": "fr_spi"
+                            }
+                        ]
+                    }
+                    """,
+                emptyMap()
+            )
+
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.retrieveMissingIdentifiers(
+                consumerSessionClientSecret = "test-secret"
+            )
+
             verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
             val apiRequest = apiRequestArgumentCaptor.firstValue
 
             assertThat(apiRequest.baseUrl)
-                .isEqualTo("https://api.stripe.com/v1/crypto/internal/kyc_data_collection")
+                .isEqualTo("https://api.stripe.com/v1/crypto/internal/identifier_requirements")
+            assertThat(apiRequest.params)
+                .isEqualTo(mapOf("credentials" to mapOf("consumer_session_client_secret" to "test-secret")))
 
-            val params = apiRequest.params!!
-            val dobValue = params["dob"] as Map<*, *>
-            assertThat(params["first_name"]).isEqualTo("Test")
-            assertThat(params["last_name"]).isEqualTo("User")
-            assertThat(params["id_number"]).isEqualTo("999-88-7777")
-            assertThat(params["id_type"]).isEqualTo("social_security_number") // Hardcoded to match iOS
-            assertThat(dobValue["day"]).isEqualTo("1")
-            assertThat(dobValue["month"]).isEqualTo("3")
-            assertThat(dobValue["year"]).isEqualTo("1975")
-            assertThat(params["nationalities"]).isNull()
-            assertThat(params["birth_country"]).isNull()
-            assertThat(params["birth_city"]).isNull()
-            assertThat(params["city"]).isEqualTo("Orlando")
-            assertThat(params["state"]).isEqualTo("FL")
-            assertThat(params["country"]).isNull()
-            assertThat(params["line1"]).isNull()
-            assertThat(params["line2"]).isNull()
-            assertThat(params["zip"]).isNull()
+            assertThat(result.isSuccess).isTrue()
+            assertThat(result.getOrThrow().identifiers)
+                .containsExactly(
+                    ComplianceIdentifierRequirement(
+                        type = ComplianceIdentifierType.MT_NIC,
+                        regulation = ComplianceRegulation.EuMica
+                    ),
+                    ComplianceIdentifierRequirement(
+                        type = ComplianceIdentifierType.FR_SPI,
+                        regulation = ComplianceRegulation.EuCarf
+                    )
+                )
+            assertThat(result.getOrThrow().alternatives)
+                .containsExactly(
+                    ComplianceIdentifierAlternativeGroup(
+                        originalMissingIdentifiers = listOf(ComplianceIdentifierType.MT_NIC),
+                        alternativeMissingIdentifiers = listOf(ComplianceIdentifierType.MT_PP)
+                    )
+                )
+        }
+    }
 
-            assertThat(params["credentials"]).isEqualTo(
-                mapOf("consumer_session_client_secret" to "test-secret")
+    @Test
+    fun testSubmitIdentifiersSucceeds() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                """
+                    {
+                        "alternatives": [
+                            {
+                                "alternative_missing_identifiers": [
+                                    "mt_pp"
+                                ],
+                                "original_missing_identifiers": [
+                                    "mt_nic"
+                                ]
+                            }
+                        ],
+                        "identifiers": [
+                            {
+                                "regulation": "eu_carf",
+                                "type": "de_stn"
+                            },
+                            {
+                                "regulation": "eu_carf",
+                                "type": "mt_nic"
+                            },
+                            {
+                                "regulation": "eu_mica",
+                                "type": "mt_nic"
+                            }
+                        ],
+                        "invalid_identifiers": [
+                            "de_stn",
+                            "mt_nic"
+                        ],
+                        "valid": false,
+                        "ignored_field": "ignored"
+                    }
+                    """,
+                emptyMap()
             )
 
-            assertThat(result.isSuccess)
-                .isEqualTo(true)
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.submitIdentifiers(
+                identifiers = listOf(
+                    ComplianceIdentifier()
+                        .type(ComplianceIdentifierType.MT_NIC)
+                        .value("mica_123"),
+                    ComplianceIdentifier()
+                        .type(ComplianceIdentifierType.FR_SPI)
+                        .value("carf_456")
+                ),
+                consumerSessionClientSecret = "test-secret"
+            )
+
+            verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
+            assertIdentifiersRequest(apiRequestArgumentCaptor.firstValue)
+            assertThat(result.isSuccess).isTrue()
+            assertSubmitIdentifiersResult(result.getOrThrow())
+        }
+    }
+
+    @Test
+    fun testSubmitIdentifiersSucceedsWhenValid() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                """
+                    {
+                        "alternatives": [],
+                        "identifiers": [],
+                        "invalid_identifiers": [],
+                        "valid": true
+                    }
+                    """,
+                emptyMap()
+            )
+
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.submitIdentifiers(
+                identifiers = listOf(
+                    ComplianceIdentifier()
+                        .type(ComplianceIdentifierType.MT_NIC)
+                        .value("mica_123")
+                ),
+                consumerSessionClientSecret = "test-secret"
+            )
+
+            assertThat(result.isSuccess).isTrue()
+            assertThat(result.getOrThrow())
+                .isEqualTo(
+                    SubmitIdentifiersResult(
+                        valid = true,
+                        identifiers = emptyList(),
+                        alternatives = emptyList(),
+                        invalidIdentifiers = emptyList()
+                    )
+                )
+        }
+    }
+
+    @Test
+    fun testRetrieveCrsCarfDeclarationSucceeds() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                """
+                    {
+                        "text": "I confirm this declaration.",
+                        "version": "2026-04-23"
+                    }
+                    """,
+                emptyMap()
+            )
+
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.retrieveCrsCarfDeclaration(
+                consumerSessionClientSecret = "test-secret"
+            )
+
+            verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
+            val apiRequest = apiRequestArgumentCaptor.firstValue
+
+            assertThat(apiRequest.baseUrl)
+                .isEqualTo("https://api.stripe.com/v1/crypto/internal/crs_carf_declaration")
+            assertThat(apiRequest.params)
+                .isEqualTo(mapOf("credentials" to mapOf("consumer_session_client_secret" to "test-secret")))
+            assertThat(result.getOrThrow().text)
+                .isEqualTo("I confirm this declaration.")
+            assertThat(result.getOrThrow().version)
+                .isEqualTo("2026-04-23")
+        }
+    }
+
+    @Test
+    fun testConfirmCrsCarfDeclarationSucceeds() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                "{}",
+                emptyMap()
+            )
+
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.confirmCrsCarfDeclaration(
+                consumerSessionClientSecret = "test-secret"
+            )
+
+            verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
+            val apiRequest = apiRequestArgumentCaptor.firstValue
+
+            assertThat(apiRequest.baseUrl)
+                .isEqualTo("https://api.stripe.com/v1/crypto/internal/crs_carf_declaration")
+            assertThat(apiRequest.params)
+                .isEqualTo(mapOf("credentials" to mapOf("consumer_session_client_secret" to "test-secret")))
+            assertThat(result.isSuccess).isTrue()
         }
     }
 
@@ -491,4 +743,80 @@ class CryptoApiRepositoryTest {
                 .isEqualTo(true)
         }
     }
+
+    private fun assertKycCollectionRequest(apiRequest: ApiRequest) {
+        assertThat(apiRequest.baseUrl)
+            .isEqualTo("https://api.stripe.com/v1/crypto/internal/kyc_data_collection")
+
+        val params = apiRequest.params!!
+        val dobValue = params["dob"] as Map<*, *>
+        assertThat(params["first_name"]).isEqualTo("Test")
+        assertThat(params["last_name"]).isEqualTo("User")
+        assertThat(params["id_number"]).isEqualTo("999-88-7777")
+        assertThat(params["id_type"]).isEqualTo("social_security_number") // Hardcoded to match iOS
+        assertThat(dobValue["day"]).isEqualTo("1")
+        assertThat(dobValue["month"]).isEqualTo("3")
+        assertThat(dobValue["year"]).isEqualTo("1975")
+        assertThat(params["nationalities"]).isEqualTo(listOf("IE", "FR"))
+        assertThat(params["birth_country"]).isEqualTo("IE")
+        assertThat(params["birth_city"]).isEqualTo("Dublin")
+        assertThat(params["city"]).isEqualTo("Orlando")
+        assertThat(params["state"]).isEqualTo("FL")
+        assertThat(params["country"]).isNull()
+        assertThat(params["line1"]).isNull()
+        assertThat(params["line2"]).isNull()
+        assertThat(params["zip"]).isNull()
+        assertThat(params["credentials"]).isEqualTo(
+            mapOf("consumer_session_client_secret" to "test-secret")
+        )
+    }
+
+    private fun assertIdentifiersRequest(apiRequest: ApiRequest) {
+        assertThat(apiRequest.baseUrl)
+            .isEqualTo("https://api.stripe.com/v1/crypto/internal/eu_identifiers")
+        assertThat(apiRequest.params)
+            .isEqualTo(
+                mapOf(
+                    "credentials" to mapOf("consumer_session_client_secret" to "test-secret"),
+                    "identifiers" to listOf(
+                        mapOf(
+                            "type" to "mt_nic",
+                            "value" to "mica_123"
+                        ),
+                        mapOf(
+                            "type" to "fr_spi",
+                            "value" to "carf_456"
+                        )
+                    )
+                )
+            )
+    }
+
+    private fun assertSubmitIdentifiersResult(result: SubmitIdentifiersResult) {
+        assertThat(result.valid).isFalse()
+        assertThat(result.identifiers)
+            .containsExactly(
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.DE_STN,
+                    regulation = ComplianceRegulation.EuCarf
+                ),
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.MT_NIC,
+                    regulation = ComplianceRegulation.EuCarf
+                ),
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.MT_NIC,
+                    regulation = ComplianceRegulation.EuMica
+                )
+            )
+        assertThat(result.alternatives)
+            .containsExactly(
+                ComplianceIdentifierAlternativeGroup(
+                    originalMissingIdentifiers = listOf(ComplianceIdentifierType.MT_NIC),
+                    alternativeMissingIdentifiers = listOf(ComplianceIdentifierType.MT_PP)
+                )
+            )
+        assertThat(result.invalidIdentifiers)
+            .isEqualTo(listOf(ComplianceIdentifierType.DE_STN, ComplianceIdentifierType.MT_NIC))
+    }
 }

From d052ed75218ba63d82326dd5cb28927f94cccfd3 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 4 May 2026 16:18:06 -0400
Subject: [PATCH 21/57] linting

---
 .../ComplianceIdentifier.kt                          |  2 +-
 .../ComplianceIdentifierAlternativeGroup.kt          |  2 +-
 .../ComplianceIdentifierAlternativeGroupResponse.kt  |  2 +-
 .../ComplianceIdentifierRequirement.kt               |  2 +-
 .../ComplianceIdentifierRequirementResponse.kt       |  2 +-
 .../ComplianceIdentifierRequirements.kt              |  2 +-
 .../ComplianceIdentifierRequirementsResponse.kt      |  2 +-
 .../ComplianceIdentifierType.kt                      |  2 +-
 .../ComplianceRegulation.kt                          |  2 +-
 .../SubmitIdentifiersRequest.kt                      |  2 +-
 .../SubmitIdentifiersResponse.kt                     |  2 +-
 .../SubmitIdentifiersResult.kt                       |  2 +-
 .../onramp/repositories/CryptoApiRepository.kt       | 12 ++++++------
 .../android/crypto/onramp/CryptoApiRepositoryTest.kt | 12 ++++++------
 14 files changed, 24 insertions(+), 24 deletions(-)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifier.kt (94%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierAlternativeGroup.kt (88%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierAlternativeGroupResponse.kt (92%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierRequirement.kt (85%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierRequirementResponse.kt (90%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierRequirements.kt (87%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierRequirementsResponse.kt (91%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierType.kt (97%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceRegulation.kt (87%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/SubmitIdentifiersRequest.kt (93%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/SubmitIdentifiersResponse.kt (93%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/SubmitIdentifiersResult.kt (89%)

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifier.kt
similarity index 94%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifier.kt
index 9c1dea8a770..3b5c755eabb 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifier.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroup.kt
similarity index 88%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroup.kt
index 0cec9834862..553f05688bb 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroup.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import dev.drewhamilton.poko.Poko
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroupResponse.kt
similarity index 92%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroupResponse.kt
index 7e4e3e14b16..b5724cc945e 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroupResponse.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirement.kt
similarity index 85%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirement.kt
index 432b334cee3..a6cb1c245c2 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirement.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import dev.drewhamilton.poko.Poko
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirementResponse.kt
similarity index 90%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirementResponse.kt
index 2c469253b07..6642c71f124 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirementResponse.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import kotlinx.serialization.Serializable
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirements.kt
similarity index 87%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirements.kt
index a1e8eedaed0..2b2268c82fc 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirements.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import dev.drewhamilton.poko.Poko
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirementsResponse.kt
similarity index 91%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirementsResponse.kt
index 89f6f23ac1c..9136b41b8bd 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirementsResponse.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import kotlinx.serialization.Serializable
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType.kt
similarity index 97%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType.kt
index 107b74ea611..5a4f198e820 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import dev.drewhamilton.poko.Poko
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation.kt
similarity index 87%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation.kt
index 500e3bbc818..fd8638dcd9e 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersRequest.kt
similarity index 93%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersRequest.kt
index f777a2d6d72..a38abc9ff95 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersRequest.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.model.CryptoCustomerRequestParams
 import kotlinx.serialization.Serializable
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResponse.kt
similarity index 93%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResponse.kt
index be3c5a8e132..a2d51ea2109 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResponse.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResult.kt
similarity index 89%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResult.kt
index 54aac5921c4..ace3299f742 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResult.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import dev.drewhamilton.poko.Poko
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index 5413cbb4079..bd7a055ee2d 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -11,9 +11,6 @@ import com.stripe.android.core.networking.StripeRequest
 import com.stripe.android.core.networking.executeRequestWithKSerializerParser
 import com.stripe.android.core.networking.toMap
 import com.stripe.android.core.version.StripeSdkVersion
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirements
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirementsResponse
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenRequest
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
@@ -31,9 +28,12 @@ import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationRequest
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
-import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResponse
-import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResult
-import com.stripe.android.crypto.onramp.model.Compliance.toRequest
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirements
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirementsResponse
+import com.stripe.android.crypto.onramp.model.compliance.SubmitIdentifiersResponse
+import com.stripe.android.crypto.onramp.model.compliance.SubmitIdentifiersResult
+import com.stripe.android.crypto.onramp.model.compliance.toRequest
 import com.stripe.android.link.LinkController
 import com.stripe.android.link.utils.isLinkAuthorizationError
 import com.stripe.android.model.PaymentIntent
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 9c02b7541cd..a5f828aae4d 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -7,15 +7,15 @@ import com.stripe.android.core.networking.ApiRequest
 import com.stripe.android.core.networking.StripeNetworkClient
 import com.stripe.android.core.networking.StripeResponse
 import com.stripe.android.core.version.StripeSdkVersion
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierAlternativeGroup
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirement
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierType
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceRegulation
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
-import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResult
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierAlternativeGroup
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirement
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierType
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceRegulation
+import com.stripe.android.crypto.onramp.model.compliance.SubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.link.LinkController
 import com.stripe.android.model.DateOfBirth

From 64c4f15cdfd5f8820255f737f16b25625eb0bba0 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 4 May 2026 16:18:36 -0400
Subject: [PATCH 22/57] Update crypto-onramp.api

---
 crypto-onramp/api/crypto-onramp.api | 204 ++++++++++++++--------------
 1 file changed, 102 insertions(+), 102 deletions(-)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 4d810dabe93..c94b43aaaa1 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -52,108 +52,6 @@ public final class com/stripe/android/crypto/onramp/exception/PaymentFailedExcep
 	public static final field $stable I
 }
 
-public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier {
-	public static final field $stable I
-	public fun <init> ()V
-	public final fun type (Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;)Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier;
-	public final fun value (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier;
-}
-
-public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup {
-	public static final field $stable I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAlternativeMissingIdentifiers ()Ljava/util/List;
-	public final fun getOriginalMissingIdentifiers ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement {
-	public static final field $stable I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getRegulation ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation;
-	public final fun getType ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements {
-	public static final field $stable I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAlternatives ()Ljava/util/List;
-	public final fun getIdentifiers ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType {
-	public static final field $stable I
-	public static final field Companion Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType$Companion;
-	public fun <init> (Ljava/lang/String;)V
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getValue ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType$Companion {
-	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getAT_STN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getBE_NRN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getBG_UCN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getCY_TIC ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getCZ_RC ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getDE_STN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getDK_CPR ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getEE_IK ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getFI_HETU ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getFR_SPI ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getGR_AFM ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getHR_OIB ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getHU_AD ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getIE_PPSN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getIS_KT ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getIT_CF ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getLT_AK ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getLU_NIF ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getLV_PK ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getMT_NIC ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getMT_PP ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getNL_BSN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getPL_NIP ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getPL_PESEL ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getPT_NIF ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getRO_CNP ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getSE_PIN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getSI_PIN ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-	public final fun getSK_RC ()Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType;
-}
-
-public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation : java/lang/Enum {
-	public static final field Companion Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation$Companion;
-	public static final field EuCarf Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation;
-	public static final field EuMica Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public final fun getValue ()Ljava/lang/String;
-	public static fun valueOf (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation;
-	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation;
-}
-
-public final class com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation$Companion {
-	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation;
-}
-
-public final class com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult {
-	public static final field $stable I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAlternatives ()Ljava/util/List;
-	public final fun getIdentifiers ()Ljava/util/List;
-	public final fun getInvalidIdentifiers ()Ljava/util/List;
-	public final fun getValid ()Z
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
 public final class com/stripe/android/crypto/onramp/model/CryptoNetwork : java/lang/Enum {
 	public static final field Aptos Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;
 	public static final field Avalanche Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;
@@ -519,3 +417,105 @@ public final class com/stripe/android/crypto/onramp/model/PaymentMethodType : ja
 	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/PaymentMethodType;
 }
 
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifier {
+	public static final field $stable I
+	public fun <init> ()V
+	public final fun type (Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;)Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifier;
+	public final fun value (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifier;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroup {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAlternativeMissingIdentifiers ()Ljava/util/List;
+	public final fun getOriginalMissingIdentifiers ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirement {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getRegulation ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation;
+	public final fun getType ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirements {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAlternatives ()Ljava/util/List;
+	public final fun getIdentifiers ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType {
+	public static final field $stable I
+	public static final field Companion Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType$Companion;
+	public fun <init> (Ljava/lang/String;)V
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getValue ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType$Companion {
+	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getAT_STN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getBE_NRN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getBG_UCN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getCY_TIC ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getCZ_RC ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getDE_STN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getDK_CPR ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getEE_IK ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getFI_HETU ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getFR_SPI ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getGR_AFM ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getHR_OIB ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getHU_AD ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getIE_PPSN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getIS_KT ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getIT_CF ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getLT_AK ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getLU_NIF ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getLV_PK ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getMT_NIC ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getMT_PP ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getNL_BSN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getPL_NIP ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getPL_PESEL ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getPT_NIF ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getRO_CNP ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getSE_PIN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getSI_PIN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getSK_RC ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation : java/lang/Enum {
+	public static final field Companion Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation$Companion;
+	public static final field EuCarf Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation;
+	public static final field EuMica Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public final fun getValue ()Ljava/lang/String;
+	public static fun valueOf (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation;
+	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation$Companion {
+	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResult {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAlternatives ()Ljava/util/List;
+	public final fun getIdentifiers ()Ljava/util/List;
+	public final fun getInvalidIdentifiers ()Ljava/util/List;
+	public final fun getValid ()Z
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+

From 130851d24a8499c346e4e1160e7022464b279973 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 4 May 2026 16:21:58 -0400
Subject: [PATCH 23/57] linting

---
 crypto-onramp/api/crypto-onramp.api           | 188 +++++++++---------
 .../crypto/onramp/OnrampCoordinator.kt        |   2 +-
 .../android/crypto/onramp/OnrampInteractor.kt |   2 +-
 .../OnrampRetrieveMissingIdentifiersResult.kt |   2 +-
 .../model/OnrampSubmitIdentifiersResult.kt    |   2 +-
 .../ComplianceIdentifier.kt                   |   2 +-
 .../ComplianceIdentifierAlternativeGroup.kt   |   2 +-
 ...ianceIdentifierAlternativeGroupResponse.kt |   2 +-
 .../ComplianceIdentifierRequirement.kt        |   2 +-
 ...ComplianceIdentifierRequirementResponse.kt |   2 +-
 .../ComplianceIdentifierRequirements.kt       |   2 +-
 ...omplianceIdentifierRequirementsResponse.kt |   2 +-
 .../ComplianceIdentifierType.kt               |   2 +-
 .../ComplianceRegulation.kt                   |   2 +-
 .../SubmitIdentifiersRequest.kt               |   2 +-
 .../SubmitIdentifiersResponse.kt              |   2 +-
 .../SubmitIdentifiersResult.kt                |   2 +-
 .../repositories/CryptoApiRepository.kt       |  12 +-
 .../crypto/onramp/CryptoApiRepositoryTest.kt  |  12 +-
 .../crypto/onramp/OnrampInteractorTest.kt     |  14 +-
 20 files changed, 129 insertions(+), 129 deletions(-)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifier.kt (94%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierAlternativeGroup.kt (88%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierAlternativeGroupResponse.kt (92%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierRequirement.kt (85%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierRequirementResponse.kt (90%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierRequirements.kt (87%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierRequirementsResponse.kt (91%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceIdentifierType.kt (97%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/ComplianceRegulation.kt (87%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/SubmitIdentifiersRequest.kt (93%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/SubmitIdentifiersResponse.kt (93%)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/{Compliance => compliance}/SubmitIdentifiersResult.kt (89%)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 3ba31eef714..9aa16a39e7c 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -55,97 +55,6 @@ public final class com/stripe/android/crypto/onramp/exception/PaymentFailedExcep
 	public static final field $stable I
 }
 
-public final class com/stripe/android/crypto/onramp/model/ComplianceIdentifier {
-	public static final field $stable I
-	public fun <init> ()V
-	public final fun type (Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;)Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifier;
-	public final fun value (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifier;
-}
-
-public final class com/stripe/android/crypto/onramp/model/ComplianceIdentifierAlternativeGroup {
-	public static final field $stable I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAlternativeMissingIdentifiers ()Ljava/util/List;
-	public final fun getOriginalMissingIdentifiers ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/stripe/android/crypto/onramp/model/ComplianceIdentifierRequirement {
-	public static final field $stable I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getRegulation ()Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation;
-	public final fun getType ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/stripe/android/crypto/onramp/model/ComplianceIdentifierRequirements {
-	public static final field $stable I
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAlternatives ()Ljava/util/List;
-	public final fun getIdentifiers ()Ljava/util/List;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/stripe/android/crypto/onramp/model/ComplianceIdentifierType {
-	public static final field $stable I
-	public static final field Companion Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType$Companion;
-	public fun <init> (Ljava/lang/String;)V
-	public fun equals (Ljava/lang/Object;)Z
-	public final fun getValue ()Ljava/lang/String;
-	public fun hashCode ()I
-	public fun toString ()Ljava/lang/String;
-}
-
-public final class com/stripe/android/crypto/onramp/model/ComplianceIdentifierType$Companion {
-	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getAT_STN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getBE_NRN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getBG_UCN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getCY_TIC ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getCZ_RC ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getDE_STN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getDK_CPR ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getEE_IK ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getFI_HETU ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getFR_SPI ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getGR_AFM ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getHR_OIB ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getHU_AD ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getIE_PPSN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getIS_KT ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getIT_CF ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getLT_AK ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getLU_NIF ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getLV_PK ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getMT_NIC ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getMT_PP ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getNL_BSN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getPL_NIP ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getPL_PESEL ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getPT_NIF ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getRO_CNP ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getSE_PIN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getSI_PIN ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-	public final fun getSK_RC ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierType;
-}
-
-public final class com/stripe/android/crypto/onramp/model/ComplianceRegulation : java/lang/Enum {
-	public static final field Companion Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation$Companion;
-	public static final field EuCarf Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation;
-	public static final field EuMica Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation;
-	public static fun getEntries ()Lkotlin/enums/EnumEntries;
-	public final fun getValue ()Ljava/lang/String;
-	public static fun valueOf (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation;
-	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation;
-}
-
-public final class com/stripe/android/crypto/onramp/model/ComplianceRegulation$Companion {
-	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/ComplianceRegulation;
-}
-
 public final class com/stripe/android/crypto/onramp/model/CryptoNetwork : java/lang/Enum {
 	public static final field Aptos Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;
 	public static final field Avalanche Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;
@@ -407,7 +316,7 @@ public abstract interface class com/stripe/android/crypto/onramp/model/OnrampRet
 
 public final class com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult$Completed : com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult {
 	public static final field $stable I
-	public final fun getRequirements ()Lcom/stripe/android/crypto/onramp/model/ComplianceIdentifierRequirements;
+	public final fun getRequirements ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirements;
 }
 
 public final class com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult$Failed : com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult {
@@ -420,7 +329,7 @@ public abstract interface class com/stripe/android/crypto/onramp/model/OnrampSub
 
 public final class com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult$Completed : com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult {
 	public static final field $stable I
-	public final fun getResult ()Lcom/stripe/android/crypto/onramp/model/SubmitIdentifiersResult;
+	public final fun getResult ()Lcom/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResult;
 }
 
 public final class com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult$Failed : com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult {
@@ -558,7 +467,98 @@ public final class com/stripe/android/crypto/onramp/model/PaymentMethodType : ja
 	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/PaymentMethodType;
 }
 
-public final class com/stripe/android/crypto/onramp/model/SubmitIdentifiersResult {
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifier {
+	public static final field $stable I
+	public fun <init> ()V
+	public final fun type (Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;)Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifier;
+	public final fun value (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifier;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroup {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAlternativeMissingIdentifiers ()Ljava/util/List;
+	public final fun getOriginalMissingIdentifiers ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirement {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getRegulation ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation;
+	public final fun getType ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirements {
+	public static final field $stable I
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getAlternatives ()Ljava/util/List;
+	public final fun getIdentifiers ()Ljava/util/List;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType {
+	public static final field $stable I
+	public static final field Companion Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType$Companion;
+	public fun <init> (Ljava/lang/String;)V
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getValue ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType$Companion {
+	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getAT_STN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getBE_NRN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getBG_UCN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getCY_TIC ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getCZ_RC ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getDE_STN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getDK_CPR ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getEE_IK ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getFI_HETU ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getFR_SPI ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getGR_AFM ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getHR_OIB ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getHU_AD ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getIE_PPSN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getIS_KT ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getIT_CF ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getLT_AK ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getLU_NIF ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getLV_PK ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getMT_NIC ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getMT_PP ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getNL_BSN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getPL_NIP ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getPL_PESEL ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getPT_NIF ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getRO_CNP ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getSE_PIN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getSI_PIN ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+	public final fun getSK_RC ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation : java/lang/Enum {
+	public static final field Companion Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation$Companion;
+	public static final field EuCarf Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation;
+	public static final field EuMica Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation;
+	public static fun getEntries ()Lkotlin/enums/EnumEntries;
+	public final fun getValue ()Ljava/lang/String;
+	public static fun valueOf (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation;
+	public static fun values ()[Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation$Companion {
+	public final fun fromValue (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation;
+}
+
+public final class com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResult {
 	public static final field $stable I
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getAlternatives ()Ljava/util/List;
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
index 11893016dd7..e3d651d104a 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
@@ -5,7 +5,6 @@ import androidx.activity.ComponentActivity
 import androidx.lifecycle.SavedStateHandle
 import com.stripe.android.crypto.onramp.di.OnrampComponentHolder
 import com.stripe.android.crypto.onramp.di.OnrampPresenterComponent
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
@@ -23,6 +22,7 @@ import com.stripe.android.crypto.onramp.model.OnrampSubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampTokenAuthenticationResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodSelection
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifier
 import com.stripe.android.paymentsheet.PaymentSheet
 import javax.inject.Inject
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
index ed5f04b65cc..e4ed815be1a 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
@@ -14,7 +14,6 @@ import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.exception.MissingPaymentMethodException
 import com.stripe.android.crypto.onramp.exception.PaymentFailedException
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
@@ -42,6 +41,7 @@ import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodDisplayData
 import com.stripe.android.crypto.onramp.model.PaymentMethodType
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifier
 import com.stripe.android.crypto.onramp.model.googlePayKycInfo
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityResult
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt
index c364941f437..77a9942c1eb 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt
@@ -1,7 +1,7 @@
 package com.stripe.android.crypto.onramp.model
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirements
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirements
 
 /**
  * Result of retrieving missing compliance identifiers.
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt
index 4eee15232d3..029ed53af88 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt
@@ -1,7 +1,7 @@
 package com.stripe.android.crypto.onramp.model
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
-import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResult
+import com.stripe.android.crypto.onramp.model.compliance.SubmitIdentifiersResult
 
 /**
  * Result of submitting compliance identifiers.
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifier.kt
similarity index 94%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifier.kt
index 9c1dea8a770..3b5c755eabb 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifier.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifier.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroup.kt
similarity index 88%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroup.kt
index 0cec9834862..553f05688bb 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroup.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroup.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import dev.drewhamilton.poko.Poko
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroupResponse.kt
similarity index 92%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroupResponse.kt
index 7e4e3e14b16..b5724cc945e 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierAlternativeGroupResponse.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierAlternativeGroupResponse.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirement.kt
similarity index 85%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirement.kt
index 432b334cee3..a6cb1c245c2 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirement.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirement.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import dev.drewhamilton.poko.Poko
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirementResponse.kt
similarity index 90%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirementResponse.kt
index 2c469253b07..6642c71f124 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementResponse.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirementResponse.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import kotlinx.serialization.Serializable
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirements.kt
similarity index 87%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirements.kt
index a1e8eedaed0..2b2268c82fc 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirements.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirements.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import dev.drewhamilton.poko.Poko
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirementsResponse.kt
similarity index 91%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirementsResponse.kt
index 89f6f23ac1c..9136b41b8bd 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierRequirementsResponse.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirementsResponse.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import kotlinx.serialization.Serializable
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType.kt
similarity index 97%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType.kt
index 107b74ea611..5a4f198e820 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceIdentifierType.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierType.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import dev.drewhamilton.poko.Poko
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation.kt
similarity index 87%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation.kt
index 500e3bbc818..fd8638dcd9e 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/ComplianceRegulation.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/ComplianceRegulation.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersRequest.kt
similarity index 93%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersRequest.kt
index f777a2d6d72..a38abc9ff95 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersRequest.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersRequest.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.model.CryptoCustomerRequestParams
 import kotlinx.serialization.Serializable
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResponse.kt
similarity index 93%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResponse.kt
index be3c5a8e132..a2d51ea2109 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResponse.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResponse.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResult.kt
similarity index 89%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResult.kt
index 54aac5921c4..ace3299f742 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/Compliance/SubmitIdentifiersResult.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResult.kt
@@ -1,4 +1,4 @@
-package com.stripe.android.crypto.onramp.model.Compliance
+package com.stripe.android.crypto.onramp.model.compliance
 
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 import dev.drewhamilton.poko.Poko
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index 5413cbb4079..bd7a055ee2d 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -11,9 +11,6 @@ import com.stripe.android.core.networking.StripeRequest
 import com.stripe.android.core.networking.executeRequestWithKSerializerParser
 import com.stripe.android.core.networking.toMap
 import com.stripe.android.core.version.StripeSdkVersion
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirements
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirementsResponse
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenRequest
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
@@ -31,9 +28,12 @@ import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationRequest
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
-import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResponse
-import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResult
-import com.stripe.android.crypto.onramp.model.Compliance.toRequest
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirements
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirementsResponse
+import com.stripe.android.crypto.onramp.model.compliance.SubmitIdentifiersResponse
+import com.stripe.android.crypto.onramp.model.compliance.SubmitIdentifiersResult
+import com.stripe.android.crypto.onramp.model.compliance.toRequest
 import com.stripe.android.link.LinkController
 import com.stripe.android.link.utils.isLinkAuthorizationError
 import com.stripe.android.model.PaymentIntent
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 9c02b7541cd..a5f828aae4d 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -7,15 +7,15 @@ import com.stripe.android.core.networking.ApiRequest
 import com.stripe.android.core.networking.StripeNetworkClient
 import com.stripe.android.core.networking.StripeResponse
 import com.stripe.android.core.version.StripeSdkVersion
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierAlternativeGroup
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirement
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierType
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceRegulation
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
-import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResult
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierAlternativeGroup
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirement
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierType
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceRegulation
+import com.stripe.android.crypto.onramp.model.compliance.SubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.link.LinkController
 import com.stripe.android.model.DateOfBirth
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 44df02a6730..b8b4fd79d72 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -10,12 +10,6 @@ import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifier
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierAlternativeGroup
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirement
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierRequirements
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceIdentifierType
-import com.stripe.android.crypto.onramp.model.Compliance.ComplianceRegulation
 import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
@@ -42,7 +36,13 @@ import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
-import com.stripe.android.crypto.onramp.model.Compliance.SubmitIdentifiersResult
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierAlternativeGroup
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirement
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirements
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierType
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceRegulation
+import com.stripe.android.crypto.onramp.model.compliance.SubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
 import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityResult
 import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationScreenAction

From 075827eb52312966220430da8668d8c306088acb Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 4 May 2026 16:41:12 -0400
Subject: [PATCH 24/57] Update CHANGELOG.md

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b31c52d57b0..cf311eea6bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 NEXT_VERSION_BUMP: PATCH
 ## XX.XX.XX - 20XX-XX-XX
 
+### CryptoOnramp
+* [ADDED][13019](https://github.com/stripe/stripe-android/pull/13019) Added new birth city, birth country, and nationalities properties to KYCInfo.
+* [ADDED][13019](https://github.com/stripe/stripe-android/pull/13019) New public types for interacting with Compliance regulations and identifiers.
+* [REMOVED][13019](https://github.com/stripe/stripe-android/pull/13019) Removed KycRetrieveResponse from the public API as it was not intended to be accessible.
+
 ## 23.7.0 - 2026-05-04
 
 ### PaymentSheet

From b900318b340edb78b2e31475d8ac5c2bd7d48681 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Wed, 6 May 2026 10:36:28 -0400
Subject: [PATCH 25/57] Match iOS behavior better

---
 CHANGELOG.md                                  |  2 +-
 .../onramp/model/KycCollectionRequest.kt      |  9 ++++-
 .../crypto/onramp/CryptoApiRepositoryTest.kt  | 38 ++++++++++++++++++-
 3 files changed, 46 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ec13dac528..ad669b24dff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # CHANGELOG
 
-NEXT_VERSION_BUMP: PATCH
+NEXT_VERSION_BUMP: MINOR
 ## XX.XX.XX - 20XX-XX-XX
 
 ### PaymentSheet
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt
index 8f09e9ac17b..8e77d5184b8 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/KycCollectionRequest.kt
@@ -1,5 +1,6 @@
 package com.stripe.android.crypto.onramp.model
 
+import com.stripe.android.core.model.CountryCode
 import com.stripe.android.model.DateOfBirth
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -58,7 +59,7 @@ internal data class KycCollectionRequest(
                 dateOfBirth = kycInfo.dateOfBirth,
                 birthCountry = kycInfo.birthCountry?.value,
                 birthCity = kycInfo.birthCity.takeIf { !it.isNullOrEmpty() },
-                nationalities = kycInfo.nationalities?.map { it.value.trim() },
+                nationalities = kycInfo.nationalities.toNormalizedNationalities(),
                 city = kycInfo.address?.city,
                 country = kycInfo.address?.country,
                 line1 = kycInfo.address?.line1,
@@ -75,3 +76,9 @@ internal data class KycCollectionRequest(
         private const val SOCIAL_SECURITY_NUMBER = "social_security_number"
     }
 }
+
+private fun List<CountryCode>?.toNormalizedNationalities(): List<String>? {
+    return this
+        ?.mapNotNull { it.value.trim().takeIf(String::isNotEmpty) }
+        ?.ifEmpty { null }
+}
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index a5f828aae4d..10b032a98de 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -150,7 +150,7 @@ class CryptoApiRepositoryTest {
     }
 
     @Test
-    fun testCollectKycDataTrimsNationalities() {
+    fun testCollectKycDataNormalizesNationalities() {
         runTest {
             val stripeResponse = StripeResponse(
                 200,
@@ -169,6 +169,7 @@ class CryptoApiRepositoryTest {
                     dateOfBirth = DateOfBirth(day = 1, month = 3, year = 1975),
                     address = PaymentSheet.Address(city = "Orlando", state = "FL"),
                     nationalities = listOf(
+                        CountryCode("  "),
                         CountryCode(" IE "),
                         CountryCode("\nFR\t"),
                     )
@@ -184,6 +185,41 @@ class CryptoApiRepositoryTest {
         }
     }
 
+    @Test
+    fun testCollectKycDataOmitsNationalitiesWhenAllValuesAreBlank() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                200,
+                "{}",
+                emptyMap()
+            )
+
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.collectKycData(
+                KycInfo(
+                    firstName = "Test",
+                    lastName = "User",
+                    idNumber = "999-88-7777",
+                    dateOfBirth = DateOfBirth(day = 1, month = 3, year = 1975),
+                    address = PaymentSheet.Address(city = "Orlando", state = "FL"),
+                    nationalities = listOf(
+                        CountryCode(" "),
+                        CountryCode("\n\t"),
+                    )
+                ),
+                consumerSessionClientSecret = "test-secret"
+            )
+
+            verify(stripeNetworkClient).executeRequest(apiRequestArgumentCaptor.capture())
+
+            assertThat(result.isSuccess).isTrue()
+            assertThat(apiRequestArgumentCaptor.firstValue.params?.get("nationalities"))
+                .isNull()
+        }
+    }
+
     @Test
     fun testRetrieveMissingIdentifiersSucceeds() {
         runTest {

From 0a86fc1e7cfd7a77dbe68f70594c342c2d9a9d36 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Wed, 6 May 2026 17:57:34 -0400
Subject: [PATCH 26/57] Adds public api functionality for eu suppport

---
 crypto-onramp/api/crypto-onramp.api           |  50 ++++++
 crypto-onramp/build.gradle                    |   2 +
 crypto-onramp/res/values/themes.xml           |   2 +-
 crypto-onramp/src/main/AndroidManifest.xml    |  13 +-
 .../crypto/onramp/OnrampCoordinator.kt        |  32 ++++
 .../android/crypto/onramp/OnrampInteractor.kt | 163 ++++++++++++++++++
 .../onramp/OnrampPresenterCoordinator.kt      |  37 ++++
 .../onramp/analytics/OnrampAnalyticsEvent.kt  |  21 ++-
 .../crypto/onramp/model/OnrampCallbacks.kt    |  10 ++
 .../model/OnrampCrsCarfDeclarationResult.kt   |  37 ++++
 .../OnrampRetrieveMissingIdentifiersResult.kt |  26 +++
 .../model/OnrampSubmitIdentifiersResult.kt    |  26 +++
 .../onramp/ui/CrsCarfDeclarationActivity.kt   | 115 ++++++++++++
 .../crypto/onramp/OnrampInteractorTest.kt     | 142 ++++++++++++++-
 paymentsheet/api/paymentsheet.api             |   6 +
 .../onramp/ui/CrsCarfDeclarationScreen.kt     | 105 +++++++++++
 16 files changed, 780 insertions(+), 7 deletions(-)
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/ui/CrsCarfDeclarationActivity.kt
 create mode 100644 paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index c94b43aaaa1..9aa16a39e7c 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -12,6 +12,8 @@ public final class com/stripe/android/crypto/onramp/OnrampCoordinator {
 	public final fun logOut (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun registerLinkUser (Lcom/stripe/android/crypto/onramp/model/LinkUserInfo;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun registerWalletAddress (Ljava/lang/String;Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun retrieveMissingIdentifiers (Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+	public final fun submitIdentifiers (Ljava/util/List;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 	public final fun updatePhoneNumber (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
@@ -26,6 +28,7 @@ public final class com/stripe/android/crypto/onramp/OnrampCoordinator$Presenter
 	public final fun authorize (Ljava/lang/String;)V
 	public final fun collectPaymentMethod (Lcom/stripe/android/crypto/onramp/model/PaymentMethodSelection;)V
 	public final fun performCheckout (Ljava/lang/String;)V
+	public final fun presentCrsCarfDeclaration ()V
 	public final fun verifyIdentity ()V
 	public final fun verifyKycInfo (Lcom/stripe/android/paymentsheet/PaymentSheet$Address;)V
 	public static synthetic fun verifyKycInfo$default (Lcom/stripe/android/crypto/onramp/OnrampCoordinator$Presenter;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;ILjava/lang/Object;)V
@@ -152,6 +155,7 @@ public final class com/stripe/android/crypto/onramp/model/OnrampCallbacks {
 	public final fun authorizeCallback (Lcom/stripe/android/crypto/onramp/model/OnrampAuthorizeCallback;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
 	public final fun checkoutCallback (Lcom/stripe/android/crypto/onramp/model/OnrampCheckoutCallback;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
 	public final fun collectPaymentCallback (Lcom/stripe/android/crypto/onramp/model/OnrampCollectPaymentMethodCallback;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
+	public final fun crsCarfDeclarationCallback (Lcom/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationCallback;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
 	public final fun googlePayIsReadyCallback (Lkotlin/jvm/functions/Function1;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
 	public final fun onrampSessionClientSecretProvider (Lkotlin/jvm/functions/Function2;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
 	public final fun verifyIdentityCallback (Lcom/stripe/android/crypto/onramp/model/OnrampVerifyIdentityCallback;)Lcom/stripe/android/crypto/onramp/model/OnrampCallbacks;
@@ -237,6 +241,26 @@ public final class com/stripe/android/crypto/onramp/model/OnrampCreateCryptoPaym
 	public final fun getError ()Ljava/lang/Throwable;
 }
 
+public abstract interface class com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationCallback {
+	public abstract fun onResult (Lcom/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult;)V
+}
+
+public abstract interface class com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult {
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult$Cancelled : com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult {
+	public static final field $stable I
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult$Confirmed : com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult {
+	public static final field $stable I
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult$Failed : com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult {
+	public static final field $stable I
+	public final fun getError ()Ljava/lang/Throwable;
+}
+
 public abstract interface class com/stripe/android/crypto/onramp/model/OnrampHasLinkAccountResult {
 }
 
@@ -287,6 +311,32 @@ public final class com/stripe/android/crypto/onramp/model/OnrampRegisterWalletAd
 	public final fun getError ()Ljava/lang/Throwable;
 }
 
+public abstract interface class com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult {
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult$Completed : com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult {
+	public static final field $stable I
+	public final fun getRequirements ()Lcom/stripe/android/crypto/onramp/model/compliance/ComplianceIdentifierRequirements;
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult$Failed : com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult {
+	public static final field $stable I
+	public final fun getError ()Ljava/lang/Throwable;
+}
+
+public abstract interface class com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult {
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult$Completed : com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult {
+	public static final field $stable I
+	public final fun getResult ()Lcom/stripe/android/crypto/onramp/model/compliance/SubmitIdentifiersResult;
+}
+
+public final class com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult$Failed : com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult {
+	public static final field $stable I
+	public final fun getError ()Ljava/lang/Throwable;
+}
+
 public abstract interface class com/stripe/android/crypto/onramp/model/OnrampTokenAuthenticationResult {
 }
 
diff --git a/crypto-onramp/build.gradle b/crypto-onramp/build.gradle
index 76c122dd521..908b40871da 100644
--- a/crypto-onramp/build.gradle
+++ b/crypto-onramp/build.gradle
@@ -22,6 +22,8 @@ dependencies {
 
     api libs.compose.ui
     implementation libs.compose.activity
+    implementation libs.compose.foundation
+    implementation libs.compose.material
 
     implementation libs.dagger
 
diff --git a/crypto-onramp/res/values/themes.xml b/crypto-onramp/res/values/themes.xml
index e29d8e99c79..ad123d332cd 100644
--- a/crypto-onramp/res/values/themes.xml
+++ b/crypto-onramp/res/values/themes.xml
@@ -12,7 +12,7 @@
         <item name="android:taskCloseExitAnimation">@null</item>
     </style>
 
-    <style name="StripeVerifyKycTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
+    <style name="StripeOnrampTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowAnimationStyle">@style/Stripe.NoWindowAnims</item>
diff --git a/crypto-onramp/src/main/AndroidManifest.xml b/crypto-onramp/src/main/AndroidManifest.xml
index 9a80c959fd7..1e67bdbdbe8 100644
--- a/crypto-onramp/src/main/AndroidManifest.xml
+++ b/crypto-onramp/src/main/AndroidManifest.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
-    <activity
-        android:name="com.stripe.android.crypto.onramp.ui.VerifyKycInfoActivity"
-        android:theme="@style/StripeVerifyKycTheme"
-        android:exported="false" />
+        <activity
+            android:name="com.stripe.android.crypto.onramp.ui.VerifyKycInfoActivity"
+            android:theme="@style/StripeOnrampTheme"
+            android:exported="false" />
+
+        <activity
+            android:name="com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivity"
+            android:theme="@style/StripeOnrampTheme"
+            android:exported="false" />
     </application>
 </manifest>
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
index 1270cb1156a..e3d651d104a 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampCoordinator.kt
@@ -17,9 +17,12 @@ import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterWalletAddressResult
+import com.stripe.android.crypto.onramp.model.OnrampRetrieveMissingIdentifiersResult
+import com.stripe.android.crypto.onramp.model.OnrampSubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampTokenAuthenticationResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodSelection
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifier
 import com.stripe.android.paymentsheet.PaymentSheet
 import javax.inject.Inject
 
@@ -31,6 +34,7 @@ import javax.inject.Inject
  * @param presenterComponentFactory Factory for creating presenter components.
  */
 @ExperimentalCryptoOnramp
+@Suppress("TooManyFunctions")
 class OnrampCoordinator @Inject internal constructor(
     private val interactor: OnrampInteractor,
     private val presenterComponentFactory: OnrampPresenterComponent.Factory,
@@ -111,6 +115,26 @@ class OnrampCoordinator @Inject internal constructor(
         return interactor.attachKycInfo(info)
     }
 
+    /**
+     * Retrieves compliance identifiers still required for MiCA and CRS/CARF compliance.
+     * Requires an authenticated Link user.
+     */
+    suspend fun retrieveMissingIdentifiers(): OnrampRetrieveMissingIdentifiersResult {
+        return interactor.retrieveMissingIdentifiers()
+    }
+
+    /**
+     * Submits compliance identifiers for MiCA and CRS/CARF compliance.
+     * Requires an authenticated Link user.
+     *
+     * @param identifiers The compliance identifiers to submit.
+     */
+    suspend fun submitIdentifiers(
+        identifiers: List<ComplianceIdentifier>
+    ): OnrampSubmitIdentifiersResult {
+        return interactor.submitIdentifiers(identifiers)
+    }
+
     /**
      * Creates a crypto payment token for the payment method currently selected on the coordinator.
      * Call after a successful [Presenter.collectPaymentMethod].
@@ -205,6 +229,14 @@ class OnrampCoordinator @Inject internal constructor(
         ) {
             coordinator.performCheckout(onrampSessionId = onrampSessionId)
         }
+
+        /**
+         * Presents the CRS/CARF declaration screen and records acceptance when the user confirms.
+         * The result will be delivered through the CRS/CARF declaration callback provided in OnrampCallbacks.
+         */
+        fun presentCrsCarfDeclaration() {
+            coordinator.presentCrsCarfDeclaration()
+        }
     }
 
     /**
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
index e40e71e9173..e4ed815be1a 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
@@ -14,6 +14,7 @@ import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.exception.MissingPaymentMethodException
 import com.stripe.android.crypto.onramp.exception.PaymentFailedException
+import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.KycRetrieveResponse
@@ -25,20 +26,26 @@ import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
+import com.stripe.android.crypto.onramp.model.OnrampCrsCarfDeclarationResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterWalletAddressResult
+import com.stripe.android.crypto.onramp.model.OnrampRetrieveMissingIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampSessionClientSecretProvider
 import com.stripe.android.crypto.onramp.model.OnrampStartVerificationResult
+import com.stripe.android.crypto.onramp.model.OnrampSubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampTokenAuthenticationResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodDisplayData
 import com.stripe.android.crypto.onramp.model.PaymentMethodType
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifier
 import com.stripe.android.crypto.onramp.model.googlePayKycInfo
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityResult
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationScreenAction
 import com.stripe.android.crypto.onramp.ui.KycRefreshScreenAction
 import com.stripe.android.crypto.onramp.ui.VerifyKycActivityResult
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
@@ -329,6 +336,102 @@ internal class OnrampInteractor @Inject constructor(
             )
     }
 
+    suspend fun retrieveMissingIdentifiers(): OnrampRetrieveMissingIdentifiersResult {
+        val secret = consumerSessionClientSecret()
+        if (secret == null) {
+            val error = MissingConsumerSecretException()
+            analyticsService?.track(
+                OnrampAnalyticsEvent.ErrorOccurred(
+                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.RetrieveMissingIdentifiers,
+                    error = error,
+                )
+            )
+            return OnrampRetrieveMissingIdentifiersResult.Failed(error)
+        }
+
+        return cryptoApiRepository.retrieveMissingIdentifiers(secret)
+            .fold(
+                onSuccess = { requirements ->
+                    analyticsService?.track(OnrampAnalyticsEvent.MissingIdentifiersRetrieved)
+                    OnrampRetrieveMissingIdentifiersResult.Completed(requirements)
+                },
+                onFailure = { error ->
+                    analyticsService?.track(
+                        OnrampAnalyticsEvent.ErrorOccurred(
+                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.RetrieveMissingIdentifiers,
+                            error = error,
+                        )
+                    )
+                    OnrampRetrieveMissingIdentifiersResult.Failed(error)
+                }
+            )
+    }
+
+    suspend fun submitIdentifiers(identifiers: List<ComplianceIdentifier>): OnrampSubmitIdentifiersResult {
+        val secret = consumerSessionClientSecret()
+        if (secret == null) {
+            val error = MissingConsumerSecretException()
+            analyticsService?.track(
+                OnrampAnalyticsEvent.ErrorOccurred(
+                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.SubmitIdentifiers,
+                    error = error,
+                )
+            )
+            return OnrampSubmitIdentifiersResult.Failed(error)
+        }
+
+        return cryptoApiRepository.submitIdentifiers(identifiers, secret)
+            .fold(
+                onSuccess = { result ->
+                    analyticsService?.track(OnrampAnalyticsEvent.IdentifiersSubmitted)
+                    OnrampSubmitIdentifiersResult.Completed(result)
+                },
+                onFailure = { error ->
+                    analyticsService?.track(
+                        OnrampAnalyticsEvent.ErrorOccurred(
+                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.SubmitIdentifiers,
+                            error = error,
+                        )
+                    )
+                    OnrampSubmitIdentifiersResult.Failed(error)
+                }
+            )
+    }
+
+    suspend fun startCrsCarfDeclaration(): OnrampStartCrsCarfDeclarationResult {
+        val secret = consumerSessionClientSecret()
+        if (secret == null) {
+            val error = MissingConsumerSecretException()
+            analyticsService?.track(
+                OnrampAnalyticsEvent.ErrorOccurred(
+                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.ConfirmCrsCarfDeclaration,
+                    error = error,
+                )
+            )
+            return OnrampStartCrsCarfDeclarationResult.Failed(error)
+        }
+
+        return cryptoApiRepository.retrieveCrsCarfDeclaration(secret)
+            .fold(
+                onSuccess = { declaration ->
+                    analyticsService?.track(OnrampAnalyticsEvent.CrsCarfDeclarationStarted)
+                    OnrampStartCrsCarfDeclarationResult.Completed(
+                        declaration = declaration,
+                        appearance = state.value.configurationState?.appearance
+                    )
+                },
+                onFailure = { error ->
+                    analyticsService?.track(
+                        OnrampAnalyticsEvent.ErrorOccurred(
+                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.ConfirmCrsCarfDeclaration,
+                            error = error,
+                        )
+                    )
+                    OnrampStartCrsCarfDeclarationResult.Failed(error)
+                }
+            )
+    }
+
     suspend fun startIdentityVerification(): OnrampStartVerificationResult {
         val secret = consumerSessionClientSecret()
         if (secret == null) {
@@ -693,6 +796,49 @@ internal class OnrampInteractor @Inject constructor(
         }
     }
 
+    suspend fun handleCrsCarfDeclarationResult(
+        result: CrsCarfDeclarationActivityResult,
+    ): OnrampCrsCarfDeclarationResult = when (result.action) {
+        is CrsCarfDeclarationScreenAction.Cancelled -> {
+            OnrampCrsCarfDeclarationResult.Cancelled()
+        }
+        is CrsCarfDeclarationScreenAction.Confirm -> {
+            val secret = consumerSessionClientSecret()
+
+            if (secret != null) {
+                val confirmResult = cryptoApiRepository.confirmCrsCarfDeclaration(secret)
+
+                confirmResult.fold(
+                    onSuccess = {
+                        analyticsService?.track(OnrampAnalyticsEvent.CrsCarfDeclarationConfirmed)
+
+                        OnrampCrsCarfDeclarationResult.Confirmed()
+                    },
+                    onFailure = { error ->
+                        analyticsService?.track(
+                            OnrampAnalyticsEvent.ErrorOccurred(
+                                operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.ConfirmCrsCarfDeclaration,
+                                error = error,
+                            )
+                        )
+
+                        OnrampCrsCarfDeclarationResult.Failed(error)
+                    }
+                )
+            } else {
+                val error = MissingConsumerSecretException()
+                analyticsService?.track(
+                    OnrampAnalyticsEvent.ErrorOccurred(
+                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.ConfirmCrsCarfDeclaration,
+                        error = error,
+                    )
+                )
+
+                OnrampCrsCarfDeclarationResult.Failed(error)
+            }
+        }
+    }
+
     private fun consumerSessionClientSecret(): String? =
         _state.value.linkControllerState?.internalLinkAccount?.consumerSessionClientSecret
             ?: linkController.state(application).value.internalLinkAccount?.consumerSessionClientSecret
@@ -1001,6 +1147,23 @@ internal sealed interface OnrampStartKycVerificationResult {
     ) : OnrampStartKycVerificationResult
 }
 
+internal sealed interface OnrampStartCrsCarfDeclarationResult {
+    /**
+     * Starting CRS/CARF declaration presentation completed successfully.
+     */
+    class Completed internal constructor(
+        val declaration: CrsCarfDeclaration,
+        val appearance: LinkAppearance?
+    ) : OnrampStartCrsCarfDeclarationResult
+
+    /**
+     * Starting CRS/CARF declaration presentation failed.
+     */
+    class Failed internal constructor(
+        val error: Throwable
+    ) : OnrampStartCrsCarfDeclarationResult
+}
+
 internal fun LinkController.PaymentMethodType.toDisplayType(): PaymentMethodDisplayData.Type {
     return when (this) {
         LinkController.PaymentMethodType.Card ->
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampPresenterCoordinator.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampPresenterCoordinator.kt
index 86e7dff7940..e77dcdbeffe 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampPresenterCoordinator.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampPresenterCoordinator.kt
@@ -16,11 +16,15 @@ import com.stripe.android.crypto.onramp.exception.PaymentFailedException
 import com.stripe.android.crypto.onramp.model.OnrampCallbacks
 import com.stripe.android.crypto.onramp.model.OnrampCheckoutResult
 import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
+import com.stripe.android.crypto.onramp.model.OnrampCrsCarfDeclarationResult
 import com.stripe.android.crypto.onramp.model.OnrampStartVerificationResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodSelection
 import com.stripe.android.crypto.onramp.model.PaymentMethodType
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityArgs
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityContract
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityResult
 import com.stripe.android.crypto.onramp.ui.VerifyKycActivityArgs
 import com.stripe.android.crypto.onramp.ui.VerifyKycActivityResult
 import com.stripe.android.crypto.onramp.ui.VerifyKycInfoActivityContract
@@ -93,6 +97,13 @@ internal class OnrampPresenterCoordinator @Inject constructor(
             callback = ::handleVerifyKycResult
         )
 
+    private val crsCarfDeclarationResultLauncher: ActivityResultLauncher<CrsCarfDeclarationActivityArgs> =
+        activity.activityResultRegistry.register(
+            key = "OnrampPresenterCoordinator_CrsCarfResultLauncher($onrampCallbackIdentifier)",
+            contract = CrsCarfDeclarationActivityContract(),
+            callback = ::handleCrsCarfDeclarationResult
+        )
+
     init {
         // Observe Link controller state
         lifecycleOwner.lifecycleScope.launch {
@@ -115,6 +126,7 @@ internal class OnrampPresenterCoordinator @Inject constructor(
                 override fun onDestroy(owner: LifecycleOwner) {
                     googlePayActivityResultLauncher.unregister()
                     verifyKycResultLauncher.unregister()
+                    crsCarfDeclarationResultLauncher.unregister()
 
                     if (activity.isFinishing) {
                         OnrampCallbackReferences.remove(onrampCallbackIdentifier)
@@ -165,6 +177,23 @@ internal class OnrampPresenterCoordinator @Inject constructor(
         }
     }
 
+    fun presentCrsCarfDeclaration() {
+        coroutineScope.launch {
+            when (val result = interactor.startCrsCarfDeclaration()) {
+                is OnrampStartCrsCarfDeclarationResult.Completed -> {
+                    crsCarfDeclarationResultLauncher.launch(
+                        CrsCarfDeclarationActivityArgs(result.declaration, result.appearance)
+                    )
+                }
+                is OnrampStartCrsCarfDeclarationResult.Failed -> {
+                    onrampCallbacksState.crsCarfDeclarationCallback?.onResult(
+                        OnrampCrsCarfDeclarationResult.Failed(result.error)
+                    )
+                }
+            }
+        }
+    }
+
     fun collectPaymentMethod(selection: PaymentMethodSelection) {
         interactor.onCollectPaymentMethod(selection.type)
 
@@ -290,6 +319,14 @@ internal class OnrampPresenterCoordinator @Inject constructor(
         }
     }
 
+    private fun handleCrsCarfDeclarationResult(result: CrsCarfDeclarationActivityResult) {
+        coroutineScope.launch {
+            onrampCallbacksState.crsCarfDeclarationCallback?.onResult(
+                interactor.handleCrsCarfDeclarationResult(result)
+            )
+        }
+    }
+
     private fun googlePayConfig(): GooglePayPaymentMethodLauncher.Config? =
         interactor.state.value.configurationState?.googlePayConfig
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
index 667305d4bfb..6afc20e1751 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
@@ -73,6 +73,22 @@ internal sealed class OnrampAnalyticsEvent(
         name = "kyc_info_verification_completed"
     )
 
+    data object MissingIdentifiersRetrieved : OnrampAnalyticsEvent(
+        name = "missing_identifiers_retrieved"
+    )
+
+    data object IdentifiersSubmitted : OnrampAnalyticsEvent(
+        name = "identifiers_submitted"
+    )
+
+    data object CrsCarfDeclarationStarted : OnrampAnalyticsEvent(
+        name = "crs_carf_declaration_started"
+    )
+
+    data object CrsCarfDeclarationConfirmed : OnrampAnalyticsEvent(
+        name = "crs_carf_declaration_confirmed"
+    )
+
     class WalletRegistered(
         network: CryptoNetwork
     ) : OnrampAnalyticsEvent(
@@ -161,7 +177,10 @@ internal sealed class OnrampAnalyticsEvent(
             CreateCryptoPaymentToken("create_crypto_payment_token"),
             PerformCheckout("perform_checkout"),
             LogOut("log_out"),
-            VerifyKyc("verify_kyc_info")
+            VerifyKyc("verify_kyc_info"),
+            RetrieveMissingIdentifiers("retrieve_missing_identifiers"),
+            SubmitIdentifiers("submit_identifiers"),
+            ConfirmCrsCarfDeclaration("confirm_crs_carf_declaration")
         }
     }
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCallbacks.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCallbacks.kt
index 2beca8914c3..720d8cb9643 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCallbacks.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCallbacks.kt
@@ -19,6 +19,7 @@ class OnrampCallbacks {
     private var collectPaymentCallback: OnrampCollectPaymentMethodCallback? = null
     private var authorizeCallback: OnrampAuthorizeCallback? = null
     private var checkoutCallback: OnrampCheckoutCallback? = null
+    private var crsCarfDeclarationCallback: OnrampCrsCarfDeclarationCallback? = null
     private var onrampSessionClientSecretProvider: OnrampSessionClientSecretProvider? = null
     private var googlePayIsReadyCallback: ((Boolean) -> Unit)? = null
 
@@ -57,6 +58,13 @@ class OnrampCallbacks {
         this.checkoutCallback = callback
     }
 
+    /**
+     * Callback invoked when CRS/CARF declaration presentation completes.
+     */
+    fun crsCarfDeclarationCallback(callback: OnrampCrsCarfDeclarationCallback) = apply {
+        this.crsCarfDeclarationCallback = callback
+    }
+
     /**
      * An async closure that calls your backend to perform a checkout.
      *     Your backend should call Stripe's `/v1/crypto/onramp_sessions/:id/checkout` endpoint with the session ID.
@@ -85,6 +93,7 @@ class OnrampCallbacks {
         val collectPaymentCallback: OnrampCollectPaymentMethodCallback,
         val authorizeCallback: OnrampAuthorizeCallback,
         val checkoutCallback: OnrampCheckoutCallback,
+        val crsCarfDeclarationCallback: OnrampCrsCarfDeclarationCallback?,
         val onrampSessionClientSecretProvider: OnrampSessionClientSecretProvider,
         val googlePayIsReadyCallback: ((Boolean) -> Unit)?
     )
@@ -106,6 +115,7 @@ class OnrampCallbacks {
             checkoutCallback = requireNotNull(checkoutCallback) {
                 "checkoutCallback must not be null"
             },
+            crsCarfDeclarationCallback = crsCarfDeclarationCallback,
             onrampSessionClientSecretProvider = requireNotNull(onrampSessionClientSecretProvider) {
                 "onrampSessionClientSecretProvider must be not null"
             },
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult.kt
new file mode 100644
index 00000000000..8a1ffeea429
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampCrsCarfDeclarationResult.kt
@@ -0,0 +1,37 @@
+package com.stripe.android.crypto.onramp.model
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * Callback invoked when CRS/CARF declaration presentation completes.
+ */
+@ExperimentalCryptoOnramp
+fun interface OnrampCrsCarfDeclarationCallback {
+    fun onResult(result: OnrampCrsCarfDeclarationResult)
+}
+
+/**
+ * Result of presenting and recording a CRS/CARF declaration.
+ */
+@ExperimentalCryptoOnramp
+sealed interface OnrampCrsCarfDeclarationResult {
+    /**
+     * The declaration was accepted and recorded.
+     */
+    @ExperimentalCryptoOnramp
+    class Confirmed internal constructor() : OnrampCrsCarfDeclarationResult
+
+    /**
+     * The declaration presentation was cancelled.
+     */
+    @ExperimentalCryptoOnramp
+    class Cancelled internal constructor() : OnrampCrsCarfDeclarationResult
+
+    /**
+     * Presenting or recording the declaration failed.
+     */
+    @ExperimentalCryptoOnramp
+    class Failed internal constructor(
+        val error: Throwable
+    ) : OnrampCrsCarfDeclarationResult
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt
new file mode 100644
index 00000000000..77a9942c1eb
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampRetrieveMissingIdentifiersResult.kt
@@ -0,0 +1,26 @@
+package com.stripe.android.crypto.onramp.model
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirements
+
+/**
+ * Result of retrieving missing compliance identifiers.
+ */
+@ExperimentalCryptoOnramp
+sealed interface OnrampRetrieveMissingIdentifiersResult {
+    /**
+     * Missing compliance identifiers were retrieved.
+     */
+    @ExperimentalCryptoOnramp
+    class Completed internal constructor(
+        val requirements: ComplianceIdentifierRequirements
+    ) : OnrampRetrieveMissingIdentifiersResult
+
+    /**
+     * Missing compliance identifier retrieval failed.
+     */
+    @ExperimentalCryptoOnramp
+    class Failed internal constructor(
+        val error: Throwable
+    ) : OnrampRetrieveMissingIdentifiersResult
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt
new file mode 100644
index 00000000000..029ed53af88
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampSubmitIdentifiersResult.kt
@@ -0,0 +1,26 @@
+package com.stripe.android.crypto.onramp.model
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import com.stripe.android.crypto.onramp.model.compliance.SubmitIdentifiersResult
+
+/**
+ * Result of submitting compliance identifiers.
+ */
+@ExperimentalCryptoOnramp
+sealed interface OnrampSubmitIdentifiersResult {
+    /**
+     * Identifier submission completed and returned a validation result.
+     */
+    @ExperimentalCryptoOnramp
+    class Completed internal constructor(
+        val result: SubmitIdentifiersResult
+    ) : OnrampSubmitIdentifiersResult
+
+    /**
+     * Identifier submission failed.
+     */
+    @ExperimentalCryptoOnramp
+    class Failed internal constructor(
+        val error: Throwable
+    ) : OnrampSubmitIdentifiersResult
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/ui/CrsCarfDeclarationActivity.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/ui/CrsCarfDeclarationActivity.kt
new file mode 100644
index 00000000000..9cf1e015029
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/ui/CrsCarfDeclarationActivity.kt
@@ -0,0 +1,115 @@
+package com.stripe.android.crypto.onramp.ui
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.os.Parcelable
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContract
+import androidx.core.os.BundleCompat
+import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
+import com.stripe.android.link.LinkAppearance
+import com.stripe.android.link.onramp.ui.CrsCarfDeclarationScreen
+import com.stripe.android.uicore.utils.fadeOut
+import kotlinx.parcelize.Parcelize
+
+internal class CrsCarfDeclarationActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val args = intent.extras?.let {
+            BundleCompat.getParcelable(it, EXTRA_ARGS, CrsCarfDeclarationArgs::class.java)
+        } ?: error("Missing CrsCarfDeclarationArgs")
+
+        enableEdgeToEdge()
+
+        setContent {
+            CrsCarfDeclarationScreen(
+                attestationText = args.attestationText,
+                appearance = args.appearance,
+                onClose = {
+                    setResult(RESULT_CANCELED, createResultIntent(CrsCarfDeclarationScreenAction.Cancelled))
+                    finish()
+                },
+                onConfirm = {
+                    setResult(RESULT_OK, createResultIntent(CrsCarfDeclarationScreenAction.Confirm))
+                    finish()
+                }
+            )
+        }
+    }
+
+    override fun finish() {
+        super.finish()
+        fadeOut()
+    }
+
+    private fun createResultIntent(action: CrsCarfDeclarationScreenAction): Intent {
+        return Intent().apply { putExtra(ACTION_ARG, action) }
+    }
+
+    companion object {
+        private const val EXTRA_ARGS = "crs_carf_declaration_args"
+        internal const val ACTION_ARG = "action"
+
+        internal fun createIntent(
+            context: Context,
+            args: CrsCarfDeclarationArgs
+        ): Intent {
+            return Intent(context, CrsCarfDeclarationActivity::class.java)
+                .putExtra(EXTRA_ARGS, args)
+        }
+    }
+}
+
+internal data class CrsCarfDeclarationActivityArgs(
+    val declaration: CrsCarfDeclaration,
+    val linkAppearance: LinkAppearance?
+)
+
+internal sealed interface CrsCarfDeclarationScreenAction : Parcelable {
+    @Parcelize
+    data object Cancelled : CrsCarfDeclarationScreenAction
+
+    @Parcelize
+    data object Confirm : CrsCarfDeclarationScreenAction
+}
+
+internal data class CrsCarfDeclarationActivityResult(
+    val action: CrsCarfDeclarationScreenAction
+)
+
+internal class CrsCarfDeclarationActivityContract : ActivityResultContract<
+    CrsCarfDeclarationActivityArgs,
+    CrsCarfDeclarationActivityResult
+    >() {
+    override fun createIntent(context: Context, input: CrsCarfDeclarationActivityArgs): Intent {
+        return CrsCarfDeclarationActivity.createIntent(
+            context = context,
+            args = CrsCarfDeclarationArgs(
+                attestationText = input.declaration.text,
+                appearance = input.linkAppearance?.build()
+            )
+        )
+    }
+
+    override fun parseResult(resultCode: Int, intent: Intent?): CrsCarfDeclarationActivityResult {
+        val action = intent?.extras?.let {
+            BundleCompat.getParcelable(
+                it,
+                CrsCarfDeclarationActivity.ACTION_ARG,
+                CrsCarfDeclarationScreenAction::class.java
+            )
+        } ?: CrsCarfDeclarationScreenAction.Cancelled
+
+        return CrsCarfDeclarationActivityResult(action)
+    }
+}
+
+@Parcelize
+internal data class CrsCarfDeclarationArgs(
+    val attestationText: String,
+    val appearance: LinkAppearance.State?,
+) : Parcelable
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index b3ed0da787e..b8b4fd79d72 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -9,6 +9,7 @@ import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsService
 import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
+import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.GetPlatformSettingsResponse
@@ -21,18 +22,30 @@ import com.stripe.android.crypto.onramp.model.OnrampCollectPaymentMethodResult
 import com.stripe.android.crypto.onramp.model.OnrampConfiguration
 import com.stripe.android.crypto.onramp.model.OnrampConfigurationResult
 import com.stripe.android.crypto.onramp.model.OnrampCreateCryptoPaymentTokenResult
+import com.stripe.android.crypto.onramp.model.OnrampCrsCarfDeclarationResult
 import com.stripe.android.crypto.onramp.model.OnrampHasLinkAccountResult
 import com.stripe.android.crypto.onramp.model.OnrampLogOutResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterLinkUserResult
 import com.stripe.android.crypto.onramp.model.OnrampRegisterWalletAddressResult
+import com.stripe.android.crypto.onramp.model.OnrampRetrieveMissingIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampSessionClientSecretProvider
 import com.stripe.android.crypto.onramp.model.OnrampStartVerificationResult
+import com.stripe.android.crypto.onramp.model.OnrampSubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.RefreshKycInfo
 import com.stripe.android.crypto.onramp.model.StartIdentityVerificationResponse
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierAlternativeGroup
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirement
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirements
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierType
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceRegulation
+import com.stripe.android.crypto.onramp.model.compliance.SubmitIdentifiersResult
 import com.stripe.android.crypto.onramp.repositories.CryptoApiRepository
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationActivityResult
+import com.stripe.android.crypto.onramp.ui.CrsCarfDeclarationScreenAction
 import com.stripe.android.crypto.onramp.ui.KycRefreshScreenAction
 import com.stripe.android.crypto.onramp.ui.VerifyKycActivityResult
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
@@ -183,11 +196,111 @@ class OnrampInteractorTest {
             address = PaymentSheet.Address(city = "Orlando", state = "FL")
         )
         val result = interactor.attachKycInfo(kycInfo)
-        assert(result is OnrampAttachKycInfoResult.Completed)
+        assertThat(result).isInstanceOf(OnrampAttachKycInfoResult.Completed::class.java)
 
         testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.KycInfoSubmitted)
     }
 
+    @Test
+    fun testRetrieveMissingIdentifiersIsSuccessful() = runTest {
+        whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
+        val requirements = ComplianceIdentifierRequirements(
+            identifiers = listOf(
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.MT_NIC,
+                    regulation = ComplianceRegulation.EuMica
+                ),
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.FR_SPI,
+                    regulation = ComplianceRegulation.EuCarf
+                )
+            ),
+            alternatives = listOf(
+                ComplianceIdentifierAlternativeGroup(
+                    originalMissingIdentifiers = listOf(ComplianceIdentifierType.MT_NIC),
+                    alternativeMissingIdentifiers = listOf(ComplianceIdentifierType.MT_PP)
+                )
+            )
+        )
+        whenever(cryptoApiRepository.retrieveMissingIdentifiers(any()))
+            .thenReturn(Result.success(requirements))
+
+        interactor.onLinkControllerState(mockLinkStateWithAccount())
+
+        val result = interactor.retrieveMissingIdentifiers()
+
+        assertThat(result).isInstanceOf(OnrampRetrieveMissingIdentifiersResult.Completed::class.java)
+        val completed = result as OnrampRetrieveMissingIdentifiersResult.Completed
+        assertThat(completed.requirements).isEqualTo(requirements)
+        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.MissingIdentifiersRetrieved)
+    }
+
+    @Test
+    fun testSubmitIdentifiersIsSuccessful() = runTest {
+        whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
+        val submissionResult = SubmitIdentifiersResult(
+            valid = false,
+            identifiers = listOf(
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.DE_STN,
+                    regulation = ComplianceRegulation.EuCarf
+                ),
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.MT_NIC,
+                    regulation = ComplianceRegulation.EuCarf
+                ),
+                ComplianceIdentifierRequirement(
+                    type = ComplianceIdentifierType.MT_NIC,
+                    regulation = ComplianceRegulation.EuMica
+                )
+            ),
+            alternatives = listOf(
+                ComplianceIdentifierAlternativeGroup(
+                    originalMissingIdentifiers = listOf(ComplianceIdentifierType.MT_NIC),
+                    alternativeMissingIdentifiers = listOf(ComplianceIdentifierType.MT_PP)
+                )
+            ),
+            invalidIdentifiers = listOf(ComplianceIdentifierType.DE_STN, ComplianceIdentifierType.MT_NIC)
+        )
+        whenever(cryptoApiRepository.submitIdentifiers(any(), any()))
+            .thenReturn(Result.success(submissionResult))
+
+        interactor.onLinkControllerState(mockLinkStateWithAccount())
+
+        val result = interactor.submitIdentifiers(
+            listOf(
+                ComplianceIdentifier()
+                    .type(ComplianceIdentifierType.MT_NIC)
+                    .value("mica_123")
+            )
+        )
+
+        assertThat(result).isInstanceOf(OnrampSubmitIdentifiersResult.Completed::class.java)
+        val completed = result as OnrampSubmitIdentifiersResult.Completed
+        assertThat(completed.result).isEqualTo(submissionResult)
+        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.IdentifiersSubmitted)
+    }
+
+    @Test
+    fun testStartCrsCarfDeclarationIsSuccessful() = runTest {
+        whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
+        val declaration = CrsCarfDeclaration(
+            text = "I confirm this declaration.",
+            version = "2026-04-23"
+        )
+        whenever(cryptoApiRepository.retrieveCrsCarfDeclaration(any()))
+            .thenReturn(Result.success(declaration))
+
+        interactor.onLinkControllerState(mockLinkStateWithAccount())
+
+        val result = interactor.startCrsCarfDeclaration()
+
+        assertThat(result).isInstanceOf(OnrampStartCrsCarfDeclarationResult.Completed::class.java)
+        val completed = result as OnrampStartCrsCarfDeclarationResult.Completed
+        assertThat(completed.declaration).isEqualTo(declaration)
+        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.CrsCarfDeclarationStarted)
+    }
+
     @Test
     fun testStartIdentityVerificationIsSuccessful() = runTest {
         whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
@@ -543,6 +656,33 @@ class OnrampInteractorTest {
         assertThat(failed.error).isInstanceOf(MissingConsumerSecretException::class.java)
     }
 
+    @Test
+    fun testHandleCrsCarfDeclarationResultConfirmedSuccess() = runTest {
+        interactor.onLinkControllerState(mockLinkStateWithAccount())
+        whenever(cryptoApiRepository.confirmCrsCarfDeclaration(any()))
+            .thenReturn(Result.success(Unit))
+
+        val result = interactor.handleCrsCarfDeclarationResult(
+            CrsCarfDeclarationActivityResult(
+                CrsCarfDeclarationScreenAction.Confirm
+            )
+        )
+
+        assertThat(result).isInstanceOf(OnrampCrsCarfDeclarationResult.Confirmed::class.java)
+        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.CrsCarfDeclarationConfirmed)
+    }
+
+    @Test
+    fun testHandleCrsCarfDeclarationResultCancelled() = runTest {
+        val result = interactor.handleCrsCarfDeclarationResult(
+            CrsCarfDeclarationActivityResult(
+                CrsCarfDeclarationScreenAction.Cancelled
+            )
+        )
+
+        assertThat(result).isInstanceOf(OnrampCrsCarfDeclarationResult.Cancelled::class.java)
+    }
+
     @Test
     fun testCreateCryptoPaymentTokenFailsMissingCryptoCustomer() = runTest {
         interactor.onLinkControllerState(mockLinkStateWithAccount())
diff --git a/paymentsheet/api/paymentsheet.api b/paymentsheet/api/paymentsheet.api
index e24f425de2e..17ef922c59b 100644
--- a/paymentsheet/api/paymentsheet.api
+++ b/paymentsheet/api/paymentsheet.api
@@ -224,6 +224,12 @@ public abstract interface class com/stripe/android/customersheet/SetupIntentClie
 	public abstract fun provideSetupIntentClientSecret (Ljava/lang/String;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
 }
 
+public final class com/stripe/android/link/onramp/ui/ComposableSingletons$CrsCarfDeclarationScreenKt {
+	public static final field INSTANCE Lcom/stripe/android/link/onramp/ui/ComposableSingletons$CrsCarfDeclarationScreenKt;
+	public fun <init> ()V
+	public final fun getLambda$-2073378803$paymentsheet_release ()Lkotlin/jvm/functions/Function3;
+}
+
 public final class com/stripe/android/link/onramp/ui/ComposableSingletons$OnrampKYCRefreshScreenKt {
 	public static final field INSTANCE Lcom/stripe/android/link/onramp/ui/ComposableSingletons$OnrampKYCRefreshScreenKt;
 	public fun <init> ()V
diff --git a/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt b/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt
new file mode 100644
index 00000000000..c3b14d00938
--- /dev/null
+++ b/paymentsheet/src/main/java/com/stripe/android/link/onramp/ui/CrsCarfDeclarationScreen.kt
@@ -0,0 +1,105 @@
+package com.stripe.android.link.onramp.ui
+
+import androidx.activity.compose.BackHandler
+import androidx.annotation.RestrictTo
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.stripe.android.link.LinkAppearance
+import com.stripe.android.link.theme.DefaultLinkTheme
+import com.stripe.android.link.theme.LinkTheme
+import com.stripe.android.link.ui.PrimaryButton
+import com.stripe.android.link.ui.PrimaryButtonState
+
+@Composable
+@Suppress("LongMethod")
+@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+fun CrsCarfDeclarationScreen(
+    appearance: LinkAppearance.State?,
+    attestationText: String,
+    onClose: () -> Unit,
+    onConfirm: () -> Unit
+) {
+    BackHandler(onBack = onClose)
+
+    DefaultLinkTheme(appearance = appearance) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(LinkTheme.colors.surfaceBackdrop.copy(alpha = 0.32f))
+        ) {
+            Surface(
+                modifier = Modifier
+                    .align(Alignment.BottomCenter)
+                    .fillMaxWidth(),
+                color = LinkTheme.colors.surfacePrimary,
+                shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp),
+                elevation = 8.dp,
+            ) {
+                Column(
+                    modifier = Modifier
+                        .navigationBarsPadding()
+                        .padding(horizontal = 24.dp, vertical = 20.dp)
+                ) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Text(
+                            text = "Declarations",
+                            style = LinkTheme.typography.title,
+                            color = LinkTheme.colors.textPrimary
+                        )
+                        TextButton(onClick = onClose) {
+                            Text(
+                                text = "Cancel",
+                                style = LinkTheme.typography.detailEmphasized,
+                                color = LinkTheme.colors.textSecondary
+                            )
+                        }
+                    }
+
+                    Spacer(Modifier.height(16.dp))
+
+                    Text(
+                        text = attestationText,
+                        style = LinkTheme.typography.body,
+                        color = LinkTheme.colors.textPrimary,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .weight(1f, fill = false)
+                            .verticalScroll(rememberScrollState())
+                    )
+
+                    Spacer(Modifier.height(24.dp))
+
+                    PrimaryButton(
+                        label = "Accept",
+                        state = PrimaryButtonState.Enabled,
+                        onButtonClick = onConfirm,
+                        modifier = Modifier.fillMaxWidth()
+                    )
+                }
+            }
+        }
+    }
+}

From 882d719170521eba975af6d40346d9935ec36a6f Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Wed, 6 May 2026 18:04:10 -0400
Subject: [PATCH 27/57] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad669b24dff..8095c1697c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,8 @@ NEXT_VERSION_BUMP: MINOR
 * [ADDED][13019](https://github.com/stripe/stripe-android/pull/13019) Added new birth city, birth country, and nationalities properties to KYCInfo.
 * [ADDED][13019](https://github.com/stripe/stripe-android/pull/13019) New public types for interacting with Compliance regulations and identifiers.
 * [REMOVED][13019](https://github.com/stripe/stripe-android/pull/13019) Removed KycRetrieveResponse from the public API as it was not intended to be accessible.
+* [ADDED][13038](https://github.com/stripe/stripe-android/pull/13038) Added `OnrampCoordinator` APIs for EU support: `retrieveMissingIdentifiers()`, `submitIdentifiers(_:)`, and `presentCRSCARFDeclaration()`, as well as associated result types for those calls.
+* [ADDED][13038](https://github.com/stripe/stripe-android/pull/13038) Added new `OnrampCallbacks` API to support crsCarfDeclaration acceptance.
 
 ## 23.7.0 - 2026-05-04
 

From e4cd47ce8803c2c74c13d9cedf88f8c3cc410a6d Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Thu, 7 May 2026 13:31:22 -0400
Subject: [PATCH 28/57] fix dependencies

---
 crypto-onramp-example/dependencies/dependencies.txt | 2 ++
 crypto-onramp/dependencies/dependencies.txt         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/crypto-onramp-example/dependencies/dependencies.txt b/crypto-onramp-example/dependencies/dependencies.txt
index 75d5b636f14..869a171faef 100644
--- a/crypto-onramp-example/dependencies/dependencies.txt
+++ b/crypto-onramp-example/dependencies/dependencies.txt
@@ -1344,6 +1344,8 @@
 |    +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0 (*)
 |    +--- com.google.android.gms:play-services-wallet:19.5.0 (*)
 |    +--- androidx.activity:activity-compose:1.12.4 (*)
+|    +--- androidx.compose.foundation:foundation:1.10.6 (*)
+|    +--- androidx.compose.material:material:1.10.6 (*)
 |    +--- com.google.dagger:dagger:2.58 (*)
 |    +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21 (*)
 |    \--- dev.drewhamilton.poko:poko-annotations:0.20.2 (*)
diff --git a/crypto-onramp/dependencies/dependencies.txt b/crypto-onramp/dependencies/dependencies.txt
index c9f5ff65fe0..42beed48984 100644
--- a/crypto-onramp/dependencies/dependencies.txt
+++ b/crypto-onramp/dependencies/dependencies.txt
@@ -1341,6 +1341,8 @@
 +--- org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0 (*)
 +--- com.google.android.gms:play-services-wallet:19.5.0 (*)
 +--- androidx.activity:activity-compose:1.12.4 (*)
++--- androidx.compose.foundation:foundation:1.10.6 (*)
++--- androidx.compose.material:material:1.10.6 (*)
 +--- com.google.dagger:dagger:2.58 (*)
 +--- org.jetbrains.kotlin:kotlin-parcelize-runtime:2.2.21 (*)
 \--- dev.drewhamilton.poko:poko-annotations:0.20.2 (*)
\ No newline at end of file

From b57f4dae22c241545982b5d6ee8c5b0539c33456 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Thu, 7 May 2026 14:05:59 -0400
Subject: [PATCH 29/57] Match analytics to iOS

---
 .../android/crypto/onramp/OnrampInteractor.kt     | 12 ++++++------
 .../onramp/analytics/OnrampAnalyticsEvent.kt      | 15 +++++++++------
 .../android/crypto/onramp/OnrampInteractorTest.kt |  6 +++---
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
index e4ed815be1a..b30ccecaf6c 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
@@ -383,7 +383,7 @@ internal class OnrampInteractor @Inject constructor(
         return cryptoApiRepository.submitIdentifiers(identifiers, secret)
             .fold(
                 onSuccess = { result ->
-                    analyticsService?.track(OnrampAnalyticsEvent.IdentifiersSubmitted)
+                    analyticsService?.track(OnrampAnalyticsEvent.IdentifiersSubmitted(result.valid))
                     OnrampSubmitIdentifiersResult.Completed(result)
                 },
                 onFailure = { error ->
@@ -404,7 +404,7 @@ internal class OnrampInteractor @Inject constructor(
             val error = MissingConsumerSecretException()
             analyticsService?.track(
                 OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.ConfirmCrsCarfDeclaration,
+                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.PresentCRSCARFDeclaration,
                     error = error,
                 )
             )
@@ -423,7 +423,7 @@ internal class OnrampInteractor @Inject constructor(
                 onFailure = { error ->
                     analyticsService?.track(
                         OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.ConfirmCrsCarfDeclaration,
+                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.PresentCRSCARFDeclaration,
                             error = error,
                         )
                     )
@@ -810,14 +810,14 @@ internal class OnrampInteractor @Inject constructor(
 
                 confirmResult.fold(
                     onSuccess = {
-                        analyticsService?.track(OnrampAnalyticsEvent.CrsCarfDeclarationConfirmed)
+                        analyticsService?.track(OnrampAnalyticsEvent.CrsCarfDeclarationCompleted)
 
                         OnrampCrsCarfDeclarationResult.Confirmed()
                     },
                     onFailure = { error ->
                         analyticsService?.track(
                             OnrampAnalyticsEvent.ErrorOccurred(
-                                operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.ConfirmCrsCarfDeclaration,
+                                operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.PresentCRSCARFDeclaration,
                                 error = error,
                             )
                         )
@@ -829,7 +829,7 @@ internal class OnrampInteractor @Inject constructor(
                 val error = MissingConsumerSecretException()
                 analyticsService?.track(
                     OnrampAnalyticsEvent.ErrorOccurred(
-                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.ConfirmCrsCarfDeclaration,
+                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.PresentCRSCARFDeclaration,
                         error = error,
                     )
                 )
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
index 6afc20e1751..5348e05ec3e 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/analytics/OnrampAnalyticsEvent.kt
@@ -74,19 +74,22 @@ internal sealed class OnrampAnalyticsEvent(
     )
 
     data object MissingIdentifiersRetrieved : OnrampAnalyticsEvent(
-        name = "missing_identifiers_retrieved"
+        name = "identifier_requirements_retrieved"
     )
 
-    data object IdentifiersSubmitted : OnrampAnalyticsEvent(
-        name = "identifiers_submitted"
+    class IdentifiersSubmitted(valid: Boolean) : OnrampAnalyticsEvent(
+        name = "identifiers_submitted",
+        params = mapOf(
+            "valid" to valid.toString()
+        )
     )
 
     data object CrsCarfDeclarationStarted : OnrampAnalyticsEvent(
         name = "crs_carf_declaration_started"
     )
 
-    data object CrsCarfDeclarationConfirmed : OnrampAnalyticsEvent(
-        name = "crs_carf_declaration_confirmed"
+    data object CrsCarfDeclarationCompleted : OnrampAnalyticsEvent(
+        name = "crs_carf_declaration_completed"
     )
 
     class WalletRegistered(
@@ -180,7 +183,7 @@ internal sealed class OnrampAnalyticsEvent(
             VerifyKyc("verify_kyc_info"),
             RetrieveMissingIdentifiers("retrieve_missing_identifiers"),
             SubmitIdentifiers("submit_identifiers"),
-            ConfirmCrsCarfDeclaration("confirm_crs_carf_declaration")
+            PresentCRSCARFDeclaration("prompt_for_crs_carf_declaration")
         }
     }
 
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index b8b4fd79d72..6b357dbc96c 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -239,7 +239,7 @@ class OnrampInteractorTest {
     fun testSubmitIdentifiersIsSuccessful() = runTest {
         whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
         val submissionResult = SubmitIdentifiersResult(
-            valid = false,
+            valid = true,
             identifiers = listOf(
                 ComplianceIdentifierRequirement(
                     type = ComplianceIdentifierType.DE_STN,
@@ -278,7 +278,7 @@ class OnrampInteractorTest {
         assertThat(result).isInstanceOf(OnrampSubmitIdentifiersResult.Completed::class.java)
         val completed = result as OnrampSubmitIdentifiersResult.Completed
         assertThat(completed.result).isEqualTo(submissionResult)
-        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.IdentifiersSubmitted)
+        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.IdentifiersSubmitted(valid = true))
     }
 
     @Test
@@ -669,7 +669,7 @@ class OnrampInteractorTest {
         )
 
         assertThat(result).isInstanceOf(OnrampCrsCarfDeclarationResult.Confirmed::class.java)
-        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.CrsCarfDeclarationConfirmed)
+        testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.CrsCarfDeclarationCompleted)
     }
 
     @Test

From e1fce7a488a6f21a29a375bdcd24061618b03a3f Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Thu, 7 May 2026 14:16:48 -0400
Subject: [PATCH 30/57] linting

---
 .../android/crypto/onramp/example/OnrampViewModel.kt | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index 056d0b6a5aa..f334f7ef0de 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -20,11 +20,6 @@ import com.stripe.android.crypto.onramp.OnrampCoordinator
 import com.stripe.android.crypto.onramp.example.network.OnrampSessionResponse
 import com.stripe.android.crypto.onramp.example.network.SettlementSpeed
 import com.stripe.android.crypto.onramp.example.network.TestBackendRepository
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifier
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierAlternativeGroup
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirement
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierRequirements
-import com.stripe.android.crypto.onramp.model.ComplianceIdentifierType
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
 import com.stripe.android.crypto.onramp.model.LinkUserInfo
@@ -47,7 +42,12 @@ import com.stripe.android.crypto.onramp.model.OnrampUpdatePhoneNumberResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyIdentityResult
 import com.stripe.android.crypto.onramp.model.OnrampVerifyKycInfoResult
 import com.stripe.android.crypto.onramp.model.PaymentMethodDisplayData
-import com.stripe.android.crypto.onramp.model.SubmitIdentifiersResult
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifier
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierAlternativeGroup
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirement
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierRequirements
+import com.stripe.android.crypto.onramp.model.compliance.ComplianceIdentifierType
+import com.stripe.android.crypto.onramp.model.compliance.SubmitIdentifiersResult
 import com.stripe.android.googlepaylauncher.GooglePayEnvironment
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
 import com.stripe.android.link.LinkAppearance

From ad49ec2f5bddd6fd6b1fd30734ce7b9a2754f666 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 12 May 2026 12:19:35 -0400
Subject: [PATCH 31/57] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1fac6f4136..79cf1d47508 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # CHANGELOG
 
-NEXT_VERSION_BUMP: MINOR
+NEXT_VERSION_BUMP: PATCH
 ## XX.XX.XX - 20XX-XX-XX
 
 ## 23.8.0 - 2026-05-11

From cf931559c3736fec9456182caf8a888a0fda869d Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 19 May 2026 14:47:45 -0400
Subject: [PATCH 32/57] Initial error api attempt

---
 .../crypto/onramp/example/OnrampViewModel.kt  |  55 ++-
 crypto-onramp/api/crypto-onramp.api           |  23 +
 crypto-onramp/res/values/strings.xml          |  19 +
 .../android/crypto/onramp/OnrampInteractor.kt | 404 +++++++-----------
 .../onramp/exception/CryptoOnrampException.kt | 234 ++++++++++
 .../onramp/exception/OnrampErrorMapper.kt     |  56 +++
 .../repositories/CryptoApiRepository.kt       |  88 +++-
 .../crypto/onramp/CryptoApiRepositoryTest.kt  |  48 +++
 .../crypto/onramp/OnrampInteractorTest.kt     |  92 ++++
 9 files changed, 739 insertions(+), 280 deletions(-)
 create mode 100644 crypto-onramp/res/values/strings.xml
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index f334f7ef0de..44a7d6b250f 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -17,6 +17,7 @@ import androidx.lifecycle.viewmodel.CreationExtras
 import com.github.kittinunf.result.Result
 import com.stripe.android.core.utils.requireApplication
 import com.stripe.android.crypto.onramp.OnrampCoordinator
+import com.stripe.android.crypto.onramp.exception.CryptoOnrampException
 import com.stripe.android.crypto.onramp.example.network.OnrampSessionResponse
 import com.stripe.android.crypto.onramp.example.network.SettlementSpeed
 import com.stripe.android.crypto.onramp.example.network.TestBackendRepository
@@ -105,6 +106,16 @@ internal class OnrampViewModel(
 
     private val minPasswordLength = 8
 
+    private fun Throwable.displayMessage(): String {
+        val onrampError = this as? CryptoOnrampException
+
+        return onrampError?.userMessageResId
+            ?.let(application::getString)
+            ?: onrampError?.userMessage?.takeIf { it.isNotBlank() }
+            ?: message
+            ?: "Unknown error"
+    }
+
     private fun handleError(error: Throwable, onNonAuthError: () -> Unit = {}) {
         if (error.isLinkAuthorizationError()) {
             _message.value = "Session expired. Reauthorizing..."
@@ -212,7 +223,7 @@ internal class OnrampViewModel(
                 }
             }
             is Result.Failure -> {
-                _message.value = "Sign up failed: ${result.error.message}"
+                _message.value = "Sign up failed: ${result.error.displayMessage()}"
                 _uiState.update { it.copy(screen = Screen.LoginSignup, loadingMessage = null) }
             }
         }
@@ -247,7 +258,7 @@ internal class OnrampViewModel(
                 }
             }
             is Result.Failure -> {
-                _message.value = "Log in failed: ${result.error.message}"
+                _message.value = "Log in failed: ${result.error.displayMessage()}"
                 _uiState.update { it.copy(screen = Screen.LoginSignup, loadingMessage = null) }
             }
         }
@@ -268,14 +279,14 @@ internal class OnrampViewModel(
                         }
                         is OnrampTokenAuthenticationResult.Failed -> {
                             clearUserData()
-                            _message.value = "Seamless sign-in failed: ${authenticateResult.error.message}"
+                            _message.value = "Seamless sign-in failed: ${authenticateResult.error.displayMessage()}"
                             _uiState.update { state -> state.copy(screen = Screen.LoginSignup) }
                         }
                     }
                 }
                 is Result.Failure -> {
                     clearUserData()
-                    _message.value = "Seamless sign-in failed: ${result.error.message}"
+                    _message.value = "Seamless sign-in failed: ${result.error.displayMessage()}"
                     _uiState.update { state -> state.copy(screen = Screen.LoginSignup) }
                 }
             }
@@ -307,7 +318,7 @@ internal class OnrampViewModel(
                 }
             }
             is OnrampHasLinkAccountResult.Failed -> {
-                _message.value = "Lookup failed: ${result.error.message}"
+                _message.value = "Lookup failed: ${result.error.displayMessage()}"
                 _uiState.update { it.copy(screen = Screen.LoginSignup) }
             }
         }
@@ -342,7 +353,7 @@ internal class OnrampViewModel(
                 _message.value = "Identity Verification cancelled, please try again"
             }
             is OnrampVerifyIdentityResult.Failed -> {
-                _message.value = "Identity Verification failed: ${result.error.message}"
+                _message.value = "Identity Verification failed: ${result.error.displayMessage()}"
                 _uiState.update { it.copy(screen = Screen.LoginSignup) }
             }
         }
@@ -354,7 +365,7 @@ internal class OnrampViewModel(
                 _message.value = "CRS CARF Declaration Confirmed"
             }
             is OnrampCrsCarfDeclarationResult.Failed -> {
-                _message.value = "CRS CARF Declaration failed: ${result.error.message}"
+                _message.value = "CRS CARF Declaration failed: ${result.error.displayMessage()}"
             }
             is OnrampCrsCarfDeclarationResult.Cancelled -> {
                 _message.value = "CRS CARF Declaration cancelled, please try again"
@@ -375,7 +386,7 @@ internal class OnrampViewModel(
                 _message.value = "KYC Verification Cancelled"
             }
             is OnrampVerifyKycInfoResult.Failed -> {
-                _message.value = "KYC Verification Failed: ${result.error.message}"
+                _message.value = "KYC Verification Failed: ${result.error.displayMessage()}"
             }
         }
     }
@@ -408,7 +419,7 @@ internal class OnrampViewModel(
                 _message.value = "Payment selection cancelled, please try again"
             }
             is OnrampCollectPaymentMethodResult.Failed -> {
-                _message.value = "Payment selection failed: ${result.error.message}"
+                _message.value = "Payment selection failed: ${result.error.displayMessage()}"
                 _uiState.update { it.copy(screen = Screen.AuthenticatedOperations) }
             }
         }
@@ -445,7 +456,7 @@ internal class OnrampViewModel(
                 _message.value = "Authorization cancelled by user."
             }
             is OnrampAuthorizeResult.Failed -> {
-                _message.value = "Authorization failed: ${result.error.message}"
+                _message.value = "Authorization failed: ${result.error.displayMessage()}"
             }
         }
     }
@@ -462,7 +473,7 @@ internal class OnrampViewModel(
                 _uiState.update { it.copy(screen = Screen.AuthenticatedOperations, loadingMessage = null) }
             }
             is OnrampCheckoutResult.Failed -> {
-                _message.value = "Checkout failed: ${result.error.message}"
+                _message.value = "Checkout failed: ${result.error.displayMessage()}"
                 _uiState.update { it.copy(screen = Screen.AuthenticatedOperations, loadingMessage = null) }
             }
         }
@@ -490,7 +501,7 @@ internal class OnrampViewModel(
                 checkoutResponse.clientSecret
             }
             is Result.Failure -> {
-                throw IllegalStateException("Backend checkout failed: ${result.error.message}")
+                throw IllegalStateException("Backend checkout failed: ${result.error.displayMessage()}")
             }
         }
     }
@@ -509,7 +520,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is OnrampRegisterLinkUserResult.Failed -> {
-                    _message.value = "Registration failed: ${result.error.message}"
+                    _message.value = "Registration failed: ${result.error.displayMessage()}"
                     _uiState.update { it.copy(screen = Screen.LoginSignup) }
                 }
             }
@@ -537,7 +548,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is OnrampRegisterWalletAddressResult.Failed -> handleError(result.error) {
-                    _message.value = "Failed to register wallet address: ${result.error.message}"
+                    _message.value = "Failed to register wallet address: ${result.error.displayMessage()}"
                     _uiState.update { it.copy(screen = Screen.AuthenticatedOperations) }
                 }
             }
@@ -556,7 +567,7 @@ internal class OnrampViewModel(
                     _uiState.update { it.copy(screen = Screen.AuthenticatedOperations) }
                 }
                 is OnrampAttachKycInfoResult.Failed -> handleError(result.error) {
-                    _message.value = "KYC Collection failed: ${result.error.message}"
+                    _message.value = "KYC Collection failed: ${result.error.displayMessage()}"
                     _uiState.update { it.copy(screen = Screen.AuthenticatedOperations) }
                 }
             }
@@ -586,7 +597,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is OnrampRetrieveMissingIdentifiersResult.Failed -> handleError(result.error) {
-                    _message.value = "Failed to retrieve missing identifiers: ${result.error.message}"
+                    _message.value = "Failed to retrieve missing identifiers: ${result.error.displayMessage()}"
                     _uiState.update {
                         it.copy(
                             screen = Screen.AuthenticatedOperations,
@@ -623,7 +634,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is OnrampSubmitIdentifiersResult.Failed -> handleError(result.error) {
-                    _message.value = "Submit identifiers failed: ${result.error.message}"
+                    _message.value = "Submit identifiers failed: ${result.error.displayMessage()}"
                     _uiState.update {
                         it.copy(
                             screen = Screen.AuthenticatedOperations,
@@ -652,7 +663,7 @@ internal class OnrampViewModel(
                     _uiState.update { it.copy(screen = currentScreen) }
                 }
                 is OnrampUpdatePhoneNumberResult.Failed -> handleError(result.error) {
-                    _message.value = "Failed to update phone number: ${result.error.message}"
+                    _message.value = "Failed to update phone number: ${result.error.displayMessage()}"
                     _uiState.update { it.copy(screen = currentScreen) }
                 }
             }
@@ -676,7 +687,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is OnrampCreateCryptoPaymentTokenResult.Failed -> handleError(result.error) {
-                    _message.value = "Failed to create crypto payment token: ${result.error.message}"
+                    _message.value = "Failed to create crypto payment token: ${result.error.displayMessage()}"
                     _uiState.update { it.copy(screen = Screen.AuthenticatedOperations) }
                 }
             }
@@ -735,7 +746,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is Result.Failure -> {
-                    _message.value = "Failed to create onramp session: ${result.error.message}"
+                    _message.value = "Failed to create onramp session: ${result.error.displayMessage()}"
                     _uiState.update { it.copy(screen = Screen.AuthenticatedOperations, loadingMessage = null) }
                 }
             }
@@ -882,7 +893,7 @@ internal class OnrampViewModel(
                 return response.authIntentId
             }
             is Result.Failure -> {
-                _message.value = "Failed to create auth intent: ${result.error.message}"
+                _message.value = "Failed to create auth intent: ${result.error.displayMessage()}"
                 return null
             }
         }
@@ -905,7 +916,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is OnrampLogOutResult.Failed -> {
-                    _message.value = "Logout failed: ${result.error.message}"
+                    _message.value = "Logout failed: ${result.error.displayMessage()}"
                     _uiState.update { it.copy(screen = Screen.AuthenticatedOperations, loadingMessage = null) }
                 }
             }
diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 3fe145a0a42..bfe03d9ed0b 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -34,6 +34,29 @@ public final class com/stripe/android/crypto/onramp/OnrampCoordinator$Presenter
 	public static synthetic fun verifyKycInfo$default (Lcom/stripe/android/crypto/onramp/OnrampCoordinator$Presenter;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;ILjava/lang/Object;)V
 }
 
+public final class com/stripe/android/crypto/onramp/exception/AppAttestationException : com/stripe/android/crypto/onramp/exception/CryptoOnrampException {
+	public static final field $stable I
+	public final fun getApiErrorCode ()Ljava/lang/String;
+	public final fun getApiErrorMessage ()Ljava/lang/String;
+	public final fun getApiUserMessage ()Ljava/lang/String;
+	public final fun getAppPackageName ()Ljava/lang/String;
+	public final fun getDocUrl ()Ljava/lang/String;
+	public final fun getMode ()Ljava/lang/String;
+	public final fun getOperation ()Ljava/lang/String;
+	public final fun getReason ()Ljava/lang/String;
+	public final fun getSdkVersion ()Ljava/lang/String;
+	public fun getUserMessage ()Ljava/lang/String;
+	public fun getUserMessageResId ()Ljava/lang/Integer;
+}
+
+public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampException : com/stripe/android/core/exception/StripeException {
+	public static final field $stable I
+	public fun analyticsValue ()Ljava/lang/String;
+	public final fun getRawStripeError ()Lcom/stripe/android/core/StripeError;
+	public abstract fun getUserMessage ()Ljava/lang/String;
+	public abstract fun getUserMessageResId ()Ljava/lang/Integer;
+}
+
 public final class com/stripe/android/crypto/onramp/exception/MissingConsumerSecretException : java/lang/IllegalStateException {
 	public static final field $stable I
 }
diff --git a/crypto-onramp/res/values/strings.xml b/crypto-onramp/res/values/strings.xml
new file mode 100644
index 00000000000..c4328701bab
--- /dev/null
+++ b/crypto-onramp/res/values/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <!-- App-user message for Crypto Onramp app attestation failures when app attestation is not enabled yet. -->
+  <string name="stripe_onramp_app_attestation_not_enabled_user_message">Onramp isn\'t available in this app right now. Please try again later.</string>
+  <!-- App-user message for Crypto Onramp app attestation failures when the app is not registered as trusted. -->
+  <string name="stripe_onramp_app_attestation_not_registered_user_message">This app couldn\'t be verified. Install the latest version and try again.</string>
+  <!-- App-user message for Crypto Onramp app attestation failures when attestation data is missing. -->
+  <string name="stripe_onramp_app_attestation_data_missing_user_message">This app couldn\'t be verified. Install the latest version and try again.</string>
+  <!-- Fallback app-user message for Crypto Onramp app attestation failures. -->
+  <string name="stripe_onramp_app_attestation_default_user_message">This app couldn\'t be verified. Please try again later.</string>
+  <!-- App-user message for Crypto Onramp app attestation failures caused by non-Google Play distribution. -->
+  <string name="stripe_onramp_app_attestation_play_user_message">This app couldn\'t be verified. Install it from Google Play and try again.</string>
+  <!-- App-user message for Crypto Onramp app attestation failures when the installed app variant is incorrect. -->
+  <string name="stripe_onramp_app_attestation_package_name_mismatch_user_message">This app couldn\'t be verified. Install the official version and try again.</string>
+  <!-- App-user message for Crypto Onramp app attestation failures when the installed Google Play variant does not match the environment. -->
+  <string name="stripe_onramp_app_attestation_environment_mismatch_user_message">This app couldn\'t be verified. Install the correct Google Play version and try again.</string>
+  <!-- App-user message for Crypto Onramp app attestation failures when the Play Integrity verdict could not be validated. -->
+  <string name="stripe_onramp_app_attestation_verdict_validation_failed_user_message">This app couldn\'t be verified. Try again.</string>
+</resources>
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
index b30ccecaf6c..616b8437e8b 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
@@ -10,10 +10,12 @@ import com.stripe.android.core.utils.flatMapCatching
 import com.stripe.android.crypto.onramp.CheckoutState.Status
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsService
+import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent.ErrorOccurred.Operation
 import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.exception.MissingPaymentMethodException
 import com.stripe.android.crypto.onramp.exception.PaymentFailedException
+import com.stripe.android.crypto.onramp.exception.toCryptoOnrampError
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoNetwork
 import com.stripe.android.crypto.onramp.model.KycInfo
@@ -80,6 +82,29 @@ internal class OnrampInteractor @Inject constructor(
 
     private var analyticsService: OnrampAnalyticsService? = null
 
+    private fun mapError(
+        operation: Operation,
+        error: Throwable,
+    ): Throwable {
+        return error.toCryptoOnrampError(
+            context = application,
+            operation = operation,
+            publishableKey = state.value.configurationState?.publishableKey,
+        )
+    }
+
+    private fun trackError(
+        operation: Operation,
+        error: Throwable,
+    ) {
+        analyticsService?.track(
+            OnrampAnalyticsEvent.ErrorOccurred(
+                operation = operation,
+                error = error,
+            )
+        )
+    }
+
     suspend fun configure(configurationState: OnrampConfiguration.State): OnrampConfigurationResult {
         _state.update { currentState ->
             OnrampState(
@@ -108,13 +133,9 @@ internal class OnrampInteractor @Inject constructor(
         return when (linkResult) {
             is ConfigureResult.Success -> OnrampConfigurationResult.Completed(success = true)
             is ConfigureResult.Failed -> {
-                analyticsService?.track(
-                    OnrampAnalyticsEvent.ErrorOccurred(
-                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.Configure,
-                        error = linkResult.error,
-                    )
-                )
-                OnrampConfigurationResult.Failed(linkResult.error)
+                val error = mapError(Operation.Configure, linkResult.error)
+                trackError(Operation.Configure, error)
+                OnrampConfigurationResult.Failed(error)
             }
         }
     }
@@ -138,36 +159,24 @@ internal class OnrampInteractor @Inject constructor(
                                 OnrampTokenAuthenticationResult.Completed()
                             },
                             onFailure = { error ->
-                                analyticsService?.track(
-                                    OnrampAnalyticsEvent.ErrorOccurred(
-                                        OnrampAnalyticsEvent.ErrorOccurred.Operation.AuthenticateUserWithAuthToken,
-                                        error,
-                                    )
-                                )
-
-                                OnrampTokenAuthenticationResult.Failed(error)
+                                val mappedError = mapError(Operation.AuthenticateUserWithAuthToken, error)
+                                trackError(Operation.AuthenticateUserWithAuthToken, mappedError)
+                                OnrampTokenAuthenticationResult.Failed(mappedError)
                             }
                         )
                 } else {
-                    val error = MissingConsumerSecretException()
-                    analyticsService?.track(
-                        OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.AuthenticateUserWithAuthToken,
-                            error = error,
-                        )
+                    val error = mapError(
+                        operation = Operation.AuthenticateUserWithAuthToken,
+                        error = MissingConsumerSecretException(),
                     )
+                    trackError(Operation.AuthenticateUserWithAuthToken, error)
                     OnrampTokenAuthenticationResult.Failed(error)
                 }
             }
             is LinkController.AuthenticateWithTokenResult.Failed -> {
-                analyticsService?.track(
-                    OnrampAnalyticsEvent.ErrorOccurred(
-                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.AuthenticateUserWithAuthToken,
-                        error = result.error,
-                    )
-                )
-
-                OnrampTokenAuthenticationResult.Failed(result.error)
+                val error = mapError(Operation.AuthenticateUserWithAuthToken, result.error)
+                trackError(Operation.AuthenticateUserWithAuthToken, error)
+                OnrampTokenAuthenticationResult.Failed(error)
             }
         }
     }
@@ -185,14 +194,10 @@ internal class OnrampInteractor @Inject constructor(
                 )
             }
             is LinkController.LookupConsumerResult.Failed -> {
-                analyticsService?.track(
-                    OnrampAnalyticsEvent.ErrorOccurred(
-                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.HasLinkAccount,
-                        error = result.error,
-                    )
-                )
+                val error = mapError(Operation.HasLinkAccount, result.error)
+                trackError(Operation.HasLinkAccount, error)
                 OnrampHasLinkAccountResult.Failed(
-                    error = result.error
+                    error = error
                 )
             }
         }
@@ -217,35 +222,25 @@ internal class OnrampInteractor @Inject constructor(
                             OnrampRegisterLinkUserResult.Completed(customerResponse.id)
                         },
                         onFailure = { error ->
-                            analyticsService?.track(
-                                OnrampAnalyticsEvent.ErrorOccurred(
-                                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.RegisterLinkUser,
-                                    error = error,
-                                )
-                            )
-                            OnrampRegisterLinkUserResult.Failed(error)
+                            val mappedError = mapError(Operation.RegisterLinkUser, error)
+                            trackError(Operation.RegisterLinkUser, mappedError)
+                            OnrampRegisterLinkUserResult.Failed(mappedError)
                         }
                     )
                 } else {
-                    val error = MissingConsumerSecretException()
-                    analyticsService?.track(
-                        OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.RegisterLinkUser,
-                            error = error,
-                        )
+                    val error = mapError(
+                        operation = Operation.RegisterLinkUser,
+                        error = MissingConsumerSecretException(),
                     )
+                    trackError(Operation.RegisterLinkUser, error)
                     OnrampRegisterLinkUserResult.Failed(error)
                 }
             }
             is LinkController.RegisterConsumerResult.Failed -> {
-                analyticsService?.track(
-                    OnrampAnalyticsEvent.ErrorOccurred(
-                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.RegisterLinkUser,
-                        error = result.error,
-                    )
-                )
+                val error = mapError(Operation.RegisterLinkUser, result.error)
+                trackError(Operation.RegisterLinkUser, error)
                 OnrampRegisterLinkUserResult.Failed(
-                    error = result.error
+                    error = error
                 )
             }
         }
@@ -258,14 +253,10 @@ internal class OnrampInteractor @Inject constructor(
                 OnrampUpdatePhoneNumberResult.Completed()
             }
             is LinkController.UpdatePhoneNumberResult.Failed -> {
-                analyticsService?.track(
-                    OnrampAnalyticsEvent.ErrorOccurred(
-                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.UpdatePhoneNumber,
-                        error = result.error,
-                    )
-                )
+                val error = mapError(Operation.UpdatePhoneNumber, result.error)
+                trackError(Operation.UpdatePhoneNumber, error)
                 OnrampUpdatePhoneNumberResult.Failed(
-                    error = result.error
+                    error = error
                 )
             }
         }
@@ -284,23 +275,17 @@ internal class OnrampInteractor @Inject constructor(
                     OnrampRegisterWalletAddressResult.Completed()
                 },
                 onFailure = { error ->
-                    analyticsService?.track(
-                        OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.RegisterWalletAddress,
-                            error = error,
-                        )
-                    )
-                    OnrampRegisterWalletAddressResult.Failed(error)
+                    val mappedError = mapError(Operation.RegisterWalletAddress, error)
+                    trackError(Operation.RegisterWalletAddress, mappedError)
+                    OnrampRegisterWalletAddressResult.Failed(mappedError)
                 }
             )
         } else {
-            val error = MissingConsumerSecretException()
-            analyticsService?.track(
-                OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.RegisterWalletAddress,
-                    error = error,
-                )
+            val error = mapError(
+                operation = Operation.RegisterWalletAddress,
+                error = MissingConsumerSecretException(),
             )
+            trackError(Operation.RegisterWalletAddress, error)
             OnrampRegisterWalletAddressResult.Failed(error)
         }
     }
@@ -308,13 +293,11 @@ internal class OnrampInteractor @Inject constructor(
     suspend fun attachKycInfo(kycInfo: KycInfo): OnrampAttachKycInfoResult {
         val secret = consumerSessionClientSecret()
         if (secret == null) {
-            val error = MissingConsumerSecretException()
-            analyticsService?.track(
-                OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.AttachKycInfo,
-                    error = error,
-                )
+            val error = mapError(
+                operation = Operation.AttachKycInfo,
+                error = MissingConsumerSecretException(),
             )
+            trackError(Operation.AttachKycInfo, error)
             return OnrampAttachKycInfoResult.Failed(error)
         }
 
@@ -325,13 +308,9 @@ internal class OnrampInteractor @Inject constructor(
                     OnrampAttachKycInfoResult.Completed()
                 },
                 onFailure = { error ->
-                    analyticsService?.track(
-                        OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.AttachKycInfo,
-                            error = error,
-                        )
-                    )
-                    OnrampAttachKycInfoResult.Failed(error)
+                    val mappedError = mapError(Operation.AttachKycInfo, error)
+                    trackError(Operation.AttachKycInfo, mappedError)
+                    OnrampAttachKycInfoResult.Failed(mappedError)
                 }
             )
     }
@@ -339,13 +318,11 @@ internal class OnrampInteractor @Inject constructor(
     suspend fun retrieveMissingIdentifiers(): OnrampRetrieveMissingIdentifiersResult {
         val secret = consumerSessionClientSecret()
         if (secret == null) {
-            val error = MissingConsumerSecretException()
-            analyticsService?.track(
-                OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.RetrieveMissingIdentifiers,
-                    error = error,
-                )
+            val error = mapError(
+                operation = Operation.RetrieveMissingIdentifiers,
+                error = MissingConsumerSecretException(),
             )
+            trackError(Operation.RetrieveMissingIdentifiers, error)
             return OnrampRetrieveMissingIdentifiersResult.Failed(error)
         }
 
@@ -356,13 +333,9 @@ internal class OnrampInteractor @Inject constructor(
                     OnrampRetrieveMissingIdentifiersResult.Completed(requirements)
                 },
                 onFailure = { error ->
-                    analyticsService?.track(
-                        OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.RetrieveMissingIdentifiers,
-                            error = error,
-                        )
-                    )
-                    OnrampRetrieveMissingIdentifiersResult.Failed(error)
+                    val mappedError = mapError(Operation.RetrieveMissingIdentifiers, error)
+                    trackError(Operation.RetrieveMissingIdentifiers, mappedError)
+                    OnrampRetrieveMissingIdentifiersResult.Failed(mappedError)
                 }
             )
     }
@@ -370,13 +343,11 @@ internal class OnrampInteractor @Inject constructor(
     suspend fun submitIdentifiers(identifiers: List<ComplianceIdentifier>): OnrampSubmitIdentifiersResult {
         val secret = consumerSessionClientSecret()
         if (secret == null) {
-            val error = MissingConsumerSecretException()
-            analyticsService?.track(
-                OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.SubmitIdentifiers,
-                    error = error,
-                )
+            val error = mapError(
+                operation = Operation.SubmitIdentifiers,
+                error = MissingConsumerSecretException(),
             )
+            trackError(Operation.SubmitIdentifiers, error)
             return OnrampSubmitIdentifiersResult.Failed(error)
         }
 
@@ -387,13 +358,9 @@ internal class OnrampInteractor @Inject constructor(
                     OnrampSubmitIdentifiersResult.Completed(result)
                 },
                 onFailure = { error ->
-                    analyticsService?.track(
-                        OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.SubmitIdentifiers,
-                            error = error,
-                        )
-                    )
-                    OnrampSubmitIdentifiersResult.Failed(error)
+                    val mappedError = mapError(Operation.SubmitIdentifiers, error)
+                    trackError(Operation.SubmitIdentifiers, mappedError)
+                    OnrampSubmitIdentifiersResult.Failed(mappedError)
                 }
             )
     }
@@ -401,13 +368,11 @@ internal class OnrampInteractor @Inject constructor(
     suspend fun startCrsCarfDeclaration(): OnrampStartCrsCarfDeclarationResult {
         val secret = consumerSessionClientSecret()
         if (secret == null) {
-            val error = MissingConsumerSecretException()
-            analyticsService?.track(
-                OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.PresentCRSCARFDeclaration,
-                    error = error,
-                )
+            val error = mapError(
+                operation = Operation.PresentCRSCARFDeclaration,
+                error = MissingConsumerSecretException(),
             )
+            trackError(Operation.PresentCRSCARFDeclaration, error)
             return OnrampStartCrsCarfDeclarationResult.Failed(error)
         }
 
@@ -421,13 +386,9 @@ internal class OnrampInteractor @Inject constructor(
                     )
                 },
                 onFailure = { error ->
-                    analyticsService?.track(
-                        OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.PresentCRSCARFDeclaration,
-                            error = error,
-                        )
-                    )
-                    OnrampStartCrsCarfDeclarationResult.Failed(error)
+                    val mappedError = mapError(Operation.PresentCRSCARFDeclaration, error)
+                    trackError(Operation.PresentCRSCARFDeclaration, mappedError)
+                    OnrampStartCrsCarfDeclarationResult.Failed(mappedError)
                 }
             )
     }
@@ -435,13 +396,11 @@ internal class OnrampInteractor @Inject constructor(
     suspend fun startIdentityVerification(): OnrampStartVerificationResult {
         val secret = consumerSessionClientSecret()
         if (secret == null) {
-            val error = MissingConsumerSecretException()
-            analyticsService?.track(
-                OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.VerifyIdentity,
-                    error = error,
-                )
+            val error = mapError(
+                operation = Operation.VerifyIdentity,
+                error = MissingConsumerSecretException(),
             )
+            trackError(Operation.VerifyIdentity, error)
             return OnrampStartVerificationResult.Failed(error)
         }
 
@@ -452,13 +411,9 @@ internal class OnrampInteractor @Inject constructor(
                     OnrampStartVerificationResult.Completed(result)
                 },
                 onFailure = { error ->
-                    analyticsService?.track(
-                        OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.VerifyIdentity,
-                            error = error,
-                        )
-                    )
-                    OnrampStartVerificationResult.Failed(error)
+                    val mappedError = mapError(Operation.VerifyIdentity, error)
+                    trackError(Operation.VerifyIdentity, mappedError)
+                    OnrampStartVerificationResult.Failed(mappedError)
                 }
             )
     }
@@ -467,13 +422,11 @@ internal class OnrampInteractor @Inject constructor(
         val secret = consumerSessionClientSecret()
 
         if (secret == null) {
-            val error = MissingConsumerSecretException()
-            analyticsService?.track(
-                OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.VerifyKyc,
-                    error = error,
-                )
+            val error = mapError(
+                operation = Operation.VerifyKyc,
+                error = MissingConsumerSecretException(),
             )
+            trackError(Operation.VerifyKyc, error)
             return OnrampStartKycVerificationResult.Failed(error)
         }
 
@@ -492,12 +445,9 @@ internal class OnrampInteractor @Inject constructor(
                     )
                 },
                 onFailure = { error ->
-                    OnrampAnalyticsEvent.ErrorOccurred(
-                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.VerifyKyc,
-                        error = error,
-                    )
-
-                    OnrampStartKycVerificationResult.Failed(error)
+                    val mappedError = mapError(Operation.VerifyKyc, error)
+                    trackError(Operation.VerifyKyc, mappedError)
+                    OnrampStartKycVerificationResult.Failed(mappedError)
                 }
             )
     }
@@ -506,13 +456,11 @@ internal class OnrampInteractor @Inject constructor(
     suspend fun createCryptoPaymentToken(): OnrampCreateCryptoPaymentTokenResult {
         val cryptoCustomerId = _state.value.cryptoCustomerId
         if (cryptoCustomerId == null) {
-            val error = MissingCryptoCustomerException()
-            analyticsService?.track(
-                OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.CreateCryptoPaymentToken,
-                    error = error,
-                )
+            val error = mapError(
+                operation = Operation.CreateCryptoPaymentToken,
+                error = MissingCryptoCustomerException(),
             )
+            trackError(Operation.CreateCryptoPaymentToken, error)
             return OnrampCreateCryptoPaymentTokenResult.Failed(error)
         }
 
@@ -554,13 +502,9 @@ internal class OnrampInteractor @Inject constructor(
                     OnrampCreateCryptoPaymentTokenResult.Completed(cryptoPaymentToken.id)
                 },
                 onFailure = { error ->
-                    analyticsService?.track(
-                        OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.CreateCryptoPaymentToken,
-                            error = error,
-                        )
-                    )
-                    OnrampCreateCryptoPaymentTokenResult.Failed(error)
+                    val mappedError = mapError(Operation.CreateCryptoPaymentToken, error)
+                    trackError(Operation.CreateCryptoPaymentToken, mappedError)
+                    OnrampCreateCryptoPaymentTokenResult.Failed(mappedError)
                 }
             )
     }
@@ -572,13 +516,9 @@ internal class OnrampInteractor @Inject constructor(
                 OnrampLogOutResult.Completed()
             }
             is LinkController.LogOutResult.Failed -> {
-                analyticsService?.track(
-                    OnrampAnalyticsEvent.ErrorOccurred(
-                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.LogOut,
-                        error = result.error,
-                    )
-                )
-                OnrampLogOutResult.Failed(result.error)
+                val error = mapError(Operation.LogOut, result.error)
+                trackError(Operation.LogOut, error)
+                OnrampLogOutResult.Failed(error)
             }
         }
     }
@@ -596,23 +536,17 @@ internal class OnrampInteractor @Inject constructor(
                         OnrampAuthorizeResult.Consented(customerResponse.id)
                     },
                     onFailure = { error ->
-                        analyticsService?.track(
-                            OnrampAnalyticsEvent.ErrorOccurred(
-                                operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.Authorize,
-                                error = error,
-                            )
-                        )
-                        OnrampAuthorizeResult.Failed(error)
+                        val mappedError = mapError(Operation.Authorize, error)
+                        trackError(Operation.Authorize, mappedError)
+                        OnrampAuthorizeResult.Failed(mappedError)
                     }
                 )
             } else {
-                val error = MissingConsumerSecretException()
-                analyticsService?.track(
-                    OnrampAnalyticsEvent.ErrorOccurred(
-                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.Authorize,
-                        error = error,
-                    )
+                val error = mapError(
+                    operation = Operation.Authorize,
+                    error = MissingConsumerSecretException(),
                 )
+                trackError(Operation.Authorize, error)
                 OnrampAuthorizeResult.Failed(error)
             }
         }
@@ -623,13 +557,9 @@ internal class OnrampInteractor @Inject constructor(
         is LinkController.AuthorizeResult.Canceled ->
             OnrampAuthorizeResult.Canceled()
         is LinkController.AuthorizeResult.Failed -> {
-            analyticsService?.track(
-                OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.Authorize,
-                    error = result.error,
-                )
-            )
-            OnrampAuthorizeResult.Failed(result.error)
+            val error = mapError(Operation.Authorize, result.error)
+            trackError(Operation.Authorize, error)
+            OnrampAuthorizeResult.Failed(error)
         }
     }
 
@@ -641,13 +571,9 @@ internal class OnrampInteractor @Inject constructor(
             OnrampVerifyIdentityResult.Completed()
         }
         is IdentityVerificationSheet.VerificationFlowResult.Failed -> {
-            analyticsService?.track(
-                OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.VerifyIdentity,
-                    error = result.throwable,
-                )
-            )
-            OnrampVerifyIdentityResult.Failed(result.throwable)
+            val error = mapError(Operation.VerifyIdentity, result.throwable)
+            trackError(Operation.VerifyIdentity, error)
+            OnrampVerifyIdentityResult.Failed(error)
         }
         is IdentityVerificationSheet.VerificationFlowResult.Canceled ->
             OnrampVerifyIdentityResult.Cancelled()
@@ -682,13 +608,9 @@ internal class OnrampInteractor @Inject constructor(
             }
         }
         is LinkController.PresentPaymentMethodsResult.Failed -> {
-            analyticsService?.track(
-                OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.CollectPaymentMethod,
-                    error = result.error,
-                )
-            )
-            OnrampCollectPaymentMethodResult.Failed(result.error)
+            val error = mapError(Operation.CollectPaymentMethod, result.error)
+            trackError(Operation.CollectPaymentMethod, error)
+            OnrampCollectPaymentMethodResult.Failed(error)
         }
         is LinkController.PresentPaymentMethodsResult.Canceled ->
             OnrampCollectPaymentMethodResult.Cancelled()
@@ -705,13 +627,9 @@ internal class OnrampInteractor @Inject constructor(
             }
         }
         is GooglePayPaymentMethodLauncher.Result.Failed -> {
-            analyticsService?.track(
-                OnrampAnalyticsEvent.ErrorOccurred(
-                    operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.CollectPaymentMethod,
-                    error = result.error,
-                )
-            )
-            OnrampCollectPaymentMethodResult.Failed(result.error)
+            val error = mapError(Operation.CollectPaymentMethod, result.error)
+            trackError(Operation.CollectPaymentMethod, error)
+            OnrampCollectPaymentMethodResult.Failed(error)
         }
         is GooglePayPaymentMethodLauncher.Result.Canceled ->
             OnrampCollectPaymentMethodResult.Cancelled()
@@ -777,20 +695,20 @@ internal class OnrampInteractor @Inject constructor(
                         OnrampVerifyKycInfoResult.Confirmed()
                     },
                     onFailure = {
-                        OnrampVerifyKycInfoResult.Failed(
-                            refreshResult.exceptionOrNull() ?: Exception("Unknown error")
+                        val error = mapError(
+                            operation = Operation.VerifyKyc,
+                            error = refreshResult.exceptionOrNull() ?: Exception("Unknown error"),
                         )
+                        trackError(Operation.VerifyKyc, error)
+                        OnrampVerifyKycInfoResult.Failed(error)
                     }
                 )
             } else {
-                val error = MissingConsumerSecretException()
-                analyticsService?.track(
-                    OnrampAnalyticsEvent.ErrorOccurred(
-                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.VerifyIdentity,
-                        error = error,
-                    )
+                val error = mapError(
+                    operation = Operation.VerifyKyc,
+                    error = MissingConsumerSecretException(),
                 )
-
+                trackError(Operation.VerifyKyc, error)
                 OnrampVerifyKycInfoResult.Failed(error)
             }
         }
@@ -815,25 +733,17 @@ internal class OnrampInteractor @Inject constructor(
                         OnrampCrsCarfDeclarationResult.Confirmed()
                     },
                     onFailure = { error ->
-                        analyticsService?.track(
-                            OnrampAnalyticsEvent.ErrorOccurred(
-                                operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.PresentCRSCARFDeclaration,
-                                error = error,
-                            )
-                        )
-
-                        OnrampCrsCarfDeclarationResult.Failed(error)
+                        val mappedError = mapError(Operation.PresentCRSCARFDeclaration, error)
+                        trackError(Operation.PresentCRSCARFDeclaration, mappedError)
+                        OnrampCrsCarfDeclarationResult.Failed(mappedError)
                     }
                 )
             } else {
-                val error = MissingConsumerSecretException()
-                analyticsService?.track(
-                    OnrampAnalyticsEvent.ErrorOccurred(
-                        operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.PresentCRSCARFDeclaration,
-                        error = error,
-                    )
+                val error = mapError(
+                    operation = Operation.PresentCRSCARFDeclaration,
+                    error = MissingConsumerSecretException(),
                 )
-
+                trackError(Operation.PresentCRSCARFDeclaration, error)
                 OnrampCrsCarfDeclarationResult.Failed(error)
             }
         }
@@ -864,12 +774,8 @@ internal class OnrampInteractor @Inject constructor(
     }
 
     fun onHandleNextActionError(error: Throwable) {
-        analyticsService?.track(
-            OnrampAnalyticsEvent.ErrorOccurred(
-                operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.PerformCheckout,
-                error = error,
-            )
-        )
+        val mappedError = mapError(Operation.PerformCheckout, error)
+        trackError(Operation.PerformCheckout, mappedError)
     }
 
     /**
@@ -976,13 +882,9 @@ internal class OnrampInteractor @Inject constructor(
                         )
                 },
                 onFailure = { error ->
-                    analyticsService?.track(
-                        OnrampAnalyticsEvent.ErrorOccurred(
-                            operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.PerformCheckout,
-                            error = error,
-                        )
-                    )
-                    Status.Completed(OnrampCheckoutResult.Failed(error))
+                    val mappedError = mapError(Operation.PerformCheckout, error)
+                    trackError(Operation.PerformCheckout, mappedError)
+                    Status.Completed(OnrampCheckoutResult.Failed(mappedError))
                 }
             )
 			
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
new file mode 100644
index 00000000000..48949619cf7
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -0,0 +1,234 @@
+package com.stripe.android.crypto.onramp.exception
+
+import androidx.annotation.StringRes
+import com.stripe.android.core.StripeError
+import com.stripe.android.core.exception.StripeException
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import com.stripe.android.crypto.onramp.R
+
+/**
+ * Base exception type for Crypto Onramp failures that expose SDK-owned recovery guidance.
+ */
+@ExperimentalCryptoOnramp
+abstract class CryptoOnrampException internal constructor(
+    message: String,
+    cause: Throwable,
+) : StripeException(
+    stripeError = (cause as? StripeException)?.stripeError,
+    requestId = (cause as? StripeException)?.requestId,
+    statusCode = (cause as? StripeException)?.statusCode ?: DEFAULT_STATUS_CODE,
+    cause = cause,
+    message = message,
+) {
+    /**
+     * A localized SDK-owned end-user-facing message resource, when available.
+     */
+    @get:StringRes
+    abstract val userMessageResId: Int?
+
+    /**
+     * A raw end-user-facing message from the backend, when available.
+     */
+    abstract val userMessage: String
+
+    /**
+     * The original Stripe API error, if one was available.
+     */
+    val rawStripeError: StripeError?
+        get() = stripeError
+
+    override fun analyticsValue(): String {
+        return (cause as? StripeException)?.analyticsValue() ?: super.analyticsValue()
+    }
+}
+
+/**
+ * Indicates that Crypto Onramp could not verify the Android app attestation data.
+ */
+@ExperimentalCryptoOnramp
+class AppAttestationException internal constructor(
+    /**
+     * The raw backend reason, when present.
+     */
+    val reason: String?,
+    /**
+     * The Crypto Onramp operation that failed.
+     */
+    val operation: String,
+    /**
+     * The Android application package name used for the request.
+     */
+    val appPackageName: String,
+    /**
+     * The Stripe mode inferred from the publishable key, when available.
+     */
+    val mode: String?,
+    /**
+     * The SDK version that produced the request.
+     */
+    val sdkVersion: String,
+    /**
+     * The raw backend error code, when present.
+     */
+    val apiErrorCode: String?,
+    /**
+     * The raw backend developer-facing message, when present.
+     */
+    val apiErrorMessage: String?,
+    /**
+     * The raw backend end-user-facing message, when present.
+     */
+    val apiUserMessage: String?,
+    /**
+     * A documentation URL for recovery guidance, when available.
+     */
+    val docUrl: String?,
+    cause: Throwable,
+) : CryptoOnrampException(
+    message = buildDeveloperMessage(
+        operation = operation,
+        appPackageName = appPackageName,
+        mode = mode,
+        sdkVersion = sdkVersion,
+        reason = reason,
+        requestId = (cause as? StripeException)?.requestId,
+        apiErrorCode = apiErrorCode,
+        apiErrorMessage = apiErrorMessage,
+        docUrl = docUrl,
+    ),
+    cause = cause,
+) {
+    override val userMessageResId: Int =
+        reason.appAttestationUserMessageResId
+            ?: R.string.stripe_onramp_app_attestation_default_user_message
+
+    override val userMessage: String = apiUserMessage.orEmpty()
+}
+
+private const val ATTESTATION_NOT_ENABLED_REASON = "attestation_not_enabled"
+private const val APP_NOT_REGISTERED_REASON = "app_not_registered"
+private const val ATTESTATION_DATA_MISSING_REASON = "attestation_data_missing"
+private const val APP_NOT_PLAY_RECOGNIZED_REASON = "app_not_play_recognized"
+private const val ANDROID_PACKAGE_NAME_MISMATCH_REASON = "android_package_name_mismatch"
+private const val ANDROID_ENVIRONMENT_MISMATCH_REASON = "android_environment_mismatch"
+private const val ANDROID_VERDICT_VALIDATION_FAILED_REASON = "android_verdict_validation_failed"
+
+private const val ATTESTATION_NOT_ENABLED_DESCRIPTION =
+    "app attestation is not enabled for this Stripe account"
+private const val APP_NOT_REGISTERED_DESCRIPTION =
+    "this app is not registered as a trusted application"
+private const val ATTESTATION_DATA_MISSING_DESCRIPTION =
+    "attestation data is missing or incomplete"
+private const val APP_NOT_PLAY_RECOGNIZED_DESCRIPTION =
+    "this app is not recognized by Google Play"
+private const val ANDROID_PACKAGE_NAME_MISMATCH_DESCRIPTION =
+    "the app package name does not match the package name registered for this Stripe account"
+private const val ANDROID_ENVIRONMENT_MISMATCH_DESCRIPTION =
+    "the Play Integrity distribution channel does not match this Stripe mode"
+private const val ANDROID_VERDICT_VALIDATION_FAILED_DESCRIPTION =
+    "the Play Integrity verdict could not be validated"
+
+private const val ATTESTATION_NOT_ENABLED_NEXT_STEP =
+    "Contact Stripe to enable app attestation for this account and mode, then retry the Onramp flow."
+private const val APP_NOT_REGISTERED_NEXT_STEP =
+    "Register this app's package name as a trusted application with Stripe, then retry the Onramp flow."
+private const val ATTESTATION_DATA_MISSING_NEXT_STEP =
+    "Make sure all required Play Integrity fields are sent with the request, then retry the Onramp flow."
+private const val APP_NOT_PLAY_RECOGNIZED_NEXT_STEP =
+    "Install the app from a Google Play testing or production track and retry the Onramp flow. Internal, closed, open testing, and production tracks are supported. Debug builds and sideloaded APKs will not pass this check."
+private const val ANDROID_PACKAGE_NAME_MISMATCH_NEXT_STEP =
+    "Use the package name registered for this Stripe account, then retry the Onramp flow."
+private const val ANDROID_ENVIRONMENT_MISMATCH_NEXT_STEP =
+    "Install the app from the Google Play track that matches this Stripe mode, then retry the Onramp flow."
+private const val ANDROID_VERDICT_VALIDATION_FAILED_NEXT_STEP =
+    "Generate a new Play Integrity verdict and retry the Onramp flow. If the issue persists, check your app attestation configuration."
+
+private fun appAttestationSummary(reason: String?): String? {
+    return appAttestationDescription(reason)?.let(::attestationSummary)
+}
+
+private fun appAttestationDescription(reason: String?): String? {
+    return when (reason) {
+        ATTESTATION_NOT_ENABLED_REASON -> ATTESTATION_NOT_ENABLED_DESCRIPTION
+        APP_NOT_REGISTERED_REASON -> APP_NOT_REGISTERED_DESCRIPTION
+        ATTESTATION_DATA_MISSING_REASON -> ATTESTATION_DATA_MISSING_DESCRIPTION
+        APP_NOT_PLAY_RECOGNIZED_REASON -> APP_NOT_PLAY_RECOGNIZED_DESCRIPTION
+        ANDROID_PACKAGE_NAME_MISMATCH_REASON -> ANDROID_PACKAGE_NAME_MISMATCH_DESCRIPTION
+        ANDROID_ENVIRONMENT_MISMATCH_REASON -> ANDROID_ENVIRONMENT_MISMATCH_DESCRIPTION
+        ANDROID_VERDICT_VALIDATION_FAILED_REASON -> ANDROID_VERDICT_VALIDATION_FAILED_DESCRIPTION
+        else -> null
+    }
+}
+
+private fun appAttestationNextStep(reason: String?): String? {
+    return when (reason) {
+        ATTESTATION_NOT_ENABLED_REASON -> ATTESTATION_NOT_ENABLED_NEXT_STEP
+        APP_NOT_REGISTERED_REASON -> APP_NOT_REGISTERED_NEXT_STEP
+        ATTESTATION_DATA_MISSING_REASON -> ATTESTATION_DATA_MISSING_NEXT_STEP
+        APP_NOT_PLAY_RECOGNIZED_REASON -> APP_NOT_PLAY_RECOGNIZED_NEXT_STEP
+        ANDROID_PACKAGE_NAME_MISMATCH_REASON -> ANDROID_PACKAGE_NAME_MISMATCH_NEXT_STEP
+        ANDROID_ENVIRONMENT_MISMATCH_REASON -> ANDROID_ENVIRONMENT_MISMATCH_NEXT_STEP
+        ANDROID_VERDICT_VALIDATION_FAILED_REASON -> ANDROID_VERDICT_VALIDATION_FAILED_NEXT_STEP
+        else -> null
+    }
+}
+
+@get:StringRes
+internal val String?.appAttestationUserMessageResId: Int?
+    get() = when (this) {
+        ATTESTATION_NOT_ENABLED_REASON -> R.string.stripe_onramp_app_attestation_not_enabled_user_message
+        APP_NOT_REGISTERED_REASON -> R.string.stripe_onramp_app_attestation_not_registered_user_message
+        ATTESTATION_DATA_MISSING_REASON -> R.string.stripe_onramp_app_attestation_data_missing_user_message
+        APP_NOT_PLAY_RECOGNIZED_REASON -> R.string.stripe_onramp_app_attestation_play_user_message
+        ANDROID_PACKAGE_NAME_MISMATCH_REASON ->
+            R.string.stripe_onramp_app_attestation_package_name_mismatch_user_message
+        ANDROID_ENVIRONMENT_MISMATCH_REASON ->
+            R.string.stripe_onramp_app_attestation_environment_mismatch_user_message
+        ANDROID_VERDICT_VALIDATION_FAILED_REASON ->
+            R.string.stripe_onramp_app_attestation_verdict_validation_failed_user_message
+        else -> null
+    }
+
+private fun attestationSummary(description: String): String {
+    return "App attestation failed: $description."
+}
+
+private fun buildDeveloperMessage(
+    operation: String,
+    appPackageName: String,
+    mode: String?,
+    sdkVersion: String,
+    reason: String?,
+    requestId: String?,
+    apiErrorCode: String?,
+    apiErrorMessage: String?,
+    docUrl: String?,
+): String {
+    val context = listOfNotNull(
+        "package: $appPackageName",
+        mode?.let { "mode: $it" },
+        "operation: $operation",
+        reason?.let { "reason: $it" },
+        requestId?.let { "request_id: $it" },
+        apiErrorCode?.let { "code: $it" },
+    )
+    val summary = appAttestationSummary(reason)
+    val nextStep = appAttestationNextStep(reason)
+
+    return buildList {
+        add(summary ?: (apiErrorMessage ?: "App attestation failed."))
+        add("")
+        add("Context:")
+        addAll(context)
+        add("")
+        add(
+            "Next step: ${
+                nextStep
+                    ?: (apiErrorMessage
+                        ?: "Inspect the preserved Stripe API error for details and retry after correcting the app attestation configuration.")
+            }"
+        )
+        docUrl?.let { add("Docs: $it") }
+        add("SDK: stripe-android@$sdkVersion")
+    }.joinToString(separator = "\n")
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
new file mode 100644
index 00000000000..a0c9b9af538
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -0,0 +1,56 @@
+package com.stripe.android.crypto.onramp.exception
+
+import android.content.Context
+import com.stripe.android.core.StripeError
+import com.stripe.android.core.exception.APIException
+import com.stripe.android.core.version.StripeSdkVersion
+import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent
+
+internal fun Throwable.toCryptoOnrampError(
+    context: Context,
+    operation: OnrampAnalyticsEvent.ErrorOccurred.Operation,
+    publishableKey: String?,
+): Throwable {
+    val apiException = this as? APIException ?: return this
+    val stripeError = apiException.stripeError ?: return this
+
+    return if (stripeError.isAppAttestationError()) {
+        AppAttestationException(
+            reason = stripeError.extraFields?.get(FIELD_REASON),
+            operation = operation.value,
+            appPackageName = context.packageName,
+            mode = publishableKey.toMode(),
+            sdkVersion = StripeSdkVersion.VERSION,
+            apiErrorCode = stripeError.code,
+            apiErrorMessage = stripeError.message,
+            apiUserMessage = stripeError.extraFields?.get(FIELD_USER_MESSAGE),
+            docUrl = stripeError.docUrl ?: APP_ATTESTATION_DOC_URL,
+            cause = apiException,
+        )
+    } else {
+        this
+    }
+}
+
+private fun StripeError.isAppAttestationError(): Boolean {
+    return when {
+        type == ERROR_TYPE_CANNOT_PROCEED -> code == ERROR_CODE_APP_ATTESTATION_FAILED
+        code == ERROR_CODE_APP_ATTESTATION_FAILED -> true
+        else -> false
+    }
+}
+
+private fun String?.toMode(): String? {
+    return when {
+        this == null -> null
+        startsWith("pk_live_") -> "live"
+        startsWith("pk_test_") -> "test"
+        else -> null
+    }
+}
+
+private const val APP_ATTESTATION_DOC_URL = "https://stripe.com/docs/crypto/onramp/app-attestation"
+private const val ERROR_CODE_APP_ATTESTATION_FAILED = "link_failed_to_attest_request"
+private const val ERROR_TYPE_CANNOT_PROCEED = "cannot_proceed"
+private const val FIELD_REASON = "reason"
+private const val FIELD_USER_MESSAGE = "user_message"
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index bd7a055ee2d..2d0360ac604 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -2,13 +2,17 @@ package com.stripe.android.crypto.onramp.repositories
 
 import androidx.annotation.RestrictTo
 import com.stripe.android.core.AppInfo
+import com.stripe.android.core.StripeError
+import com.stripe.android.core.exception.APIConnectionException
+import com.stripe.android.core.exception.APIException
 import com.stripe.android.core.injection.PUBLISHABLE_KEY
 import com.stripe.android.core.injection.STRIPE_ACCOUNT_ID
 import com.stripe.android.core.model.parsers.StripeErrorJsonParser
 import com.stripe.android.core.networking.ApiRequest
 import com.stripe.android.core.networking.StripeNetworkClient
 import com.stripe.android.core.networking.StripeRequest
-import com.stripe.android.core.networking.executeRequestWithKSerializerParser
+import com.stripe.android.core.networking.StripeResponse
+import com.stripe.android.core.networking.responseJson
 import com.stripe.android.core.networking.toMap
 import com.stripe.android.core.version.StripeSdkVersion
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenRequest
@@ -45,6 +49,7 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonObject
 import kotlinx.serialization.json.encodeToJsonElement
 import kotlinx.serialization.json.jsonObject
+import org.json.JSONObject
 import javax.inject.Inject
 import javax.inject.Named
 import javax.inject.Singleton
@@ -359,12 +364,31 @@ internal class CryptoApiRepository @Inject constructor(
         request: StripeRequest,
         responseSerializer: KSerializer<Response>,
     ): Result<Response> {
-        return executeRequestWithKSerializerParser(
-            stripeNetworkClient = stripeNetworkClient,
-            stripeErrorJsonParser = StripeErrorJsonParser(),
-            request = request,
-            responseSerializer = responseSerializer,
-            json = json
+        return runCatching {
+            stripeNetworkClient.executeRequest(request)
+        }.fold(
+            onSuccess = { response ->
+                if (response.isError) {
+                    Result.failure(apiException(response))
+                } else {
+                    val parsedResponse = runCatching {
+                        response.body?.let { body ->
+                            json.decodeFromString(responseSerializer, body)
+                        }
+                    }.getOrNull()
+
+                    if (parsedResponse != null) {
+                        Result.success(parsedResponse)
+                    } else {
+                        Result.failure(
+                            APIException(message = "Failed to parse response JSON for ${response.body}")
+                        )
+                    }
+                }
+            },
+            onFailure = {
+                Result.failure(connectionException(request, it))
+            }
         ).also {
             // If we get an authorization error, clear the Link account to force a re-authentication
             if (it.exceptionOrNull()?.isLinkAuthorizationError() == true) {
@@ -373,7 +397,57 @@ internal class CryptoApiRepository @Inject constructor(
         }
     }
 
+    private fun apiException(response: StripeResponse<String>): APIException {
+        val stripeError = try {
+            parseOnrampStripeError(response.responseJson())
+        } catch (_: APIException) {
+            null
+        }
+
+        return APIException(
+            stripeError = stripeError,
+            requestId = response.requestId?.value,
+            statusCode = response.code,
+            message = stripeError?.message ?: "Request failed with status code ${response.code} and non-JSON error body."
+        )
+    }
+
+    private fun parseOnrampStripeError(responseJson: JSONObject): StripeError {
+        val stripeError = StripeErrorJsonParser().parse(responseJson)
+        val extraFields = stripeError.extraFields.orEmpty() +
+            responseJson
+                .optJSONObject(FIELD_ERROR)
+                ?.extractOnrampExtraFields()
+                .orEmpty()
+
+        return stripeError.copy(
+            extraFields = extraFields.takeIf { it.isNotEmpty() }
+        )
+    }
+
+    private fun JSONObject.extractOnrampExtraFields(): Map<String, String> {
+        return buildMap {
+            optStringOrNull(FIELD_REASON)?.let { put(FIELD_REASON, it) }
+            optStringOrNull(FIELD_USER_MESSAGE)?.let { put(FIELD_USER_MESSAGE, it) }
+        }
+    }
+
+    private fun JSONObject.optStringOrNull(fieldName: String): String? {
+        return takeIf { has(fieldName) && !isNull(fieldName) }
+            ?.get(fieldName)
+            ?.toString()
+    }
+
+    private fun connectionException(request: StripeRequest, cause: Throwable) = APIConnectionException(
+        "Failed to execute $request",
+        cause = cause
+    )
+
     internal companion object {
+        private const val FIELD_ERROR = "error"
+        private const val FIELD_REASON = "reason"
+        private const val FIELD_USER_MESSAGE = "user_message"
+
         /**
          * @return `https://api.stripe.com/v1/crypto/internal/customers`
          */
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 10b032a98de..5667e559772 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -2,6 +2,7 @@ package com.stripe.android.crypto.onramp
 
 import com.google.common.truth.Truth.assertThat
 import com.stripe.android.core.ApiVersion
+import com.stripe.android.core.exception.APIException
 import com.stripe.android.core.model.CountryCode
 import com.stripe.android.core.networking.ApiRequest
 import com.stripe.android.core.networking.StripeNetworkClient
@@ -780,6 +781,53 @@ class CryptoApiRepositoryTest {
         }
     }
 
+    @Test
+    fun testCollectWalletAddressPreservesTopLevelOnrampErrorFields() {
+        runTest {
+            val stripeResponse = StripeResponse(
+                400,
+                """
+                    {
+                        "error": {
+                            "code": "link_failed_to_attest_request",
+                            "message": "App attestation failed",
+                            "type": "cannot_proceed",
+                            "reason": "app_not_play_recognized",
+                            "user_message": "This app couldn't be verified. Install it from Google Play and try again.",
+                            "ignored_top_level_field": "ignored_value",
+                            "extra_fields": {
+                                "legacy_reason": "legacy_value"
+                            }
+                        }
+                    }
+                """.trimIndent(),
+                emptyMap()
+            )
+
+            whenever(stripeNetworkClient.executeRequest(any<ApiRequest>()))
+                .thenReturn(stripeResponse)
+
+            val result = cryptoApiRepository.setWalletAddress(
+                walletAddress = "0x1234567890abcdef",
+                network = CryptoNetwork.Ethereum,
+                consumerSessionClientSecret = "test-secret"
+            )
+
+            val error = result.exceptionOrNull()
+
+            assertThat(error).isInstanceOf(APIException::class.java)
+
+            val stripeError = (error as APIException).stripeError
+            assertThat(stripeError?.code).isEqualTo("link_failed_to_attest_request")
+            assertThat(stripeError?.type).isEqualTo("cannot_proceed")
+            assertThat(stripeError?.extraFields?.get("legacy_reason")).isEqualTo("legacy_value")
+            assertThat(stripeError?.extraFields?.get("reason")).isEqualTo("app_not_play_recognized")
+            assertThat(stripeError?.extraFields?.get("user_message"))
+                .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
+            assertThat(stripeError?.extraFields?.get("ignored_top_level_field")).isNull()
+        }
+    }
+
     private fun assertKycCollectionRequest(apiRequest: ApiRequest) {
         assertThat(apiRequest.baseUrl)
             .isEqualTo("https://api.stripe.com/v1/crypto/internal/kyc_data_collection")
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 6b357dbc96c..cf4a098651a 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -4,8 +4,11 @@ import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
 import androidx.lifecycle.SavedStateHandle
 import com.google.common.truth.Truth.assertThat
+import com.stripe.android.core.StripeError
+import com.stripe.android.core.exception.APIException
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsService
+import com.stripe.android.crypto.onramp.exception.AppAttestationException
 import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
@@ -180,6 +183,95 @@ class OnrampInteractorTest {
         )
     }
 
+    @Test
+    fun testRegisterWalletAddressMapsBackendAttestationError() = runTest {
+        whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
+        whenever(linkController.configure(any())).thenReturn(ConfigureResult.Success)
+        whenever(cryptoApiRepository.setWalletAddress(any(), any(), any())).thenReturn(
+            Result.failure(
+                APIException(
+                    stripeError = StripeError(
+                        code = "link_failed_to_attest_request",
+                        message = "App attestation failed",
+                        type = "cannot_proceed",
+                        extraFields = mapOf(
+                            "reason" to "app_not_play_recognized",
+                            "user_message" to "This app couldn't be verified. Install it from Google Play and try again."
+                        )
+                    ),
+                    requestId = "req_123",
+                    statusCode = 400,
+                )
+            )
+        )
+
+        interactor.onLinkControllerState(mockLinkStateWithAccount())
+        interactor.configure(createConfigurationState())
+
+        val result = interactor.registerWalletAddress(
+            walletAddress = "0x1234567890abcdef",
+            network = CryptoNetwork.Ethereum
+        )
+
+        assertThat(result).isInstanceOf(OnrampRegisterWalletAddressResult.Failed::class.java)
+
+        val error = (result as OnrampRegisterWalletAddressResult.Failed).error
+        assertThat(error).isInstanceOf(AppAttestationException::class.java)
+
+        val attestationError = error as AppAttestationException
+        assertThat(attestationError.userMessageResId)
+            .isEqualTo(R.string.stripe_onramp_app_attestation_play_user_message)
+        assertThat(attestationError.userMessage)
+            .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
+        assertThat(attestationError.reason).isEqualTo("app_not_play_recognized")
+        assertThat(attestationError.mode).isEqualTo("test")
+        assertThat(attestationError.message)
+            .contains("App attestation failed: this app is not recognized by Google Play.")
+        assertThat(attestationError.message)
+            .contains("package: ${RuntimeEnvironment.getApplication().packageName}")
+        assertThat(attestationError.message).contains("operation: register_wallet_address")
+        assertThat(attestationError.message).contains("request_id: req_123")
+        assertThat(attestationError.message)
+            .contains("Docs: https://stripe.com/docs/crypto/onramp/app-attestation")
+    }
+
+    @Test
+    fun appAttestationExceptionMapsKnownReasonsToLocalizedUserMessages() {
+        val cause = IllegalStateException("boom")
+
+        listOf(
+            "attestation_not_enabled" to
+                R.string.stripe_onramp_app_attestation_not_enabled_user_message,
+            "app_not_registered" to
+                R.string.stripe_onramp_app_attestation_not_registered_user_message,
+            "attestation_data_missing" to
+                R.string.stripe_onramp_app_attestation_data_missing_user_message,
+            "app_not_play_recognized" to
+                R.string.stripe_onramp_app_attestation_play_user_message,
+            "android_package_name_mismatch" to
+                R.string.stripe_onramp_app_attestation_package_name_mismatch_user_message,
+            "android_environment_mismatch" to
+                R.string.stripe_onramp_app_attestation_environment_mismatch_user_message,
+            "android_verdict_validation_failed" to
+                R.string.stripe_onramp_app_attestation_verdict_validation_failed_user_message,
+        ).forEach { (reason, expectedResId) ->
+            val error = AppAttestationException(
+                reason = reason,
+                operation = "register_wallet_address",
+                appPackageName = "com.example.app",
+                mode = "test",
+                sdkVersion = "1.0.0",
+                apiErrorCode = "link_failed_to_attest_request",
+                apiErrorMessage = "App attestation failed",
+                apiUserMessage = null,
+                docUrl = null,
+                cause = cause,
+            )
+
+            assertThat(error.userMessageResId).isEqualTo(expectedResId)
+        }
+    }
+
     @Test
     fun testAttachKycInfoIsSuccessful() = runTest {
         whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))

From 7bb4c68ab4fb6bb8d11f6651db8e810dca086eab Mon Sep 17 00:00:00 2001
From: Twig <Twigz@users.noreply.github.com>
Date: Thu, 21 May 2026 11:18:50 -0400
Subject: [PATCH 33/57] Updates error mapper to be a little more robust

---
 .../onramp/exception/OnrampErrorMapper.kt     | 10 +++--
 .../crypto/onramp/OnrampInteractorTest.kt     | 38 +++++++++++++++++++
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index a0c9b9af538..7ab935591ed 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -2,7 +2,7 @@ package com.stripe.android.crypto.onramp.exception
 
 import android.content.Context
 import com.stripe.android.core.StripeError
-import com.stripe.android.core.exception.APIException
+import com.stripe.android.core.exception.StripeException
 import com.stripe.android.core.version.StripeSdkVersion
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent
 
@@ -11,8 +11,10 @@ internal fun Throwable.toCryptoOnrampError(
     operation: OnrampAnalyticsEvent.ErrorOccurred.Operation,
     publishableKey: String?,
 ): Throwable {
-    val apiException = this as? APIException ?: return this
-    val stripeError = apiException.stripeError ?: return this
+    if (this is CryptoOnrampException) return this
+
+    val stripeException = this as? StripeException ?: return this
+    val stripeError = stripeException.stripeError ?: return this
 
     return if (stripeError.isAppAttestationError()) {
         AppAttestationException(
@@ -25,7 +27,7 @@ internal fun Throwable.toCryptoOnrampError(
             apiErrorMessage = stripeError.message,
             apiUserMessage = stripeError.extraFields?.get(FIELD_USER_MESSAGE),
             docUrl = stripeError.docUrl ?: APP_ATTESTATION_DOC_URL,
-            cause = apiException,
+            cause = stripeException,
         )
     } else {
         this
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index cf4a098651a..d4851f951e0 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -6,6 +6,7 @@ import androidx.lifecycle.SavedStateHandle
 import com.google.common.truth.Truth.assertThat
 import com.stripe.android.core.StripeError
 import com.stripe.android.core.exception.APIException
+import com.stripe.android.core.exception.InvalidRequestException
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsService
 import com.stripe.android.crypto.onramp.exception.AppAttestationException
@@ -235,6 +236,43 @@ class OnrampInteractorTest {
             .contains("Docs: https://stripe.com/docs/crypto/onramp/app-attestation")
     }
 
+    @Test
+    fun testHasLinkAccountMapsAttestationInvalidRequestError() = runTest {
+        whenever(linkController.configure(any())).thenReturn(ConfigureResult.Success)
+        val failedResult = mock<LinkController.LookupConsumerResult.Failed> {
+            on { email } doReturn "test@example.com"
+            on { error } doReturn InvalidRequestException(
+                stripeError = StripeError(
+                    code = "link_failed_to_attest_request",
+                    message = "App attestation failed",
+                    type = "cannot_proceed",
+                    extraFields = mapOf(
+                        "reason" to "app_not_play_recognized",
+                        "user_message" to "This app couldn't be verified. Install it from Google Play and try again."
+                    )
+                ),
+                requestId = "req_456",
+                statusCode = 400,
+            )
+        }
+        whenever(linkController.lookupConsumer(any())).thenReturn(failedResult)
+
+        interactor.configure(createConfigurationState())
+
+        val result = interactor.hasLinkAccount("test@example.com")
+
+        assertThat(result).isInstanceOf(OnrampHasLinkAccountResult.Failed::class.java)
+
+        val error = (result as OnrampHasLinkAccountResult.Failed).error
+        assertThat(error).isInstanceOf(AppAttestationException::class.java)
+
+        val attestationError = error as AppAttestationException
+        assertThat(attestationError.reason).isEqualTo("app_not_play_recognized")
+        assertThat(attestationError.mode).isEqualTo("test")
+        assertThat(attestationError.message).contains("operation: has_link_account")
+        assertThat(attestationError.message).contains("request_id: req_456")
+    }
+
     @Test
     fun appAttestationExceptionMapsKnownReasonsToLocalizedUserMessages() {
         val cause = IllegalStateException("boom")

From d2b7f2ea76ca573f72924f55016a94a444cde93c Mon Sep 17 00:00:00 2001
From: Twig <Twigz@users.noreply.github.com>
Date: Thu, 21 May 2026 11:34:18 -0400
Subject: [PATCH 34/57] Remove type from stripe error

---
 .../android/crypto/onramp/exception/OnrampErrorMapper.kt   | 7 +------
 .../android/crypto/onramp/CryptoApiRepositoryTest.kt       | 2 --
 .../stripe/android/crypto/onramp/OnrampInteractorTest.kt   | 2 --
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index 7ab935591ed..e49b4bf70fe 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -35,11 +35,7 @@ internal fun Throwable.toCryptoOnrampError(
 }
 
 private fun StripeError.isAppAttestationError(): Boolean {
-    return when {
-        type == ERROR_TYPE_CANNOT_PROCEED -> code == ERROR_CODE_APP_ATTESTATION_FAILED
-        code == ERROR_CODE_APP_ATTESTATION_FAILED -> true
-        else -> false
-    }
+    return code == ERROR_CODE_APP_ATTESTATION_FAILED
 }
 
 private fun String?.toMode(): String? {
@@ -53,6 +49,5 @@ private fun String?.toMode(): String? {
 
 private const val APP_ATTESTATION_DOC_URL = "https://stripe.com/docs/crypto/onramp/app-attestation"
 private const val ERROR_CODE_APP_ATTESTATION_FAILED = "link_failed_to_attest_request"
-private const val ERROR_TYPE_CANNOT_PROCEED = "cannot_proceed"
 private const val FIELD_REASON = "reason"
 private const val FIELD_USER_MESSAGE = "user_message"
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
index 5667e559772..e9da2665a62 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/CryptoApiRepositoryTest.kt
@@ -791,7 +791,6 @@ class CryptoApiRepositoryTest {
                         "error": {
                             "code": "link_failed_to_attest_request",
                             "message": "App attestation failed",
-                            "type": "cannot_proceed",
                             "reason": "app_not_play_recognized",
                             "user_message": "This app couldn't be verified. Install it from Google Play and try again.",
                             "ignored_top_level_field": "ignored_value",
@@ -819,7 +818,6 @@ class CryptoApiRepositoryTest {
 
             val stripeError = (error as APIException).stripeError
             assertThat(stripeError?.code).isEqualTo("link_failed_to_attest_request")
-            assertThat(stripeError?.type).isEqualTo("cannot_proceed")
             assertThat(stripeError?.extraFields?.get("legacy_reason")).isEqualTo("legacy_value")
             assertThat(stripeError?.extraFields?.get("reason")).isEqualTo("app_not_play_recognized")
             assertThat(stripeError?.extraFields?.get("user_message"))
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index d4851f951e0..4d59de8f20a 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -194,7 +194,6 @@ class OnrampInteractorTest {
                     stripeError = StripeError(
                         code = "link_failed_to_attest_request",
                         message = "App attestation failed",
-                        type = "cannot_proceed",
                         extraFields = mapOf(
                             "reason" to "app_not_play_recognized",
                             "user_message" to "This app couldn't be verified. Install it from Google Play and try again."
@@ -245,7 +244,6 @@ class OnrampInteractorTest {
                 stripeError = StripeError(
                     code = "link_failed_to_attest_request",
                     message = "App attestation failed",
-                    type = "cannot_proceed",
                     extraFields = mapOf(
                         "reason" to "app_not_play_recognized",
                         "user_message" to "This app couldn't be verified. Install it from Google Play and try again."

From 58463a58458c745f3d1629625bf78c67b3d1fbfe Mon Sep 17 00:00:00 2001
From: Twig <Twigz@users.noreply.github.com>
Date: Thu, 21 May 2026 12:21:53 -0400
Subject: [PATCH 35/57] Adding in an UncategorizedApiErrorException, changing
 display message

---
 .../crypto/onramp/example/OnrampViewModel.kt  |   9 +-
 crypto-onramp/api/crypto-onramp.api           |  16 ++
 crypto-onramp/res/values/strings.xml          |   2 +
 .../onramp/exception/CryptoOnrampException.kt | 150 ++++++++++++++++--
 .../onramp/exception/OnrampErrorMapper.kt     |  26 ++-
 .../crypto/onramp/OnrampInteractorTest.kt     | 139 +++++++++++++---
 6 files changed, 291 insertions(+), 51 deletions(-)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index 44a7d6b250f..bfd4622dd1f 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -17,7 +17,6 @@ import androidx.lifecycle.viewmodel.CreationExtras
 import com.github.kittinunf.result.Result
 import com.stripe.android.core.utils.requireApplication
 import com.stripe.android.crypto.onramp.OnrampCoordinator
-import com.stripe.android.crypto.onramp.exception.CryptoOnrampException
 import com.stripe.android.crypto.onramp.example.network.OnrampSessionResponse
 import com.stripe.android.crypto.onramp.example.network.SettlementSpeed
 import com.stripe.android.crypto.onramp.example.network.TestBackendRepository
@@ -107,13 +106,7 @@ internal class OnrampViewModel(
     private val minPasswordLength = 8
 
     private fun Throwable.displayMessage(): String {
-        val onrampError = this as? CryptoOnrampException
-
-        return onrampError?.userMessageResId
-            ?.let(application::getString)
-            ?: onrampError?.userMessage?.takeIf { it.isNotBlank() }
-            ?: message
-            ?: "Unknown error"
+        return message ?: "Unknown error"
     }
 
     private fun handleError(error: Throwable, onNonAuthError: () -> Unit = {}) {
diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index bfe03d9ed0b..eefbab59d85 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -52,6 +52,7 @@ public final class com/stripe/android/crypto/onramp/exception/AppAttestationExce
 public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampException : com/stripe/android/core/exception/StripeException {
 	public static final field $stable I
 	public fun analyticsValue ()Ljava/lang/String;
+	public final fun getDeveloperMessage ()Ljava/lang/String;
 	public final fun getRawStripeError ()Lcom/stripe/android/core/StripeError;
 	public abstract fun getUserMessage ()Ljava/lang/String;
 	public abstract fun getUserMessageResId ()Ljava/lang/Integer;
@@ -78,6 +79,21 @@ public final class com/stripe/android/crypto/onramp/exception/PaymentFailedExcep
 	public static final field $stable I
 }
 
+public final class com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException : com/stripe/android/crypto/onramp/exception/CryptoOnrampException {
+	public static final field $stable I
+	public final fun getApiErrorCode ()Ljava/lang/String;
+	public final fun getApiErrorMessage ()Ljava/lang/String;
+	public final fun getApiUserMessage ()Ljava/lang/String;
+	public final fun getAppPackageName ()Ljava/lang/String;
+	public final fun getDocUrl ()Ljava/lang/String;
+	public final fun getMode ()Ljava/lang/String;
+	public final fun getOperation ()Ljava/lang/String;
+	public final fun getRawReason ()Ljava/lang/String;
+	public final fun getSdkVersion ()Ljava/lang/String;
+	public fun getUserMessage ()Ljava/lang/String;
+	public fun getUserMessageResId ()Ljava/lang/Integer;
+}
+
 public final class com/stripe/android/crypto/onramp/model/CryptoNetwork : java/lang/Enum {
 	public static final field Aptos Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;
 	public static final field Arbitrum Lcom/stripe/android/crypto/onramp/model/CryptoNetwork;
diff --git a/crypto-onramp/res/values/strings.xml b/crypto-onramp/res/values/strings.xml
index c4328701bab..8d5b6f149ad 100644
--- a/crypto-onramp/res/values/strings.xml
+++ b/crypto-onramp/res/values/strings.xml
@@ -8,6 +8,8 @@
   <string name="stripe_onramp_app_attestation_data_missing_user_message">This app couldn\'t be verified. Install the latest version and try again.</string>
   <!-- Fallback app-user message for Crypto Onramp app attestation failures. -->
   <string name="stripe_onramp_app_attestation_default_user_message">This app couldn\'t be verified. Please try again later.</string>
+  <!-- Fallback app-user message for uncategorized Crypto Onramp API failures. -->
+  <string name="stripe_onramp_default_api_error_user_message">Something went wrong. Please try again later.</string>
   <!-- App-user message for Crypto Onramp app attestation failures caused by non-Google Play distribution. -->
   <string name="stripe_onramp_app_attestation_play_user_message">This app couldn\'t be verified. Install it from Google Play and try again.</string>
   <!-- App-user message for Crypto Onramp app attestation failures when the installed app variant is incorrect. -->
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index 48949619cf7..574218e9860 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -8,10 +8,13 @@ import com.stripe.android.crypto.onramp.R
 
 /**
  * Base exception type for Crypto Onramp failures that expose SDK-owned recovery guidance.
+ *
+ * `message` is safe to display directly to app users. Use [developerMessage] for richer diagnostics.
  */
 @ExperimentalCryptoOnramp
 abstract class CryptoOnrampException internal constructor(
     message: String,
+    val developerMessage: String,
     cause: Throwable,
 ) : StripeException(
     stripeError = (cause as? StripeException)?.stripeError,
@@ -27,7 +30,7 @@ abstract class CryptoOnrampException internal constructor(
     abstract val userMessageResId: Int?
 
     /**
-     * A raw end-user-facing message from the backend, when available.
+     * An end-user-facing message, when available.
      */
     abstract val userMessage: String
 
@@ -83,9 +86,11 @@ class AppAttestationException internal constructor(
      * A documentation URL for recovery guidance, when available.
      */
     val docUrl: String?,
+    fallbackUserMessage: String,
     cause: Throwable,
 ) : CryptoOnrampException(
-    message = buildDeveloperMessage(
+    message = apiUserMessage.orFallbackTo(fallbackUserMessage),
+    developerMessage = buildAppAttestationDeveloperMessage(
         operation = operation,
         appPackageName = appPackageName,
         mode = mode,
@@ -102,7 +107,70 @@ class AppAttestationException internal constructor(
         reason.appAttestationUserMessageResId
             ?: R.string.stripe_onramp_app_attestation_default_user_message
 
-    override val userMessage: String = apiUserMessage.orEmpty()
+    override val userMessage: String = apiUserMessage.orFallbackTo(fallbackUserMessage)
+}
+
+/**
+ * Indicates that a Stripe API request failed without a more specific Crypto Onramp category.
+ */
+@ExperimentalCryptoOnramp
+class UncategorizedApiErrorException internal constructor(
+    /**
+     * The raw backend reason, when present.
+     */
+    val rawReason: String?,
+    /**
+     * The Crypto Onramp operation that failed.
+     */
+    val operation: String,
+    /**
+     * The Android application package name used for the request.
+     */
+    val appPackageName: String,
+    /**
+     * The Stripe mode inferred from the publishable key, when available.
+     */
+    val mode: String?,
+    /**
+     * The SDK version that produced the request.
+     */
+    val sdkVersion: String,
+    /**
+     * The raw backend error code, when present.
+     */
+    val apiErrorCode: String?,
+    /**
+     * The raw backend developer-facing message, when present.
+     */
+    val apiErrorMessage: String?,
+    /**
+     * The raw backend end-user-facing message, when present.
+     */
+    val apiUserMessage: String?,
+    /**
+     * A documentation URL for recovery guidance, when available.
+     */
+    val docUrl: String?,
+    fallbackUserMessage: String,
+    cause: Throwable,
+) : CryptoOnrampException(
+    message = apiUserMessage.orFallbackTo(fallbackUserMessage),
+    developerMessage = buildGenericDeveloperMessage(
+        operation = operation,
+        appPackageName = appPackageName,
+        mode = mode,
+        sdkVersion = sdkVersion,
+        rawReason = rawReason,
+        requestId = (cause as? StripeException)?.requestId,
+        apiErrorCode = apiErrorCode,
+        apiErrorMessage = apiErrorMessage,
+        apiUserMessage = apiUserMessage,
+        docUrl = docUrl,
+    ),
+    cause = cause,
+) {
+    override val userMessageResId: Int? = null
+    override val userMessage: String = apiUserMessage.orFallbackTo(fallbackUserMessage)
 }
 
 private const val ATTESTATION_NOT_ENABLED_REASON = "attestation_not_enabled"
@@ -193,7 +261,7 @@ private fun attestationSummary(description: String): String {
     return "App attestation failed: $description."
 }
 
-private fun buildDeveloperMessage(
+private fun buildAppAttestationDeveloperMessage(
     operation: String,
     appPackageName: String,
     mode: String?,
@@ -203,31 +271,83 @@ private fun buildDeveloperMessage(
     apiErrorCode: String?,
     apiErrorMessage: String?,
     docUrl: String?,
+): String {
+    return buildDeveloperMessage(
+        summary = appAttestationSummary(reason) ?: (apiErrorMessage ?: "App attestation failed."),
+        operation = operation,
+        appPackageName = appPackageName,
+        mode = mode,
+        rawReason = reason,
+        requestId = requestId,
+        apiErrorCode = apiErrorCode,
+        nextStep = appAttestationNextStep(reason)
+            ?: (apiErrorMessage
+                ?: "Inspect the preserved Stripe API error for details and retry after correcting the app attestation configuration."),
+        docUrl = docUrl,
+        sdkVersion = sdkVersion,
+    )
+}
+
+private fun buildGenericDeveloperMessage(
+    operation: String,
+    appPackageName: String,
+    mode: String?,
+    sdkVersion: String,
+    rawReason: String?,
+    requestId: String?,
+    apiErrorCode: String?,
+    apiErrorMessage: String?,
+    apiUserMessage: String?,
+    docUrl: String?,
+): String {
+    return buildDeveloperMessage(
+        summary = apiErrorMessage ?: "Stripe API request failed.",
+        operation = operation,
+        appPackageName = appPackageName,
+        mode = mode,
+        rawReason = rawReason,
+        requestId = requestId,
+        apiErrorCode = apiErrorCode,
+        nextStep = apiUserMessage.orFallbackTo(
+            "Inspect the preserved Stripe API error for details and retry after correcting the request."
+        ),
+        docUrl = docUrl,
+        sdkVersion = sdkVersion,
+    )
+}
+
+private fun String?.orFallbackTo(fallback: String): String {
+    return this?.takeIf { it.isNotBlank() } ?: fallback
+}
+
+private fun buildDeveloperMessage(
+    summary: String,
+    operation: String,
+    appPackageName: String,
+    mode: String?,
+    rawReason: String?,
+    requestId: String?,
+    apiErrorCode: String?,
+    nextStep: String,
+    docUrl: String?,
+    sdkVersion: String,
 ): String {
     val context = listOfNotNull(
         "package: $appPackageName",
         mode?.let { "mode: $it" },
         "operation: $operation",
-        reason?.let { "reason: $it" },
+        rawReason?.let { "reason: $it" },
         requestId?.let { "request_id: $it" },
         apiErrorCode?.let { "code: $it" },
     )
-    val summary = appAttestationSummary(reason)
-    val nextStep = appAttestationNextStep(reason)
 
     return buildList {
-        add(summary ?: (apiErrorMessage ?: "App attestation failed."))
+        add(summary)
         add("")
         add("Context:")
         addAll(context)
         add("")
-        add(
-            "Next step: ${
-                nextStep
-                    ?: (apiErrorMessage
-                        ?: "Inspect the preserved Stripe API error for details and retry after correcting the app attestation configuration.")
-            }"
-        )
+        add("Next step: $nextStep")
         docUrl?.let { add("Docs: $it") }
         add("SDK: stripe-android@$sdkVersion")
     }.joinToString(separator = "\n")
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index e49b4bf70fe..677c7c64f21 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import com.stripe.android.core.StripeError
 import com.stripe.android.core.exception.StripeException
 import com.stripe.android.core.version.StripeSdkVersion
+import com.stripe.android.crypto.onramp.R
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent
 
 internal fun Throwable.toCryptoOnrampError(
@@ -16,21 +17,40 @@ internal fun Throwable.toCryptoOnrampError(
     val stripeException = this as? StripeException ?: return this
     val stripeError = stripeException.stripeError ?: return this
 
+    val reason = stripeError.extraFields?.get(FIELD_REASON)
+    val apiUserMessage = stripeError.extraFields?.get(FIELD_USER_MESSAGE)?.takeIf { it.isNotBlank() }
+
     return if (stripeError.isAppAttestationError()) {
         AppAttestationException(
-            reason = stripeError.extraFields?.get(FIELD_REASON),
+            reason = reason,
             operation = operation.value,
             appPackageName = context.packageName,
             mode = publishableKey.toMode(),
             sdkVersion = StripeSdkVersion.VERSION,
             apiErrorCode = stripeError.code,
             apiErrorMessage = stripeError.message,
-            apiUserMessage = stripeError.extraFields?.get(FIELD_USER_MESSAGE),
+            apiUserMessage = apiUserMessage,
             docUrl = stripeError.docUrl ?: APP_ATTESTATION_DOC_URL,
+            fallbackUserMessage = apiUserMessage
+                ?: reason.appAttestationUserMessageResId?.let(context::getString)
+                ?: context.getString(R.string.stripe_onramp_app_attestation_default_user_message),
             cause = stripeException,
         )
     } else {
-        this
+        UncategorizedApiErrorException(
+            rawReason = reason,
+            operation = operation.value,
+            appPackageName = context.packageName,
+            mode = publishableKey.toMode(),
+            sdkVersion = StripeSdkVersion.VERSION,
+            apiErrorCode = stripeError.code,
+            apiErrorMessage = stripeError.message,
+            apiUserMessage = apiUserMessage,
+            docUrl = stripeError.docUrl,
+            fallbackUserMessage = apiUserMessage
+                ?: context.getString(R.string.stripe_onramp_default_api_error_user_message),
+            cause = stripeException,
+        )
     }
 }
 
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 4d59de8f20a..601aff9a141 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -1,5 +1,6 @@
 package com.stripe.android.crypto.onramp
 
+import android.app.Application
 import android.graphics.Bitmap
 import android.graphics.drawable.BitmapDrawable
 import androidx.lifecycle.SavedStateHandle
@@ -12,6 +13,7 @@ import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsService
 import com.stripe.android.crypto.onramp.exception.AppAttestationException
 import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
+import com.stripe.android.crypto.onramp.exception.UncategorizedApiErrorException
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
 import com.stripe.android.crypto.onramp.model.CryptoCustomerResponse
@@ -219,19 +221,20 @@ class OnrampInteractorTest {
         assertThat(error).isInstanceOf(AppAttestationException::class.java)
 
         val attestationError = error as AppAttestationException
-        assertThat(attestationError.userMessageResId)
-            .isEqualTo(R.string.stripe_onramp_app_attestation_play_user_message)
+        assertThat(attestationError.userMessageResId).isNotNull()
         assertThat(attestationError.userMessage)
             .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
+        assertThat(attestationError.message)
+            .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
         assertThat(attestationError.reason).isEqualTo("app_not_play_recognized")
         assertThat(attestationError.mode).isEqualTo("test")
-        assertThat(attestationError.message)
+        assertThat(attestationError.developerMessage)
             .contains("App attestation failed: this app is not recognized by Google Play.")
-        assertThat(attestationError.message)
+        assertThat(attestationError.developerMessage)
             .contains("package: ${RuntimeEnvironment.getApplication().packageName}")
-        assertThat(attestationError.message).contains("operation: register_wallet_address")
-        assertThat(attestationError.message).contains("request_id: req_123")
-        assertThat(attestationError.message)
+        assertThat(attestationError.developerMessage).contains("operation: register_wallet_address")
+        assertThat(attestationError.developerMessage).contains("request_id: req_123")
+        assertThat(attestationError.developerMessage)
             .contains("Docs: https://stripe.com/docs/crypto/onramp/app-attestation")
     }
 
@@ -267,8 +270,98 @@ class OnrampInteractorTest {
         val attestationError = error as AppAttestationException
         assertThat(attestationError.reason).isEqualTo("app_not_play_recognized")
         assertThat(attestationError.mode).isEqualTo("test")
-        assertThat(attestationError.message).contains("operation: has_link_account")
-        assertThat(attestationError.message).contains("request_id: req_456")
+        assertThat(attestationError.message)
+            .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
+        assertThat(attestationError.developerMessage).contains("operation: has_link_account")
+        assertThat(attestationError.developerMessage).contains("request_id: req_456")
+    }
+
+    @Test
+    fun testHasLinkAccountMapsUncategorizedInvalidRequestError() = runTest {
+        whenever(linkController.configure(any())).thenReturn(ConfigureResult.Success)
+        val failedResult = mock<LinkController.LookupConsumerResult.Failed> {
+            on { email } doReturn "test@example.com"
+            on { error } doReturn InvalidRequestException(
+                stripeError = StripeError(
+                    code = "email_blocked",
+                    message = "This email address can't be used.",
+                    docUrl = "https://stripe.com/docs/error-codes/email_blocked",
+                    extraFields = mapOf(
+                        "reason" to "email_blocked",
+                        "user_message" to "This email can't be used. Try another one."
+                    )
+                ),
+                requestId = "req_789",
+                statusCode = 400,
+            )
+        }
+        whenever(linkController.lookupConsumer(any())).thenReturn(failedResult)
+
+        interactor.configure(createConfigurationState())
+
+        val result = interactor.hasLinkAccount("test@example.com")
+
+        assertThat(result).isInstanceOf(OnrampHasLinkAccountResult.Failed::class.java)
+
+        val error = (result as OnrampHasLinkAccountResult.Failed).error
+        assertThat(error).isInstanceOf(UncategorizedApiErrorException::class.java)
+
+        val apiError = error as UncategorizedApiErrorException
+        assertThat(apiError.rawReason).isEqualTo("email_blocked")
+        assertThat(apiError.userMessage).isEqualTo("This email can't be used. Try another one.")
+        assertThat(apiError.message).isEqualTo("This email can't be used. Try another one.")
+        assertThat(apiError.developerMessage).contains("This email address can't be used.")
+        assertThat(apiError.developerMessage).contains("operation: has_link_account")
+        assertThat(apiError.developerMessage).contains("request_id: req_789")
+        assertThat(apiError.developerMessage).contains("code: email_blocked")
+        assertThat(apiError.developerMessage).contains("Docs: https://stripe.com/docs/error-codes/email_blocked")
+    }
+
+    @Test
+    fun uncategorizedApiErrorExceptionFallsBackToSafeUserMessage() = runTest {
+        val application = mock<Application> {
+            on { packageName } doReturn "com.example.app"
+            on { getString(any()) } doReturn "Something went wrong. Please try again later."
+        }
+        val interactor = OnrampInteractor(
+            application = application,
+            linkController = linkController,
+            cryptoApiRepository = cryptoApiRepository,
+            analyticsServiceFactory = analyticsServiceFactory,
+            checkoutHandler = OnrampSessionClientSecretProvider { "test_secret" },
+            savedStateHandle = SavedStateHandle()
+        )
+
+        whenever(linkController.configure(any())).thenReturn(ConfigureResult.Success)
+        val failedResult = mock<LinkController.LookupConsumerResult.Failed> {
+            on { email } doReturn "test@example.com"
+            on { error } doReturn InvalidRequestException(
+                stripeError = StripeError(
+                    code = "unknown_error",
+                    message = "Developer-facing message"
+                ),
+                requestId = "req_999",
+                statusCode = 400,
+            )
+        }
+        whenever(linkController.lookupConsumer(any())).thenReturn(failedResult)
+
+        interactor.configure(createConfigurationState())
+
+        val result = interactor.hasLinkAccount("test@example.com")
+
+        assertThat(result).isInstanceOf(OnrampHasLinkAccountResult.Failed::class.java)
+
+        val error = (result as OnrampHasLinkAccountResult.Failed).error
+        assertThat(error).isInstanceOf(UncategorizedApiErrorException::class.java)
+
+        val apiError = error as UncategorizedApiErrorException
+        assertThat(apiError.userMessageResId).isNull()
+        assertThat(apiError.userMessage).isEqualTo("Something went wrong. Please try again later.")
+        assertThat(apiError.message).isEqualTo("Something went wrong. Please try again later.")
+        assertThat(apiError.developerMessage).contains("Developer-facing message")
+        assertThat(apiError.developerMessage)
+            .contains("Next step: Inspect the preserved Stripe API error for details and retry after correcting the request.")
     }
 
     @Test
@@ -276,21 +369,14 @@ class OnrampInteractorTest {
         val cause = IllegalStateException("boom")
 
         listOf(
-            "attestation_not_enabled" to
-                R.string.stripe_onramp_app_attestation_not_enabled_user_message,
-            "app_not_registered" to
-                R.string.stripe_onramp_app_attestation_not_registered_user_message,
-            "attestation_data_missing" to
-                R.string.stripe_onramp_app_attestation_data_missing_user_message,
-            "app_not_play_recognized" to
-                R.string.stripe_onramp_app_attestation_play_user_message,
-            "android_package_name_mismatch" to
-                R.string.stripe_onramp_app_attestation_package_name_mismatch_user_message,
-            "android_environment_mismatch" to
-                R.string.stripe_onramp_app_attestation_environment_mismatch_user_message,
-            "android_verdict_validation_failed" to
-                R.string.stripe_onramp_app_attestation_verdict_validation_failed_user_message,
-        ).forEach { (reason, expectedResId) ->
+            "attestation_not_enabled",
+            "app_not_registered",
+            "attestation_data_missing",
+            "app_not_play_recognized",
+            "android_package_name_mismatch",
+            "android_environment_mismatch",
+            "android_verdict_validation_failed",
+        ).forEach { reason ->
             val error = AppAttestationException(
                 reason = reason,
                 operation = "register_wallet_address",
@@ -301,10 +387,13 @@ class OnrampInteractorTest {
                 apiErrorMessage = "App attestation failed",
                 apiUserMessage = null,
                 docUrl = null,
+                fallbackUserMessage = "Fallback attestation message",
                 cause = cause,
             )
 
-            assertThat(error.userMessageResId).isEqualTo(expectedResId)
+            assertThat(error.userMessageResId).isNotNull()
+            assertThat(error.userMessage).isEqualTo("Fallback attestation message")
+            assertThat(error.message).isEqualTo("Fallback attestation message")
         }
     }
 

From 043596f9c1c103cdd32111a93818cc8b635229eb Mon Sep 17 00:00:00 2001
From: Twig <Twigz@users.noreply.github.com>
Date: Thu, 21 May 2026 12:40:38 -0400
Subject: [PATCH 36/57] Remove display message

---
 .../crypto/onramp/example/OnrampViewModel.kt  | 48 +++++++++----------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
index bfd4622dd1f..f334f7ef0de 100644
--- a/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
+++ b/crypto-onramp-example/src/main/java/com/stripe/android/crypto/onramp/example/OnrampViewModel.kt
@@ -105,10 +105,6 @@ internal class OnrampViewModel(
 
     private val minPasswordLength = 8
 
-    private fun Throwable.displayMessage(): String {
-        return message ?: "Unknown error"
-    }
-
     private fun handleError(error: Throwable, onNonAuthError: () -> Unit = {}) {
         if (error.isLinkAuthorizationError()) {
             _message.value = "Session expired. Reauthorizing..."
@@ -216,7 +212,7 @@ internal class OnrampViewModel(
                 }
             }
             is Result.Failure -> {
-                _message.value = "Sign up failed: ${result.error.displayMessage()}"
+                _message.value = "Sign up failed: ${result.error.message}"
                 _uiState.update { it.copy(screen = Screen.LoginSignup, loadingMessage = null) }
             }
         }
@@ -251,7 +247,7 @@ internal class OnrampViewModel(
                 }
             }
             is Result.Failure -> {
-                _message.value = "Log in failed: ${result.error.displayMessage()}"
+                _message.value = "Log in failed: ${result.error.message}"
                 _uiState.update { it.copy(screen = Screen.LoginSignup, loadingMessage = null) }
             }
         }
@@ -272,14 +268,14 @@ internal class OnrampViewModel(
                         }
                         is OnrampTokenAuthenticationResult.Failed -> {
                             clearUserData()
-                            _message.value = "Seamless sign-in failed: ${authenticateResult.error.displayMessage()}"
+                            _message.value = "Seamless sign-in failed: ${authenticateResult.error.message}"
                             _uiState.update { state -> state.copy(screen = Screen.LoginSignup) }
                         }
                     }
                 }
                 is Result.Failure -> {
                     clearUserData()
-                    _message.value = "Seamless sign-in failed: ${result.error.displayMessage()}"
+                    _message.value = "Seamless sign-in failed: ${result.error.message}"
                     _uiState.update { state -> state.copy(screen = Screen.LoginSignup) }
                 }
             }
@@ -311,7 +307,7 @@ internal class OnrampViewModel(
                 }
             }
             is OnrampHasLinkAccountResult.Failed -> {
-                _message.value = "Lookup failed: ${result.error.displayMessage()}"
+                _message.value = "Lookup failed: ${result.error.message}"
                 _uiState.update { it.copy(screen = Screen.LoginSignup) }
             }
         }
@@ -346,7 +342,7 @@ internal class OnrampViewModel(
                 _message.value = "Identity Verification cancelled, please try again"
             }
             is OnrampVerifyIdentityResult.Failed -> {
-                _message.value = "Identity Verification failed: ${result.error.displayMessage()}"
+                _message.value = "Identity Verification failed: ${result.error.message}"
                 _uiState.update { it.copy(screen = Screen.LoginSignup) }
             }
         }
@@ -358,7 +354,7 @@ internal class OnrampViewModel(
                 _message.value = "CRS CARF Declaration Confirmed"
             }
             is OnrampCrsCarfDeclarationResult.Failed -> {
-                _message.value = "CRS CARF Declaration failed: ${result.error.displayMessage()}"
+                _message.value = "CRS CARF Declaration failed: ${result.error.message}"
             }
             is OnrampCrsCarfDeclarationResult.Cancelled -> {
                 _message.value = "CRS CARF Declaration cancelled, please try again"
@@ -379,7 +375,7 @@ internal class OnrampViewModel(
                 _message.value = "KYC Verification Cancelled"
             }
             is OnrampVerifyKycInfoResult.Failed -> {
-                _message.value = "KYC Verification Failed: ${result.error.displayMessage()}"
+                _message.value = "KYC Verification Failed: ${result.error.message}"
             }
         }
     }
@@ -412,7 +408,7 @@ internal class OnrampViewModel(
                 _message.value = "Payment selection cancelled, please try again"
             }
             is OnrampCollectPaymentMethodResult.Failed -> {
-                _message.value = "Payment selection failed: ${result.error.displayMessage()}"
+                _message.value = "Payment selection failed: ${result.error.message}"
                 _uiState.update { it.copy(screen = Screen.AuthenticatedOperations) }
             }
         }
@@ -449,7 +445,7 @@ internal class OnrampViewModel(
                 _message.value = "Authorization cancelled by user."
             }
             is OnrampAuthorizeResult.Failed -> {
-                _message.value = "Authorization failed: ${result.error.displayMessage()}"
+                _message.value = "Authorization failed: ${result.error.message}"
             }
         }
     }
@@ -466,7 +462,7 @@ internal class OnrampViewModel(
                 _uiState.update { it.copy(screen = Screen.AuthenticatedOperations, loadingMessage = null) }
             }
             is OnrampCheckoutResult.Failed -> {
-                _message.value = "Checkout failed: ${result.error.displayMessage()}"
+                _message.value = "Checkout failed: ${result.error.message}"
                 _uiState.update { it.copy(screen = Screen.AuthenticatedOperations, loadingMessage = null) }
             }
         }
@@ -494,7 +490,7 @@ internal class OnrampViewModel(
                 checkoutResponse.clientSecret
             }
             is Result.Failure -> {
-                throw IllegalStateException("Backend checkout failed: ${result.error.displayMessage()}")
+                throw IllegalStateException("Backend checkout failed: ${result.error.message}")
             }
         }
     }
@@ -513,7 +509,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is OnrampRegisterLinkUserResult.Failed -> {
-                    _message.value = "Registration failed: ${result.error.displayMessage()}"
+                    _message.value = "Registration failed: ${result.error.message}"
                     _uiState.update { it.copy(screen = Screen.LoginSignup) }
                 }
             }
@@ -541,7 +537,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is OnrampRegisterWalletAddressResult.Failed -> handleError(result.error) {
-                    _message.value = "Failed to register wallet address: ${result.error.displayMessage()}"
+                    _message.value = "Failed to register wallet address: ${result.error.message}"
                     _uiState.update { it.copy(screen = Screen.AuthenticatedOperations) }
                 }
             }
@@ -560,7 +556,7 @@ internal class OnrampViewModel(
                     _uiState.update { it.copy(screen = Screen.AuthenticatedOperations) }
                 }
                 is OnrampAttachKycInfoResult.Failed -> handleError(result.error) {
-                    _message.value = "KYC Collection failed: ${result.error.displayMessage()}"
+                    _message.value = "KYC Collection failed: ${result.error.message}"
                     _uiState.update { it.copy(screen = Screen.AuthenticatedOperations) }
                 }
             }
@@ -590,7 +586,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is OnrampRetrieveMissingIdentifiersResult.Failed -> handleError(result.error) {
-                    _message.value = "Failed to retrieve missing identifiers: ${result.error.displayMessage()}"
+                    _message.value = "Failed to retrieve missing identifiers: ${result.error.message}"
                     _uiState.update {
                         it.copy(
                             screen = Screen.AuthenticatedOperations,
@@ -627,7 +623,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is OnrampSubmitIdentifiersResult.Failed -> handleError(result.error) {
-                    _message.value = "Submit identifiers failed: ${result.error.displayMessage()}"
+                    _message.value = "Submit identifiers failed: ${result.error.message}"
                     _uiState.update {
                         it.copy(
                             screen = Screen.AuthenticatedOperations,
@@ -656,7 +652,7 @@ internal class OnrampViewModel(
                     _uiState.update { it.copy(screen = currentScreen) }
                 }
                 is OnrampUpdatePhoneNumberResult.Failed -> handleError(result.error) {
-                    _message.value = "Failed to update phone number: ${result.error.displayMessage()}"
+                    _message.value = "Failed to update phone number: ${result.error.message}"
                     _uiState.update { it.copy(screen = currentScreen) }
                 }
             }
@@ -680,7 +676,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is OnrampCreateCryptoPaymentTokenResult.Failed -> handleError(result.error) {
-                    _message.value = "Failed to create crypto payment token: ${result.error.displayMessage()}"
+                    _message.value = "Failed to create crypto payment token: ${result.error.message}"
                     _uiState.update { it.copy(screen = Screen.AuthenticatedOperations) }
                 }
             }
@@ -739,7 +735,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is Result.Failure -> {
-                    _message.value = "Failed to create onramp session: ${result.error.displayMessage()}"
+                    _message.value = "Failed to create onramp session: ${result.error.message}"
                     _uiState.update { it.copy(screen = Screen.AuthenticatedOperations, loadingMessage = null) }
                 }
             }
@@ -886,7 +882,7 @@ internal class OnrampViewModel(
                 return response.authIntentId
             }
             is Result.Failure -> {
-                _message.value = "Failed to create auth intent: ${result.error.displayMessage()}"
+                _message.value = "Failed to create auth intent: ${result.error.message}"
                 return null
             }
         }
@@ -909,7 +905,7 @@ internal class OnrampViewModel(
                     }
                 }
                 is OnrampLogOutResult.Failed -> {
-                    _message.value = "Logout failed: ${result.error.displayMessage()}"
+                    _message.value = "Logout failed: ${result.error.message}"
                     _uiState.update { it.copy(screen = Screen.AuthenticatedOperations, loadingMessage = null) }
                 }
             }

From 5fdbc1790fabda28d382f71b631b67fdb1d6e89d Mon Sep 17 00:00:00 2001
From: Twig <Twigz@users.noreply.github.com>
Date: Thu, 21 May 2026 13:06:08 -0400
Subject: [PATCH 37/57] Removed userMessageResId

---
 crypto-onramp/api/crypto-onramp.api                   |  3 ---
 .../crypto/onramp/exception/CryptoOnrampException.kt  | 11 -----------
 .../android/crypto/onramp/OnrampInteractorTest.kt     |  5 +----
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index eefbab59d85..94997708a7b 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -46,7 +46,6 @@ public final class com/stripe/android/crypto/onramp/exception/AppAttestationExce
 	public final fun getReason ()Ljava/lang/String;
 	public final fun getSdkVersion ()Ljava/lang/String;
 	public fun getUserMessage ()Ljava/lang/String;
-	public fun getUserMessageResId ()Ljava/lang/Integer;
 }
 
 public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampException : com/stripe/android/core/exception/StripeException {
@@ -55,7 +54,6 @@ public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampExc
 	public final fun getDeveloperMessage ()Ljava/lang/String;
 	public final fun getRawStripeError ()Lcom/stripe/android/core/StripeError;
 	public abstract fun getUserMessage ()Ljava/lang/String;
-	public abstract fun getUserMessageResId ()Ljava/lang/Integer;
 }
 
 public final class com/stripe/android/crypto/onramp/exception/MissingConsumerSecretException : java/lang/IllegalStateException {
@@ -91,7 +89,6 @@ public final class com/stripe/android/crypto/onramp/exception/UncategorizedApiEr
 	public final fun getRawReason ()Ljava/lang/String;
 	public final fun getSdkVersion ()Ljava/lang/String;
 	public fun getUserMessage ()Ljava/lang/String;
-	public fun getUserMessageResId ()Ljava/lang/Integer;
 }
 
 public final class com/stripe/android/crypto/onramp/model/CryptoNetwork : java/lang/Enum {
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index 574218e9860..ba219718ae5 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -23,12 +23,6 @@ abstract class CryptoOnrampException internal constructor(
     cause = cause,
     message = message,
 ) {
-    /**
-     * A localized SDK-owned end-user-facing message resource, when available.
-     */
-    @get:StringRes
-    abstract val userMessageResId: Int?
-
     /**
      * An end-user-facing message, when available.
      */
@@ -103,10 +97,6 @@ class AppAttestationException internal constructor(
     ),
     cause = cause,
 ) {
-    override val userMessageResId: Int =
-        reason.appAttestationUserMessageResId
-            ?: R.string.stripe_onramp_app_attestation_default_user_message
-
     override val userMessage: String = apiUserMessage.orFallbackTo(fallbackUserMessage)
 }
 
@@ -169,7 +159,6 @@ class UncategorizedApiErrorException internal constructor(
     ),
     cause = cause,
 ) {
-    override val userMessageResId: Int? = null
     override val userMessage: String = apiUserMessage.orFallbackTo(fallbackUserMessage)
 }
 
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 601aff9a141..822764101ae 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -221,7 +221,6 @@ class OnrampInteractorTest {
         assertThat(error).isInstanceOf(AppAttestationException::class.java)
 
         val attestationError = error as AppAttestationException
-        assertThat(attestationError.userMessageResId).isNotNull()
         assertThat(attestationError.userMessage)
             .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
         assertThat(attestationError.message)
@@ -356,7 +355,6 @@ class OnrampInteractorTest {
         assertThat(error).isInstanceOf(UncategorizedApiErrorException::class.java)
 
         val apiError = error as UncategorizedApiErrorException
-        assertThat(apiError.userMessageResId).isNull()
         assertThat(apiError.userMessage).isEqualTo("Something went wrong. Please try again later.")
         assertThat(apiError.message).isEqualTo("Something went wrong. Please try again later.")
         assertThat(apiError.developerMessage).contains("Developer-facing message")
@@ -365,7 +363,7 @@ class OnrampInteractorTest {
     }
 
     @Test
-    fun appAttestationExceptionMapsKnownReasonsToLocalizedUserMessages() {
+    fun appAttestationExceptionUsesProvidedFallbackUserMessage() {
         val cause = IllegalStateException("boom")
 
         listOf(
@@ -391,7 +389,6 @@ class OnrampInteractorTest {
                 cause = cause,
             )
 
-            assertThat(error.userMessageResId).isNotNull()
             assertThat(error.userMessage).isEqualTo("Fallback attestation message")
             assertThat(error.message).isEqualTo("Fallback attestation message")
         }

From 3c40f79617ab226289fac4bd81f8bb9c104138ca Mon Sep 17 00:00:00 2001
From: Twig <Twigz@users.noreply.github.com>
Date: Thu, 21 May 2026 13:28:16 -0400
Subject: [PATCH 38/57] Remove not real URL

---
 .../android/crypto/onramp/exception/OnrampErrorMapper.kt       | 3 +--
 .../com/stripe/android/crypto/onramp/OnrampInteractorTest.kt   | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index 677c7c64f21..113a336418a 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -30,7 +30,7 @@ internal fun Throwable.toCryptoOnrampError(
             apiErrorCode = stripeError.code,
             apiErrorMessage = stripeError.message,
             apiUserMessage = apiUserMessage,
-            docUrl = stripeError.docUrl ?: APP_ATTESTATION_DOC_URL,
+            docUrl = stripeError.docUrl,
             fallbackUserMessage = apiUserMessage
                 ?: reason.appAttestationUserMessageResId?.let(context::getString)
                 ?: context.getString(R.string.stripe_onramp_app_attestation_default_user_message),
@@ -67,7 +67,6 @@ private fun String?.toMode(): String? {
     }
 }
 
-private const val APP_ATTESTATION_DOC_URL = "https://stripe.com/docs/crypto/onramp/app-attestation"
 private const val ERROR_CODE_APP_ATTESTATION_FAILED = "link_failed_to_attest_request"
 private const val FIELD_REASON = "reason"
 private const val FIELD_USER_MESSAGE = "user_message"
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 822764101ae..85e5e175bb1 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -233,8 +233,6 @@ class OnrampInteractorTest {
             .contains("package: ${RuntimeEnvironment.getApplication().packageName}")
         assertThat(attestationError.developerMessage).contains("operation: register_wallet_address")
         assertThat(attestationError.developerMessage).contains("request_id: req_123")
-        assertThat(attestationError.developerMessage)
-            .contains("Docs: https://stripe.com/docs/crypto/onramp/app-attestation")
     }
 
     @Test

From a586dbce1897f98e50721776a0e42b9e574ece68 Mon Sep 17 00:00:00 2001
From: Twig <Twigz@users.noreply.github.com>
Date: Thu, 21 May 2026 14:58:26 -0400
Subject: [PATCH 39/57] Removed a large number of fallback messages

---
 crypto-onramp/res/values/strings.xml          | 16 +---
 .../onramp/exception/CryptoOnrampException.kt | 18 -----
 .../onramp/exception/OnrampErrorMapper.kt     |  4 +-
 .../crypto/onramp/OnrampInteractorTest.kt     | 74 ++++++++++++-------
 4 files changed, 49 insertions(+), 63 deletions(-)

diff --git a/crypto-onramp/res/values/strings.xml b/crypto-onramp/res/values/strings.xml
index 8d5b6f149ad..2716daf97ce 100644
--- a/crypto-onramp/res/values/strings.xml
+++ b/crypto-onramp/res/values/strings.xml
@@ -1,21 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <!-- App-user message for Crypto Onramp app attestation failures when app attestation is not enabled yet. -->
-  <string name="stripe_onramp_app_attestation_not_enabled_user_message">Onramp isn\'t available in this app right now. Please try again later.</string>
-  <!-- App-user message for Crypto Onramp app attestation failures when the app is not registered as trusted. -->
-  <string name="stripe_onramp_app_attestation_not_registered_user_message">This app couldn\'t be verified. Install the latest version and try again.</string>
-  <!-- App-user message for Crypto Onramp app attestation failures when attestation data is missing. -->
-  <string name="stripe_onramp_app_attestation_data_missing_user_message">This app couldn\'t be verified. Install the latest version and try again.</string>
   <!-- Fallback app-user message for Crypto Onramp app attestation failures. -->
-  <string name="stripe_onramp_app_attestation_default_user_message">This app couldn\'t be verified. Please try again later.</string>
+  <string name="stripe_onramp_app_attestation_default_user_message">This app couldn\'t be verified due to an attestation error. Please try again later or contact the developer if the issue persists.</string>
   <!-- Fallback app-user message for uncategorized Crypto Onramp API failures. -->
   <string name="stripe_onramp_default_api_error_user_message">Something went wrong. Please try again later.</string>
-  <!-- App-user message for Crypto Onramp app attestation failures caused by non-Google Play distribution. -->
-  <string name="stripe_onramp_app_attestation_play_user_message">This app couldn\'t be verified. Install it from Google Play and try again.</string>
-  <!-- App-user message for Crypto Onramp app attestation failures when the installed app variant is incorrect. -->
-  <string name="stripe_onramp_app_attestation_package_name_mismatch_user_message">This app couldn\'t be verified. Install the official version and try again.</string>
-  <!-- App-user message for Crypto Onramp app attestation failures when the installed Google Play variant does not match the environment. -->
-  <string name="stripe_onramp_app_attestation_environment_mismatch_user_message">This app couldn\'t be verified. Install the correct Google Play version and try again.</string>
-  <!-- App-user message for Crypto Onramp app attestation failures when the Play Integrity verdict could not be validated. -->
-  <string name="stripe_onramp_app_attestation_verdict_validation_failed_user_message">This app couldn\'t be verified. Try again.</string>
 </resources>
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index ba219718ae5..23fd90674de 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -1,10 +1,8 @@
 package com.stripe.android.crypto.onramp.exception
 
-import androidx.annotation.StringRes
 import com.stripe.android.core.StripeError
 import com.stripe.android.core.exception.StripeException
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
-import com.stripe.android.crypto.onramp.R
 
 /**
  * Base exception type for Crypto Onramp failures that expose SDK-owned recovery guidance.
@@ -230,22 +228,6 @@ private fun appAttestationNextStep(reason: String?): String? {
     }
 }
 
-@get:StringRes
-internal val String?.appAttestationUserMessageResId: Int?
-    get() = when (this) {
-        ATTESTATION_NOT_ENABLED_REASON -> R.string.stripe_onramp_app_attestation_not_enabled_user_message
-        APP_NOT_REGISTERED_REASON -> R.string.stripe_onramp_app_attestation_not_registered_user_message
-        ATTESTATION_DATA_MISSING_REASON -> R.string.stripe_onramp_app_attestation_data_missing_user_message
-        APP_NOT_PLAY_RECOGNIZED_REASON -> R.string.stripe_onramp_app_attestation_play_user_message
-        ANDROID_PACKAGE_NAME_MISMATCH_REASON ->
-            R.string.stripe_onramp_app_attestation_package_name_mismatch_user_message
-        ANDROID_ENVIRONMENT_MISMATCH_REASON ->
-            R.string.stripe_onramp_app_attestation_environment_mismatch_user_message
-        ANDROID_VERDICT_VALIDATION_FAILED_REASON ->
-            R.string.stripe_onramp_app_attestation_verdict_validation_failed_user_message
-        else -> null
-    }
-
 private fun attestationSummary(description: String): String {
     return "App attestation failed: $description."
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index 113a336418a..1d07b2d58aa 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -31,9 +31,7 @@ internal fun Throwable.toCryptoOnrampError(
             apiErrorMessage = stripeError.message,
             apiUserMessage = apiUserMessage,
             docUrl = stripeError.docUrl,
-            fallbackUserMessage = apiUserMessage
-                ?: reason.appAttestationUserMessageResId?.let(context::getString)
-                ?: context.getString(R.string.stripe_onramp_app_attestation_default_user_message),
+            fallbackUserMessage = context.getString(R.string.stripe_onramp_app_attestation_default_user_message),
             cause = stripeException,
         )
     } else {
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 85e5e175bb1..c129d74b995 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -361,35 +361,55 @@ class OnrampInteractorTest {
     }
 
     @Test
-    fun appAttestationExceptionUsesProvidedFallbackUserMessage() {
-        val cause = IllegalStateException("boom")
-
-        listOf(
-            "attestation_not_enabled",
-            "app_not_registered",
-            "attestation_data_missing",
-            "app_not_play_recognized",
-            "android_package_name_mismatch",
-            "android_environment_mismatch",
-            "android_verdict_validation_failed",
-        ).forEach { reason ->
-            val error = AppAttestationException(
-                reason = reason,
-                operation = "register_wallet_address",
-                appPackageName = "com.example.app",
-                mode = "test",
-                sdkVersion = "1.0.0",
-                apiErrorCode = "link_failed_to_attest_request",
-                apiErrorMessage = "App attestation failed",
-                apiUserMessage = null,
-                docUrl = null,
-                fallbackUserMessage = "Fallback attestation message",
-                cause = cause,
-            )
+    fun appAttestationExceptionUsesSingleLocalizedFallbackUserMessage() = runTest {
+        val application = mock<Application> {
+            on { packageName } doReturn "com.example.app"
+            on { getString(any()) } doReturn
+                "This app couldn't be verified due to an attestation error. Please try again later or contact the developer if the issue persists."
+        }
+        val interactor = OnrampInteractor(
+            application = application,
+            linkController = linkController,
+            cryptoApiRepository = cryptoApiRepository,
+            analyticsServiceFactory = analyticsServiceFactory,
+            checkoutHandler = OnrampSessionClientSecretProvider { "test_secret" },
+            savedStateHandle = SavedStateHandle()
+        )
 
-            assertThat(error.userMessage).isEqualTo("Fallback attestation message")
-            assertThat(error.message).isEqualTo("Fallback attestation message")
+        whenever(linkController.configure(any())).thenReturn(ConfigureResult.Success)
+        val failedResult = mock<LinkController.LookupConsumerResult.Failed> {
+            on { email } doReturn "test@example.com"
+            on { error } doReturn InvalidRequestException(
+                stripeError = StripeError(
+                    code = "link_failed_to_attest_request",
+                    message = "App attestation failed",
+                    extraFields = mapOf(
+                        "reason" to "android_environment_mismatch"
+                    )
+                ),
+                requestId = "req_attestation_fallback",
+                statusCode = 400,
+            )
         }
+        whenever(linkController.lookupConsumer(any())).thenReturn(failedResult)
+
+        interactor.configure(createConfigurationState())
+
+        val result = interactor.hasLinkAccount("test@example.com")
+
+        assertThat(result).isInstanceOf(OnrampHasLinkAccountResult.Failed::class.java)
+
+        val error = (result as OnrampHasLinkAccountResult.Failed).error
+        assertThat(error).isInstanceOf(AppAttestationException::class.java)
+
+        val attestationError = error as AppAttestationException
+        assertThat(attestationError.reason).isEqualTo("android_environment_mismatch")
+        assertThat(attestationError.userMessage)
+            .isEqualTo("This app couldn't be verified due to an attestation error. Please try again later or contact the developer if the issue persists.")
+        assertThat(attestationError.message)
+            .isEqualTo("This app couldn't be verified due to an attestation error. Please try again later or contact the developer if the issue persists.")
+        assertThat(attestationError.developerMessage)
+            .contains("the Play Integrity distribution channel does not match this Stripe mode")
     }
 
     @Test

From b96a7d3f0f8dc97470f7bdc20371e59d1c23fb1b Mon Sep 17 00:00:00 2001
From: Twig <Twigz@users.noreply.github.com>
Date: Thu, 21 May 2026 16:34:06 -0400
Subject: [PATCH 40/57] Cleanup

---
 crypto-onramp/api/crypto-onramp.api           |  2 +-
 .../onramp/exception/CryptoOnrampException.kt | 26 +++++++++----------
 .../onramp/exception/OnrampErrorMapper.kt     | 12 ++++++---
 .../crypto/onramp/OnrampInteractorTest.kt     |  2 +-
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 94997708a7b..1bc20f1a236 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -86,7 +86,7 @@ public final class com/stripe/android/crypto/onramp/exception/UncategorizedApiEr
 	public final fun getDocUrl ()Ljava/lang/String;
 	public final fun getMode ()Ljava/lang/String;
 	public final fun getOperation ()Ljava/lang/String;
-	public final fun getRawReason ()Ljava/lang/String;
+	public final fun getReason ()Ljava/lang/String;
 	public final fun getSdkVersion ()Ljava/lang/String;
 	public fun getUserMessage ()Ljava/lang/String;
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index 23fd90674de..bb4c28649ec 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -78,10 +78,10 @@ class AppAttestationException internal constructor(
      * A documentation URL for recovery guidance, when available.
      */
     val docUrl: String?,
-    fallbackUserMessage: String,
+    fallbackUserMessage: Lazy<String>,
     cause: Throwable,
 ) : CryptoOnrampException(
-    message = apiUserMessage.orFallbackTo(fallbackUserMessage),
+    message = apiUserMessage ?: fallbackUserMessage.value,
     developerMessage = buildAppAttestationDeveloperMessage(
         operation = operation,
         appPackageName = appPackageName,
@@ -95,7 +95,7 @@ class AppAttestationException internal constructor(
     ),
     cause = cause,
 ) {
-    override val userMessage: String = apiUserMessage.orFallbackTo(fallbackUserMessage)
+    override val userMessage: String = apiUserMessage ?: fallbackUserMessage.value
 }
 
 /**
@@ -106,7 +106,7 @@ class UncategorizedApiErrorException internal constructor(
     /**
      * The raw backend reason, when present.
      */
-    val rawReason: String?,
+    val reason: String?,
     /**
      * The Crypto Onramp operation that failed.
      */
@@ -139,16 +139,16 @@ class UncategorizedApiErrorException internal constructor(
      * A documentation URL for recovery guidance, when available.
      */
     val docUrl: String?,
-    fallbackUserMessage: String,
+    fallbackUserMessage: Lazy<String>,
     cause: Throwable,
 ) : CryptoOnrampException(
-    message = apiUserMessage.orFallbackTo(fallbackUserMessage),
+    message = apiUserMessage ?: fallbackUserMessage.value,
     developerMessage = buildGenericDeveloperMessage(
         operation = operation,
         appPackageName = appPackageName,
         mode = mode,
         sdkVersion = sdkVersion,
-        rawReason = rawReason,
+        reason = reason,
         requestId = (cause as? StripeException)?.requestId,
         apiErrorCode = apiErrorCode,
         apiErrorMessage = apiErrorMessage,
@@ -157,7 +157,7 @@ class UncategorizedApiErrorException internal constructor(
     ),
     cause = cause,
 ) {
-    override val userMessage: String = apiUserMessage.orFallbackTo(fallbackUserMessage)
+    override val userMessage: String = apiUserMessage ?: fallbackUserMessage.value
 }
 
 private const val ATTESTATION_NOT_ENABLED_REASON = "attestation_not_enabled"
@@ -248,7 +248,7 @@ private fun buildAppAttestationDeveloperMessage(
         operation = operation,
         appPackageName = appPackageName,
         mode = mode,
-        rawReason = reason,
+        reason = reason,
         requestId = requestId,
         apiErrorCode = apiErrorCode,
         nextStep = appAttestationNextStep(reason)
@@ -264,7 +264,7 @@ private fun buildGenericDeveloperMessage(
     appPackageName: String,
     mode: String?,
     sdkVersion: String,
-    rawReason: String?,
+    reason: String?,
     requestId: String?,
     apiErrorCode: String?,
     apiErrorMessage: String?,
@@ -276,7 +276,7 @@ private fun buildGenericDeveloperMessage(
         operation = operation,
         appPackageName = appPackageName,
         mode = mode,
-        rawReason = rawReason,
+        reason = reason,
         requestId = requestId,
         apiErrorCode = apiErrorCode,
         nextStep = apiUserMessage.orFallbackTo(
@@ -296,7 +296,7 @@ private fun buildDeveloperMessage(
     operation: String,
     appPackageName: String,
     mode: String?,
-    rawReason: String?,
+    reason: String?,
     requestId: String?,
     apiErrorCode: String?,
     nextStep: String,
@@ -307,7 +307,7 @@ private fun buildDeveloperMessage(
         "package: $appPackageName",
         mode?.let { "mode: $it" },
         "operation: $operation",
-        rawReason?.let { "reason: $it" },
+        reason?.let { "reason: $it" },
         requestId?.let { "request_id: $it" },
         apiErrorCode?.let { "code: $it" },
     )
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index 1d07b2d58aa..51a9b7a74b7 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -6,6 +6,7 @@ import com.stripe.android.core.exception.StripeException
 import com.stripe.android.core.version.StripeSdkVersion
 import com.stripe.android.crypto.onramp.R
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent
+import kotlin.LazyThreadSafetyMode
 
 internal fun Throwable.toCryptoOnrampError(
     context: Context,
@@ -31,12 +32,14 @@ internal fun Throwable.toCryptoOnrampError(
             apiErrorMessage = stripeError.message,
             apiUserMessage = apiUserMessage,
             docUrl = stripeError.docUrl,
-            fallbackUserMessage = context.getString(R.string.stripe_onramp_app_attestation_default_user_message),
+            fallbackUserMessage = lazy(LazyThreadSafetyMode.NONE) {
+                context.getString(R.string.stripe_onramp_app_attestation_default_user_message)
+            },
             cause = stripeException,
         )
     } else {
         UncategorizedApiErrorException(
-            rawReason = reason,
+            reason = reason,
             operation = operation.value,
             appPackageName = context.packageName,
             mode = publishableKey.toMode(),
@@ -45,8 +48,9 @@ internal fun Throwable.toCryptoOnrampError(
             apiErrorMessage = stripeError.message,
             apiUserMessage = apiUserMessage,
             docUrl = stripeError.docUrl,
-            fallbackUserMessage = apiUserMessage
-                ?: context.getString(R.string.stripe_onramp_default_api_error_user_message),
+            fallbackUserMessage = lazy(LazyThreadSafetyMode.NONE) {
+                context.getString(R.string.stripe_onramp_default_api_error_user_message)
+            },
             cause = stripeException,
         )
     }
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index c129d74b995..e6ca3eecda5 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -304,7 +304,7 @@ class OnrampInteractorTest {
         assertThat(error).isInstanceOf(UncategorizedApiErrorException::class.java)
 
         val apiError = error as UncategorizedApiErrorException
-        assertThat(apiError.rawReason).isEqualTo("email_blocked")
+        assertThat(apiError.reason).isEqualTo("email_blocked")
         assertThat(apiError.userMessage).isEqualTo("This email can't be used. Try another one.")
         assertThat(apiError.message).isEqualTo("This email can't be used. Try another one.")
         assertThat(apiError.developerMessage).contains("This email address can't be used.")

From d04a9f750dda4dfe9c379b9f46847c44b113bcb4 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 26 May 2026 13:41:39 -0400
Subject: [PATCH 41/57] Added in missing apiErrorType

---
 crypto-onramp/api/crypto-onramp.api           |  2 +
 .../onramp/exception/CryptoOnrampException.kt | 46 ++++++++++++++-----
 .../onramp/exception/OnrampErrorMapper.kt     |  7 +++
 .../crypto/onramp/OnrampInteractorTest.kt     | 27 +++++++++--
 4 files changed, 68 insertions(+), 14 deletions(-)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 1bc20f1a236..a5de6c05822 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -38,6 +38,7 @@ public final class com/stripe/android/crypto/onramp/exception/AppAttestationExce
 	public static final field $stable I
 	public final fun getApiErrorCode ()Ljava/lang/String;
 	public final fun getApiErrorMessage ()Ljava/lang/String;
+	public final fun getApiErrorType ()Ljava/lang/String;
 	public final fun getApiUserMessage ()Ljava/lang/String;
 	public final fun getAppPackageName ()Ljava/lang/String;
 	public final fun getDocUrl ()Ljava/lang/String;
@@ -81,6 +82,7 @@ public final class com/stripe/android/crypto/onramp/exception/UncategorizedApiEr
 	public static final field $stable I
 	public final fun getApiErrorCode ()Ljava/lang/String;
 	public final fun getApiErrorMessage ()Ljava/lang/String;
+	public final fun getApiErrorType ()Ljava/lang/String;
 	public final fun getApiUserMessage ()Ljava/lang/String;
 	public final fun getAppPackageName ()Ljava/lang/String;
 	public final fun getDocUrl ()Ljava/lang/String;
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index bb4c28649ec..5014fcd9ebe 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -66,6 +66,10 @@ class AppAttestationException internal constructor(
      * The raw backend error code, when present.
      */
     val apiErrorCode: String?,
+    /**
+     * The raw backend error type, when present.
+     */
+    val apiErrorType: String?,
     /**
      * The raw backend developer-facing message, when present.
      */
@@ -90,6 +94,7 @@ class AppAttestationException internal constructor(
         reason = reason,
         requestId = (cause as? StripeException)?.requestId,
         apiErrorCode = apiErrorCode,
+        apiErrorType = apiErrorType,
         apiErrorMessage = apiErrorMessage,
         docUrl = docUrl,
     ),
@@ -127,6 +132,10 @@ class UncategorizedApiErrorException internal constructor(
      * The raw backend error code, when present.
      */
     val apiErrorCode: String?,
+    /**
+     * The raw backend error type, when present.
+     */
+    val apiErrorType: String?,
     /**
      * The raw backend developer-facing message, when present.
      */
@@ -151,6 +160,7 @@ class UncategorizedApiErrorException internal constructor(
         reason = reason,
         requestId = (cause as? StripeException)?.requestId,
         apiErrorCode = apiErrorCode,
+        apiErrorType = apiErrorType,
         apiErrorMessage = apiErrorMessage,
         apiUserMessage = apiUserMessage,
         docUrl = docUrl,
@@ -240,6 +250,7 @@ private fun buildAppAttestationDeveloperMessage(
     reason: String?,
     requestId: String?,
     apiErrorCode: String?,
+    apiErrorType: String?,
     apiErrorMessage: String?,
     docUrl: String?,
 ): String {
@@ -251,6 +262,7 @@ private fun buildAppAttestationDeveloperMessage(
         reason = reason,
         requestId = requestId,
         apiErrorCode = apiErrorCode,
+        apiErrorType = apiErrorType,
         nextStep = appAttestationNextStep(reason)
             ?: (apiErrorMessage
                 ?: "Inspect the preserved Stripe API error for details and retry after correcting the app attestation configuration."),
@@ -267,6 +279,7 @@ private fun buildGenericDeveloperMessage(
     reason: String?,
     requestId: String?,
     apiErrorCode: String?,
+    apiErrorType: String?,
     apiErrorMessage: String?,
     apiUserMessage: String?,
     docUrl: String?,
@@ -279,6 +292,7 @@ private fun buildGenericDeveloperMessage(
         reason = reason,
         requestId = requestId,
         apiErrorCode = apiErrorCode,
+        apiErrorType = apiErrorType,
         nextStep = apiUserMessage.orFallbackTo(
             "Inspect the preserved Stripe API error for details and retry after correcting the request."
         ),
@@ -299,27 +313,37 @@ private fun buildDeveloperMessage(
     reason: String?,
     requestId: String?,
     apiErrorCode: String?,
+    apiErrorType: String?,
     nextStep: String,
     docUrl: String?,
     sdkVersion: String,
 ): String {
     val context = listOfNotNull(
-        "package: $appPackageName",
-        mode?.let { "mode: $it" },
-        "operation: $operation",
-        reason?.let { "reason: $it" },
-        requestId?.let { "request_id: $it" },
-        apiErrorCode?.let { "code: $it" },
+        "  - operation: $operation",
+        "  - app_id: $appPackageName",
+        mode?.let { "  - mode: $it" },
+        reason?.let { "  - reason: $it" },
+        requestId?.let { "  - request_id: $it" },
+        apiErrorCode?.let { "  - code: $it" },
+        apiErrorType?.let { "  - type: $it" },
     )
 
     return buildList {
-        add(summary)
+        add("Summary")
+        add("  $summary")
         add("")
-        add("Context:")
+        add("Context")
         addAll(context)
         add("")
-        add("Next step: $nextStep")
-        docUrl?.let { add("Docs: $it") }
-        add("SDK: stripe-android@$sdkVersion")
+        add("Next step")
+        add("  $nextStep")
+        docUrl?.let {
+            add("")
+            add("Docs")
+            add("  $it")
+        }
+        add("")
+        add("SDK")
+        add("  stripe-android@$sdkVersion")
     }.joinToString(separator = "\n")
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index 51a9b7a74b7..dbefbb2c2b8 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -19,6 +19,7 @@ internal fun Throwable.toCryptoOnrampError(
     val stripeError = stripeException.stripeError ?: return this
 
     val reason = stripeError.extraFields?.get(FIELD_REASON)
+    val apiErrorType = stripeException.apiErrorType()
     val apiUserMessage = stripeError.extraFields?.get(FIELD_USER_MESSAGE)?.takeIf { it.isNotBlank() }
 
     return if (stripeError.isAppAttestationError()) {
@@ -29,6 +30,7 @@ internal fun Throwable.toCryptoOnrampError(
             mode = publishableKey.toMode(),
             sdkVersion = StripeSdkVersion.VERSION,
             apiErrorCode = stripeError.code,
+            apiErrorType = apiErrorType,
             apiErrorMessage = stripeError.message,
             apiUserMessage = apiUserMessage,
             docUrl = stripeError.docUrl,
@@ -45,6 +47,7 @@ internal fun Throwable.toCryptoOnrampError(
             mode = publishableKey.toMode(),
             sdkVersion = StripeSdkVersion.VERSION,
             apiErrorCode = stripeError.code,
+            apiErrorType = apiErrorType,
             apiErrorMessage = stripeError.message,
             apiUserMessage = apiUserMessage,
             docUrl = stripeError.docUrl,
@@ -60,6 +63,10 @@ private fun StripeError.isAppAttestationError(): Boolean {
     return code == ERROR_CODE_APP_ATTESTATION_FAILED
 }
 
+private fun StripeException.apiErrorType(): String? {
+    return stripeError?.type?.takeIf { it.isNotBlank() }
+}
+
 private fun String?.toMode(): String? {
     return when {
         this == null -> null
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index e6ca3eecda5..69069ee4f4b 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -194,6 +194,7 @@ class OnrampInteractorTest {
             Result.failure(
                 APIException(
                     stripeError = StripeError(
+                        type = "api_error",
                         code = "link_failed_to_attest_request",
                         message = "App attestation failed",
                         extraFields = mapOf(
@@ -227,12 +228,18 @@ class OnrampInteractorTest {
             .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
         assertThat(attestationError.reason).isEqualTo("app_not_play_recognized")
         assertThat(attestationError.mode).isEqualTo("test")
+        assertThat(attestationError.apiErrorType).isEqualTo("api_error")
+        assertThat(attestationError.developerMessage).contains("Summary")
+        assertThat(attestationError.developerMessage).contains("Context")
+        assertThat(attestationError.developerMessage).contains("Next step")
+        assertThat(attestationError.developerMessage).contains("SDK")
         assertThat(attestationError.developerMessage)
             .contains("App attestation failed: this app is not recognized by Google Play.")
         assertThat(attestationError.developerMessage)
-            .contains("package: ${RuntimeEnvironment.getApplication().packageName}")
+            .contains("app_id: ${RuntimeEnvironment.getApplication().packageName}")
         assertThat(attestationError.developerMessage).contains("operation: register_wallet_address")
         assertThat(attestationError.developerMessage).contains("request_id: req_123")
+        assertThat(attestationError.developerMessage).contains("type: api_error")
     }
 
     @Test
@@ -267,10 +274,14 @@ class OnrampInteractorTest {
         val attestationError = error as AppAttestationException
         assertThat(attestationError.reason).isEqualTo("app_not_play_recognized")
         assertThat(attestationError.mode).isEqualTo("test")
+        assertThat(attestationError.apiErrorType).isNull()
         assertThat(attestationError.message)
             .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
+        assertThat(attestationError.developerMessage).contains("Summary")
+        assertThat(attestationError.developerMessage).contains("Context")
         assertThat(attestationError.developerMessage).contains("operation: has_link_account")
         assertThat(attestationError.developerMessage).contains("request_id: req_456")
+        assertThat(attestationError.developerMessage).doesNotContain("type:")
     }
 
     @Test
@@ -307,11 +318,17 @@ class OnrampInteractorTest {
         assertThat(apiError.reason).isEqualTo("email_blocked")
         assertThat(apiError.userMessage).isEqualTo("This email can't be used. Try another one.")
         assertThat(apiError.message).isEqualTo("This email can't be used. Try another one.")
+        assertThat(apiError.apiErrorType).isNull()
+        assertThat(apiError.developerMessage).contains("Summary")
+        assertThat(apiError.developerMessage).contains("Context")
+        assertThat(apiError.developerMessage).contains("Next step")
+        assertThat(apiError.developerMessage).contains("Docs")
         assertThat(apiError.developerMessage).contains("This email address can't be used.")
         assertThat(apiError.developerMessage).contains("operation: has_link_account")
         assertThat(apiError.developerMessage).contains("request_id: req_789")
         assertThat(apiError.developerMessage).contains("code: email_blocked")
-        assertThat(apiError.developerMessage).contains("Docs: https://stripe.com/docs/error-codes/email_blocked")
+        assertThat(apiError.developerMessage).doesNotContain("type:")
+        assertThat(apiError.developerMessage).contains("https://stripe.com/docs/error-codes/email_blocked")
     }
 
     @Test
@@ -355,9 +372,11 @@ class OnrampInteractorTest {
         val apiError = error as UncategorizedApiErrorException
         assertThat(apiError.userMessage).isEqualTo("Something went wrong. Please try again later.")
         assertThat(apiError.message).isEqualTo("Something went wrong. Please try again later.")
+        assertThat(apiError.apiErrorType).isNull()
         assertThat(apiError.developerMessage).contains("Developer-facing message")
+        assertThat(apiError.developerMessage).contains("Next step")
         assertThat(apiError.developerMessage)
-            .contains("Next step: Inspect the preserved Stripe API error for details and retry after correcting the request.")
+            .contains("Inspect the preserved Stripe API error for details and retry after correcting the request.")
     }
 
     @Test
@@ -404,12 +423,14 @@ class OnrampInteractorTest {
 
         val attestationError = error as AppAttestationException
         assertThat(attestationError.reason).isEqualTo("android_environment_mismatch")
+        assertThat(attestationError.apiErrorType).isNull()
         assertThat(attestationError.userMessage)
             .isEqualTo("This app couldn't be verified due to an attestation error. Please try again later or contact the developer if the issue persists.")
         assertThat(attestationError.message)
             .isEqualTo("This app couldn't be verified due to an attestation error. Please try again later or contact the developer if the issue persists.")
         assertThat(attestationError.developerMessage)
             .contains("the Play Integrity distribution channel does not match this Stripe mode")
+        assertThat(attestationError.developerMessage).doesNotContain("type:")
     }
 
     @Test

From c6c44826a66cd07505e45abe3a8c512ca7ec5f79 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 26 May 2026 15:44:14 -0400
Subject: [PATCH 42/57] Remove rawStripeError and restrict analyticsValue

---
 .../crypto/onramp/exception/CryptoOnrampException.kt      | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index 5014fcd9ebe..00716bbea92 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -1,5 +1,6 @@
 package com.stripe.android.crypto.onramp.exception
 
+import androidx.annotation.RestrictTo
 import com.stripe.android.core.StripeError
 import com.stripe.android.core.exception.StripeException
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
@@ -26,12 +27,7 @@ abstract class CryptoOnrampException internal constructor(
      */
     abstract val userMessage: String
 
-    /**
-     * The original Stripe API error, if one was available.
-     */
-    val rawStripeError: StripeError?
-        get() = stripeError
-
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     override fun analyticsValue(): String {
         return (cause as? StripeException)?.analyticsValue() ?: super.analyticsValue()
     }

From 09431d86751c0b9cf768821b88fefdef9b74c6ff Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 26 May 2026 15:55:27 -0400
Subject: [PATCH 43/57] Fix missing error mapping

---
 crypto-onramp/api/crypto-onramp.api           |   2 -
 .../android/crypto/onramp/OnrampInteractor.kt |  24 +++-
 .../crypto/onramp/OnrampInteractorTest.kt     | 106 ++++++++++++++++++
 3 files changed, 125 insertions(+), 7 deletions(-)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index a5de6c05822..72706cef73e 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -51,9 +51,7 @@ public final class com/stripe/android/crypto/onramp/exception/AppAttestationExce
 
 public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampException : com/stripe/android/core/exception/StripeException {
 	public static final field $stable I
-	public fun analyticsValue ()Ljava/lang/String;
 	public final fun getDeveloperMessage ()Ljava/lang/String;
-	public final fun getRawStripeError ()Lcom/stripe/android/core/StripeError;
 	public abstract fun getUserMessage ()Ljava/lang/String;
 }
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
index bbbcdd81f4c..f1f29dcb222 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
@@ -605,7 +605,12 @@ internal class OnrampInteractor @Inject constructor(
                         kycInfo = null
                 )
             } ?: run {
-                OnrampCollectPaymentMethodResult.Failed(MissingPaymentMethodException())
+                val error = mapError(
+                    operation = Operation.CollectPaymentMethod,
+                    error = MissingPaymentMethodException(),
+                )
+                trackError(Operation.CollectPaymentMethod, error)
+                OnrampCollectPaymentMethodResult.Failed(error)
             }
         }
         is LinkController.PresentPaymentMethodsResult.Failed -> {
@@ -839,7 +844,7 @@ internal class OnrampInteractor @Inject constructor(
             _state.update {
                 it.copy(
                     checkoutState = CheckoutState(
-                        Status.Completed(OnrampCheckoutResult.Failed(PaymentFailedException()))
+                        Status.Completed(createAndTrackPaymentFailedCheckoutResult())
                     )
                 )
             }
@@ -988,15 +993,24 @@ internal class OnrampInteractor @Inject constructor(
                 if (paymentMethod?.type == PaymentMethod.Type.USBankAccount) {
                     OnrampCheckoutResult.Completed()
                 } else {
-                    OnrampCheckoutResult.Failed(PaymentFailedException())
+                    createAndTrackPaymentFailedCheckoutResult()
                 }
             }
-            StripeIntent.Status.RequiresPaymentMethod -> OnrampCheckoutResult.Failed(PaymentFailedException())
+            StripeIntent.Status.RequiresPaymentMethod -> createAndTrackPaymentFailedCheckoutResult()
             StripeIntent.Status.RequiresAction -> null // More handling needed
-            else -> OnrampCheckoutResult.Failed(PaymentFailedException())
+            else -> createAndTrackPaymentFailedCheckoutResult()
         }
     }
 
+    private fun createAndTrackPaymentFailedCheckoutResult(): OnrampCheckoutResult.Failed {
+        val error = mapError(
+            operation = Operation.PerformCheckout,
+            error = PaymentFailedException(),
+        )
+        trackError(Operation.PerformCheckout, error)
+        return OnrampCheckoutResult.Failed(error)
+    }
+
     private fun Status.RequiresNextAction.nextActionLaunchDeduplicationKey(): String {
         return deduplicationKey(
             onrampSessionId,
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index bb9fc9c18cb..219da837ff5 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -13,6 +13,8 @@ import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsService
 import com.stripe.android.crypto.onramp.exception.AppAttestationException
 import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
+import com.stripe.android.crypto.onramp.exception.MissingPaymentMethodException
+import com.stripe.android.crypto.onramp.exception.PaymentFailedException
 import com.stripe.android.crypto.onramp.exception.UncategorizedApiErrorException
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
@@ -730,6 +732,35 @@ class OnrampInteractorTest {
         testAnalyticsService.assertContainsEvent(OnrampAnalyticsEvent.CollectPaymentMethodCompleted(null))
     }
 
+    @Test
+    fun testHandlePresentPaymentMethodsResultMissingSelectedPaymentMethod() {
+        val context = RuntimeEnvironment.getApplication()
+        val mockState = LinkController.State(
+            internalLinkAccount = null,
+            merchantLogoUrl = null,
+            selectedPaymentMethodPreview = null,
+            createdPaymentMethod = null
+        )
+        whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockState))
+
+        interactor.onLinkControllerState(mockLinkStateWithAccount())
+
+        val result = interactor.handlePresentPaymentMethodsResult(
+            LinkController.PresentPaymentMethodsResult.Success,
+            context
+        )
+
+        assertThat(result).isInstanceOf(OnrampCollectPaymentMethodResult.Failed::class.java)
+        val failed = result as OnrampCollectPaymentMethodResult.Failed
+        assertThat(failed.error).isInstanceOf(MissingPaymentMethodException::class.java)
+        testAnalyticsService.assertContainsEvent(
+            OnrampAnalyticsEvent.ErrorOccurred(
+                operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.CollectPaymentMethod,
+                error = failed.error
+            )
+        )
+    }
+
     @Test
     fun testOnAuthorize() {
         interactor.onLinkControllerState(mockLinkStateWithAccount())
@@ -911,6 +942,81 @@ class OnrampInteractorTest {
         )
     }
 
+    @Test
+    fun continueCheckout_withoutPendingSession_returnsFailedAndTracksError() = runTest {
+        interactor.onLinkControllerState(mockLinkStateWithAccount())
+
+        interactor.continueCheckout()
+
+        val checkoutStatus = interactor.state.value.checkoutState?.status
+        assertThat(checkoutStatus).isInstanceOf(CheckoutState.Status.Completed::class.java)
+        val result = (checkoutStatus as CheckoutState.Status.Completed).result
+        assertThat(result).isInstanceOf(OnrampCheckoutResult.Failed::class.java)
+        val error = (result as OnrampCheckoutResult.Failed).error
+        assertThat(error).isInstanceOf(PaymentFailedException::class.java)
+        testAnalyticsService.assertContainsEvent(
+            OnrampAnalyticsEvent.ErrorOccurred(
+                operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.PerformCheckout,
+                error = error
+            )
+        )
+    }
+
+    @Test
+    fun startCheckout_requiresPaymentMethod_returnsFailedAndTracksError() = runTest {
+        interactor.onLinkControllerState(mockLinkStateWithAccount())
+        whenever(linkController.configure(any())).thenReturn(ConfigureResult.Success)
+        interactor.configure(createConfigurationState(cryptoCustomerId = "cpt_123"))
+
+        val mockPlatformSettings = mock<GetPlatformSettingsResponse>()
+        doReturn("pk_platform_123").whenever(mockPlatformSettings).publishableKey
+        whenever(
+            cryptoApiRepository.getPlatformSettings(
+                cryptoCustomerId = eq("cpt_123"),
+                countryHint = anyOrNull()
+            )
+        ).thenReturn(Result.success(mockPlatformSettings))
+        whenever(
+            cryptoApiRepository.getOnrampSession(
+                sessionId = "cos_test_session_id",
+                sessionClientSecret = "test_secret"
+            )
+        ).thenReturn(
+            Result.success(
+                GetOnrampSessionResponse(
+                    id = "cos_test_session_id",
+                    clientSecret = "test_secret",
+                    paymentIntentClientSecret = "pi_test_secret"
+                )
+            )
+        )
+        whenever(
+            cryptoApiRepository.retrievePaymentIntent(
+                clientSecret = "pi_test_secret",
+                publishableKey = "pk_platform_123"
+            )
+        ).thenReturn(
+            Result.success(
+                paymentIntent(status = StripeIntent.Status.RequiresPaymentMethod)
+            )
+        )
+
+        interactor.startCheckout("cos_test_session_id")
+
+        val checkoutStatus = interactor.state.value.checkoutState?.status
+        assertThat(checkoutStatus).isInstanceOf(CheckoutState.Status.Completed::class.java)
+        val result = (checkoutStatus as CheckoutState.Status.Completed).result
+        assertThat(result).isInstanceOf(OnrampCheckoutResult.Failed::class.java)
+        val error = (result as OnrampCheckoutResult.Failed).error
+        assertThat(error).isInstanceOf(PaymentFailedException::class.java)
+        testAnalyticsService.assertContainsEvent(
+            OnrampAnalyticsEvent.ErrorOccurred(
+                operation = OnrampAnalyticsEvent.ErrorOccurred.Operation.PerformCheckout,
+                error = error
+            )
+        )
+    }
+
     @Test
     fun testAttachKycInfoFailsMissingSecret() = runTest {
         whenever(

From 35d8e7383b873da9a43f0e970630f76782c87acf Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 26 May 2026 16:59:58 -0400
Subject: [PATCH 44/57] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0603771ca1d..b73a86a8e1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 NEXT_VERSION_BUMP: PATCH
 ## XX.XX.XX - 20XX-XX-XX
 
+### CryptoOnramp
+* [ADDED] Added `CryptoOnrampException`, `AppAttestationException`, and `UncategorizedApiErrorException` to expose richer developer-facing diagnostics and preserved backend API error context for Crypto Onramp failures.
+* [CHANGED] Improved Crypto Onramp API error handling with localized fallback user messaging and more consistent error mapping across attestation, payment collection, and checkout flows.
+
 ## 23.9.1 - 2026-05-26
 
 ### Payments

From 900e86bff13973930669cc5e6df80652ee3c6989 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 26 May 2026 17:13:04 -0400
Subject: [PATCH 45/57] Break exceptions up

---
 .../exception/AppAttestationException.kt      | 171 ++++++++++++
 .../onramp/exception/CryptoOnrampException.kt | 247 +-----------------
 .../UncategorizedApiErrorException.kt         |  71 +++++
 3 files changed, 248 insertions(+), 241 deletions(-)
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
new file mode 100644
index 00000000000..aa5257b12c5
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
@@ -0,0 +1,171 @@
+package com.stripe.android.crypto.onramp.exception
+
+import com.stripe.android.core.exception.StripeException
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * Indicates that Crypto Onramp could not verify the Android app attestation data.
+ */
+@ExperimentalCryptoOnramp
+class AppAttestationException internal constructor(
+    /**
+     * The raw backend reason, when present.
+     */
+    val reason: String?,
+    /**
+     * The Crypto Onramp operation that failed.
+     */
+    val operation: String,
+    /**
+     * The Android application package name used for the request.
+     */
+    val appPackageName: String,
+    /**
+     * The Stripe mode inferred from the publishable key, when available.
+     */
+    val mode: String?,
+    /**
+     * The SDK version that produced the request.
+     */
+    val sdkVersion: String,
+    /**
+     * The raw backend error code, when present.
+     */
+    val apiErrorCode: String?,
+    /**
+     * The raw backend error type, when present.
+     */
+    val apiErrorType: String?,
+    /**
+     * The raw backend developer-facing message, when present.
+     */
+    val apiErrorMessage: String?,
+    /**
+     * The raw backend end-user-facing message, when present.
+     */
+    val apiUserMessage: String?,
+    /**
+     * A documentation URL for recovery guidance, when available.
+     */
+    val docUrl: String?,
+    fallbackUserMessage: Lazy<String>,
+    cause: Throwable,
+) : CryptoOnrampException(
+    message = apiUserMessage ?: fallbackUserMessage.value,
+    developerMessage = buildAppAttestationDeveloperMessage(
+        operation = operation,
+        appPackageName = appPackageName,
+        mode = mode,
+        sdkVersion = sdkVersion,
+        reason = reason,
+        requestId = (cause as? StripeException)?.requestId,
+        apiErrorCode = apiErrorCode,
+        apiErrorType = apiErrorType,
+        apiErrorMessage = apiErrorMessage,
+        docUrl = docUrl,
+    ),
+    cause = cause,
+) {
+    override val userMessage: String = apiUserMessage ?: fallbackUserMessage.value
+}
+
+private const val ATTESTATION_NOT_ENABLED_REASON = "attestation_not_enabled"
+private const val APP_NOT_REGISTERED_REASON = "app_not_registered"
+private const val ATTESTATION_DATA_MISSING_REASON = "attestation_data_missing"
+private const val APP_NOT_PLAY_RECOGNIZED_REASON = "app_not_play_recognized"
+private const val ANDROID_PACKAGE_NAME_MISMATCH_REASON = "android_package_name_mismatch"
+private const val ANDROID_ENVIRONMENT_MISMATCH_REASON = "android_environment_mismatch"
+private const val ANDROID_VERDICT_VALIDATION_FAILED_REASON = "android_verdict_validation_failed"
+
+private const val ATTESTATION_NOT_ENABLED_DESCRIPTION =
+    "app attestation is not enabled for this Stripe account"
+private const val APP_NOT_REGISTERED_DESCRIPTION =
+    "this app is not registered as a trusted application"
+private const val ATTESTATION_DATA_MISSING_DESCRIPTION =
+    "attestation data is missing or incomplete"
+private const val APP_NOT_PLAY_RECOGNIZED_DESCRIPTION =
+    "this app is not recognized by Google Play"
+private const val ANDROID_PACKAGE_NAME_MISMATCH_DESCRIPTION =
+    "the app package name does not match the package name registered for this Stripe account"
+private const val ANDROID_ENVIRONMENT_MISMATCH_DESCRIPTION =
+    "the Play Integrity distribution channel does not match this Stripe mode"
+private const val ANDROID_VERDICT_VALIDATION_FAILED_DESCRIPTION =
+    "the Play Integrity verdict could not be validated"
+
+private const val ATTESTATION_NOT_ENABLED_NEXT_STEP =
+    "Contact Stripe to enable app attestation for this account and mode, then retry the Onramp flow."
+private const val APP_NOT_REGISTERED_NEXT_STEP =
+    "Register this app's package name as a trusted application with Stripe, then retry the Onramp flow."
+private const val ATTESTATION_DATA_MISSING_NEXT_STEP =
+    "Make sure all required Play Integrity fields are sent with the request, then retry the Onramp flow."
+private const val APP_NOT_PLAY_RECOGNIZED_NEXT_STEP =
+    "Install the app from a Google Play testing or production track and retry the Onramp flow. Internal, closed, open testing, and production tracks are supported. Debug builds and sideloaded APKs will not pass this check."
+private const val ANDROID_PACKAGE_NAME_MISMATCH_NEXT_STEP =
+    "Use the package name registered for this Stripe account, then retry the Onramp flow."
+private const val ANDROID_ENVIRONMENT_MISMATCH_NEXT_STEP =
+    "Install the app from the Google Play track that matches this Stripe mode, then retry the Onramp flow."
+private const val ANDROID_VERDICT_VALIDATION_FAILED_NEXT_STEP =
+    "Generate a new Play Integrity verdict and retry the Onramp flow. If the issue persists, check your app attestation configuration."
+
+private fun appAttestationSummary(reason: String?): String? {
+    return appAttestationDescription(reason)?.let(::attestationSummary)
+}
+
+private fun appAttestationDescription(reason: String?): String? {
+    return when (reason) {
+        ATTESTATION_NOT_ENABLED_REASON -> ATTESTATION_NOT_ENABLED_DESCRIPTION
+        APP_NOT_REGISTERED_REASON -> APP_NOT_REGISTERED_DESCRIPTION
+        ATTESTATION_DATA_MISSING_REASON -> ATTESTATION_DATA_MISSING_DESCRIPTION
+        APP_NOT_PLAY_RECOGNIZED_REASON -> APP_NOT_PLAY_RECOGNIZED_DESCRIPTION
+        ANDROID_PACKAGE_NAME_MISMATCH_REASON -> ANDROID_PACKAGE_NAME_MISMATCH_DESCRIPTION
+        ANDROID_ENVIRONMENT_MISMATCH_REASON -> ANDROID_ENVIRONMENT_MISMATCH_DESCRIPTION
+        ANDROID_VERDICT_VALIDATION_FAILED_REASON -> ANDROID_VERDICT_VALIDATION_FAILED_DESCRIPTION
+        else -> null
+    }
+}
+
+private fun appAttestationNextStep(reason: String?): String? {
+    return when (reason) {
+        ATTESTATION_NOT_ENABLED_REASON -> ATTESTATION_NOT_ENABLED_NEXT_STEP
+        APP_NOT_REGISTERED_REASON -> APP_NOT_REGISTERED_NEXT_STEP
+        ATTESTATION_DATA_MISSING_REASON -> ATTESTATION_DATA_MISSING_NEXT_STEP
+        APP_NOT_PLAY_RECOGNIZED_REASON -> APP_NOT_PLAY_RECOGNIZED_NEXT_STEP
+        ANDROID_PACKAGE_NAME_MISMATCH_REASON -> ANDROID_PACKAGE_NAME_MISMATCH_NEXT_STEP
+        ANDROID_ENVIRONMENT_MISMATCH_REASON -> ANDROID_ENVIRONMENT_MISMATCH_NEXT_STEP
+        ANDROID_VERDICT_VALIDATION_FAILED_REASON -> ANDROID_VERDICT_VALIDATION_FAILED_NEXT_STEP
+        else -> null
+    }
+}
+
+private fun attestationSummary(description: String): String {
+    return "App attestation failed: $description."
+}
+
+private fun buildAppAttestationDeveloperMessage(
+    operation: String,
+    appPackageName: String,
+    mode: String?,
+    sdkVersion: String,
+    reason: String?,
+    requestId: String?,
+    apiErrorCode: String?,
+    apiErrorType: String?,
+    apiErrorMessage: String?,
+    docUrl: String?,
+): String {
+    return buildDeveloperMessage(
+        summary = appAttestationSummary(reason) ?: (apiErrorMessage ?: "App attestation failed."),
+        operation = operation,
+        appPackageName = appPackageName,
+        mode = mode,
+        reason = reason,
+        requestId = requestId,
+        apiErrorCode = apiErrorCode,
+        apiErrorType = apiErrorType,
+        nextStep = appAttestationNextStep(reason)
+            ?: (apiErrorMessage
+                ?: "Inspect the preserved Stripe API error for details and retry after correcting the app attestation configuration."),
+        docUrl = docUrl,
+        sdkVersion = sdkVersion,
+    )
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index 00716bbea92..638fd9dfa45 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -1,7 +1,6 @@
 package com.stripe.android.crypto.onramp.exception
 
 import androidx.annotation.RestrictTo
-import com.stripe.android.core.StripeError
 import com.stripe.android.core.exception.StripeException
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 
@@ -33,241 +32,7 @@ abstract class CryptoOnrampException internal constructor(
     }
 }
 
-/**
- * Indicates that Crypto Onramp could not verify the Android app attestation data.
- */
-@ExperimentalCryptoOnramp
-class AppAttestationException internal constructor(
-    /**
-     * The raw backend reason, when present.
-     */
-    val reason: String?,
-    /**
-     * The Crypto Onramp operation that failed.
-     */
-    val operation: String,
-    /**
-     * The Android application package name used for the request.
-     */
-    val appPackageName: String,
-    /**
-     * The Stripe mode inferred from the publishable key, when available.
-     */
-    val mode: String?,
-    /**
-     * The SDK version that produced the request.
-     */
-    val sdkVersion: String,
-    /**
-     * The raw backend error code, when present.
-     */
-    val apiErrorCode: String?,
-    /**
-     * The raw backend error type, when present.
-     */
-    val apiErrorType: String?,
-    /**
-     * The raw backend developer-facing message, when present.
-     */
-    val apiErrorMessage: String?,
-    /**
-     * The raw backend end-user-facing message, when present.
-     */
-    val apiUserMessage: String?,
-    /**
-     * A documentation URL for recovery guidance, when available.
-     */
-    val docUrl: String?,
-    fallbackUserMessage: Lazy<String>,
-    cause: Throwable,
-) : CryptoOnrampException(
-    message = apiUserMessage ?: fallbackUserMessage.value,
-    developerMessage = buildAppAttestationDeveloperMessage(
-        operation = operation,
-        appPackageName = appPackageName,
-        mode = mode,
-        sdkVersion = sdkVersion,
-        reason = reason,
-        requestId = (cause as? StripeException)?.requestId,
-        apiErrorCode = apiErrorCode,
-        apiErrorType = apiErrorType,
-        apiErrorMessage = apiErrorMessage,
-        docUrl = docUrl,
-    ),
-    cause = cause,
-) {
-    override val userMessage: String = apiUserMessage ?: fallbackUserMessage.value
-}
-
-/**
- * Indicates that a Stripe API request failed without a more specific Crypto Onramp category.
- */
-@ExperimentalCryptoOnramp
-class UncategorizedApiErrorException internal constructor(
-    /**
-     * The raw backend reason, when present.
-     */
-    val reason: String?,
-    /**
-     * The Crypto Onramp operation that failed.
-     */
-    val operation: String,
-    /**
-     * The Android application package name used for the request.
-     */
-    val appPackageName: String,
-    /**
-     * The Stripe mode inferred from the publishable key, when available.
-     */
-    val mode: String?,
-    /**
-     * The SDK version that produced the request.
-     */
-    val sdkVersion: String,
-    /**
-     * The raw backend error code, when present.
-     */
-    val apiErrorCode: String?,
-    /**
-     * The raw backend error type, when present.
-     */
-    val apiErrorType: String?,
-    /**
-     * The raw backend developer-facing message, when present.
-     */
-    val apiErrorMessage: String?,
-    /**
-     * The raw backend end-user-facing message, when present.
-     */
-    val apiUserMessage: String?,
-    /**
-     * A documentation URL for recovery guidance, when available.
-     */
-    val docUrl: String?,
-    fallbackUserMessage: Lazy<String>,
-    cause: Throwable,
-) : CryptoOnrampException(
-    message = apiUserMessage ?: fallbackUserMessage.value,
-    developerMessage = buildGenericDeveloperMessage(
-        operation = operation,
-        appPackageName = appPackageName,
-        mode = mode,
-        sdkVersion = sdkVersion,
-        reason = reason,
-        requestId = (cause as? StripeException)?.requestId,
-        apiErrorCode = apiErrorCode,
-        apiErrorType = apiErrorType,
-        apiErrorMessage = apiErrorMessage,
-        apiUserMessage = apiUserMessage,
-        docUrl = docUrl,
-    ),
-    cause = cause,
-) {
-    override val userMessage: String = apiUserMessage ?: fallbackUserMessage.value
-}
-
-private const val ATTESTATION_NOT_ENABLED_REASON = "attestation_not_enabled"
-private const val APP_NOT_REGISTERED_REASON = "app_not_registered"
-private const val ATTESTATION_DATA_MISSING_REASON = "attestation_data_missing"
-private const val APP_NOT_PLAY_RECOGNIZED_REASON = "app_not_play_recognized"
-private const val ANDROID_PACKAGE_NAME_MISMATCH_REASON = "android_package_name_mismatch"
-private const val ANDROID_ENVIRONMENT_MISMATCH_REASON = "android_environment_mismatch"
-private const val ANDROID_VERDICT_VALIDATION_FAILED_REASON = "android_verdict_validation_failed"
-
-private const val ATTESTATION_NOT_ENABLED_DESCRIPTION =
-    "app attestation is not enabled for this Stripe account"
-private const val APP_NOT_REGISTERED_DESCRIPTION =
-    "this app is not registered as a trusted application"
-private const val ATTESTATION_DATA_MISSING_DESCRIPTION =
-    "attestation data is missing or incomplete"
-private const val APP_NOT_PLAY_RECOGNIZED_DESCRIPTION =
-    "this app is not recognized by Google Play"
-private const val ANDROID_PACKAGE_NAME_MISMATCH_DESCRIPTION =
-    "the app package name does not match the package name registered for this Stripe account"
-private const val ANDROID_ENVIRONMENT_MISMATCH_DESCRIPTION =
-    "the Play Integrity distribution channel does not match this Stripe mode"
-private const val ANDROID_VERDICT_VALIDATION_FAILED_DESCRIPTION =
-    "the Play Integrity verdict could not be validated"
-
-private const val ATTESTATION_NOT_ENABLED_NEXT_STEP =
-    "Contact Stripe to enable app attestation for this account and mode, then retry the Onramp flow."
-private const val APP_NOT_REGISTERED_NEXT_STEP =
-    "Register this app's package name as a trusted application with Stripe, then retry the Onramp flow."
-private const val ATTESTATION_DATA_MISSING_NEXT_STEP =
-    "Make sure all required Play Integrity fields are sent with the request, then retry the Onramp flow."
-private const val APP_NOT_PLAY_RECOGNIZED_NEXT_STEP =
-    "Install the app from a Google Play testing or production track and retry the Onramp flow. Internal, closed, open testing, and production tracks are supported. Debug builds and sideloaded APKs will not pass this check."
-private const val ANDROID_PACKAGE_NAME_MISMATCH_NEXT_STEP =
-    "Use the package name registered for this Stripe account, then retry the Onramp flow."
-private const val ANDROID_ENVIRONMENT_MISMATCH_NEXT_STEP =
-    "Install the app from the Google Play track that matches this Stripe mode, then retry the Onramp flow."
-private const val ANDROID_VERDICT_VALIDATION_FAILED_NEXT_STEP =
-    "Generate a new Play Integrity verdict and retry the Onramp flow. If the issue persists, check your app attestation configuration."
-
-private fun appAttestationSummary(reason: String?): String? {
-    return appAttestationDescription(reason)?.let(::attestationSummary)
-}
-
-private fun appAttestationDescription(reason: String?): String? {
-    return when (reason) {
-        ATTESTATION_NOT_ENABLED_REASON -> ATTESTATION_NOT_ENABLED_DESCRIPTION
-        APP_NOT_REGISTERED_REASON -> APP_NOT_REGISTERED_DESCRIPTION
-        ATTESTATION_DATA_MISSING_REASON -> ATTESTATION_DATA_MISSING_DESCRIPTION
-        APP_NOT_PLAY_RECOGNIZED_REASON -> APP_NOT_PLAY_RECOGNIZED_DESCRIPTION
-        ANDROID_PACKAGE_NAME_MISMATCH_REASON -> ANDROID_PACKAGE_NAME_MISMATCH_DESCRIPTION
-        ANDROID_ENVIRONMENT_MISMATCH_REASON -> ANDROID_ENVIRONMENT_MISMATCH_DESCRIPTION
-        ANDROID_VERDICT_VALIDATION_FAILED_REASON -> ANDROID_VERDICT_VALIDATION_FAILED_DESCRIPTION
-        else -> null
-    }
-}
-
-private fun appAttestationNextStep(reason: String?): String? {
-    return when (reason) {
-        ATTESTATION_NOT_ENABLED_REASON -> ATTESTATION_NOT_ENABLED_NEXT_STEP
-        APP_NOT_REGISTERED_REASON -> APP_NOT_REGISTERED_NEXT_STEP
-        ATTESTATION_DATA_MISSING_REASON -> ATTESTATION_DATA_MISSING_NEXT_STEP
-        APP_NOT_PLAY_RECOGNIZED_REASON -> APP_NOT_PLAY_RECOGNIZED_NEXT_STEP
-        ANDROID_PACKAGE_NAME_MISMATCH_REASON -> ANDROID_PACKAGE_NAME_MISMATCH_NEXT_STEP
-        ANDROID_ENVIRONMENT_MISMATCH_REASON -> ANDROID_ENVIRONMENT_MISMATCH_NEXT_STEP
-        ANDROID_VERDICT_VALIDATION_FAILED_REASON -> ANDROID_VERDICT_VALIDATION_FAILED_NEXT_STEP
-        else -> null
-    }
-}
-
-private fun attestationSummary(description: String): String {
-    return "App attestation failed: $description."
-}
-
-private fun buildAppAttestationDeveloperMessage(
-    operation: String,
-    appPackageName: String,
-    mode: String?,
-    sdkVersion: String,
-    reason: String?,
-    requestId: String?,
-    apiErrorCode: String?,
-    apiErrorType: String?,
-    apiErrorMessage: String?,
-    docUrl: String?,
-): String {
-    return buildDeveloperMessage(
-        summary = appAttestationSummary(reason) ?: (apiErrorMessage ?: "App attestation failed."),
-        operation = operation,
-        appPackageName = appPackageName,
-        mode = mode,
-        reason = reason,
-        requestId = requestId,
-        apiErrorCode = apiErrorCode,
-        apiErrorType = apiErrorType,
-        nextStep = appAttestationNextStep(reason)
-            ?: (apiErrorMessage
-                ?: "Inspect the preserved Stripe API error for details and retry after correcting the app attestation configuration."),
-        docUrl = docUrl,
-        sdkVersion = sdkVersion,
-    )
-}
-
-private fun buildGenericDeveloperMessage(
+internal fun buildGenericDeveloperMessage(
     operation: String,
     appPackageName: String,
     mode: String?,
@@ -297,11 +62,7 @@ private fun buildGenericDeveloperMessage(
     )
 }
 
-private fun String?.orFallbackTo(fallback: String): String {
-    return this?.takeIf { it.isNotBlank() } ?: fallback
-}
-
-private fun buildDeveloperMessage(
+internal fun buildDeveloperMessage(
     summary: String,
     operation: String,
     appPackageName: String,
@@ -343,3 +104,7 @@ private fun buildDeveloperMessage(
         add("  stripe-android@$sdkVersion")
     }.joinToString(separator = "\n")
 }
+
+private fun String?.orFallbackTo(fallback: String): String {
+    return this?.takeIf { it.isNotBlank() } ?: fallback
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
new file mode 100644
index 00000000000..e1be004ba4e
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
@@ -0,0 +1,71 @@
+package com.stripe.android.crypto.onramp.exception
+
+import com.stripe.android.core.exception.StripeException
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * Indicates that a Stripe API request failed without a more specific Crypto Onramp category.
+ */
+@ExperimentalCryptoOnramp
+class UncategorizedApiErrorException internal constructor(
+    /**
+     * The raw backend reason, when present.
+     */
+    val reason: String?,
+    /**
+     * The Crypto Onramp operation that failed.
+     */
+    val operation: String,
+    /**
+     * The Android application package name used for the request.
+     */
+    val appPackageName: String,
+    /**
+     * The Stripe mode inferred from the publishable key, when available.
+     */
+    val mode: String?,
+    /**
+     * The SDK version that produced the request.
+     */
+    val sdkVersion: String,
+    /**
+     * The raw backend error code, when present.
+     */
+    val apiErrorCode: String?,
+    /**
+     * The raw backend error type, when present.
+     */
+    val apiErrorType: String?,
+    /**
+     * The raw backend developer-facing message, when present.
+     */
+    val apiErrorMessage: String?,
+    /**
+     * The raw backend end-user-facing message, when present.
+     */
+    val apiUserMessage: String?,
+    /**
+     * A documentation URL for recovery guidance, when available.
+     */
+    val docUrl: String?,
+    fallbackUserMessage: Lazy<String>,
+    cause: Throwable,
+) : CryptoOnrampException(
+    message = apiUserMessage ?: fallbackUserMessage.value,
+    developerMessage = buildGenericDeveloperMessage(
+        operation = operation,
+        appPackageName = appPackageName,
+        mode = mode,
+        sdkVersion = sdkVersion,
+        reason = reason,
+        requestId = (cause as? StripeException)?.requestId,
+        apiErrorCode = apiErrorCode,
+        apiErrorType = apiErrorType,
+        apiErrorMessage = apiErrorMessage,
+        apiUserMessage = apiUserMessage,
+        docUrl = docUrl,
+    ),
+    cause = cause,
+) {
+    override val userMessage: String = apiUserMessage ?: fallbackUserMessage.value
+}

From 7b9a1eba2e3cf46702732231f1d1fe6c30d44e63 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 26 May 2026 17:13:45 -0400
Subject: [PATCH 46/57] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b73a86a8e1a..cb7b7466afe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,8 @@ NEXT_VERSION_BUMP: PATCH
 ## XX.XX.XX - 20XX-XX-XX
 
 ### CryptoOnramp
-* [ADDED] Added `CryptoOnrampException`, `AppAttestationException`, and `UncategorizedApiErrorException` to expose richer developer-facing diagnostics and preserved backend API error context for Crypto Onramp failures.
-* [CHANGED] Improved Crypto Onramp API error handling with localized fallback user messaging and more consistent error mapping across attestation, payment collection, and checkout flows.
+* [ADDED][13156](https://github.com/stripe/stripe-android/pull/13156) Added `CryptoOnrampException`, `AppAttestationException`, and `UncategorizedApiErrorException` to expose richer developer-facing diagnostics and preserved backend API error context for Crypto Onramp failures.
+* [CHANGED][13156](https://github.com/stripe/stripe-android/pull/13156) Improved Crypto Onramp API error handling with localized fallback user messaging and more consistent error mapping across attestation, payment collection, and checkout flows.
 
 ## 23.9.1 - 2026-05-26
 

From d0d35368c11b400406dbb3b2c13cf301dd184a59 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Wed, 27 May 2026 11:48:46 -0400
Subject: [PATCH 47/57] Fix linting errors

---
 .../android/crypto/onramp/OnrampInteractor.kt      |  2 +-
 .../onramp/exception/AppAttestationException.kt    |  7 +++++--
 .../onramp/repositories/CryptoApiRepository.kt     |  4 +++-
 .../android/crypto/onramp/OnrampInteractorTest.kt  | 14 +++++++++++---
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
index f1f29dcb222..c5e9c41ae4a 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
@@ -9,8 +9,8 @@ import com.stripe.android.R
 import com.stripe.android.core.utils.flatMapCatching
 import com.stripe.android.crypto.onramp.CheckoutState.Status
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent
-import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsService
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent.ErrorOccurred.Operation
+import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsService
 import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.exception.MissingPaymentMethodException
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
index aa5257b12c5..5efaf34a233 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
@@ -163,8 +163,11 @@ private fun buildAppAttestationDeveloperMessage(
         apiErrorCode = apiErrorCode,
         apiErrorType = apiErrorType,
         nextStep = appAttestationNextStep(reason)
-            ?: (apiErrorMessage
-                ?: "Inspect the preserved Stripe API error for details and retry after correcting the app attestation configuration."),
+            ?: (
+                apiErrorMessage
+                ?: "Inspect the preserved Stripe API error for details and retry after " +
+                    "correcting the app attestation configuration."
+            ),
         docUrl = docUrl,
         sdkVersion = sdkVersion,
     )
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
index 2d0360ac604..b93bbe03d11 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/repositories/CryptoApiRepository.kt
@@ -408,7 +408,9 @@ internal class CryptoApiRepository @Inject constructor(
             stripeError = stripeError,
             requestId = response.requestId?.value,
             statusCode = response.code,
-            message = stripeError?.message ?: "Request failed with status code ${response.code} and non-JSON error body."
+            message = stripeError?.message
+                ?: "Request failed with status code ${response.code} and non-JSON error " +
+                    "body."
         )
     }
 
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 219da837ff5..7dd862d478f 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -203,7 +203,9 @@ class OnrampInteractorTest {
                         message = "App attestation failed",
                         extraFields = mapOf(
                             "reason" to "app_not_play_recognized",
-                            "user_message" to "This app couldn't be verified. Install it from Google Play and try again."
+                            "user_message" to
+                                "This app couldn't be verified. Install it from Google Play " +
+                                "and try again."
                         )
                     ),
                     requestId = "req_123",
@@ -429,9 +431,15 @@ class OnrampInteractorTest {
         assertThat(attestationError.reason).isEqualTo("android_environment_mismatch")
         assertThat(attestationError.apiErrorType).isNull()
         assertThat(attestationError.userMessage)
-            .isEqualTo("This app couldn't be verified due to an attestation error. Please try again later or contact the developer if the issue persists.")
+            .isEqualTo(
+                "This app couldn't be verified due to an attestation error. Please try " +
+                    "again later or contact the developer if the issue persists."
+            )
         assertThat(attestationError.message)
-            .isEqualTo("This app couldn't be verified due to an attestation error. Please try again later or contact the developer if the issue persists.")
+            .isEqualTo(
+                "This app couldn't be verified due to an attestation error. Please try " +
+                    "again later or contact the developer if the issue persists."
+            )
         assertThat(attestationError.developerMessage)
             .contains("the Play Integrity distribution channel does not match this Stripe mode")
         assertThat(attestationError.developerMessage).doesNotContain("type:")

From 483d8c5a1892f5d68fd081abdb3cb1fd4ed0bfb6 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Wed, 27 May 2026 16:08:03 -0400
Subject: [PATCH 48/57] Switch to an APIErrorContext to match iOS better and
 reduce duplication

---
 crypto-onramp/api/crypto-onramp.api           |  40 +++--
 .../exception/AppAttestationException.kt      |  91 ++--------
 .../onramp/exception/CryptoOnrampException.kt | 157 ++++++++++--------
 .../onramp/exception/OnrampErrorMapper.kt     |  40 ++---
 .../UncategorizedApiErrorException.kt         |  63 +------
 .../crypto/onramp/OnrampInteractorTest.kt     |  22 +--
 6 files changed, 161 insertions(+), 252 deletions(-)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 72706cef73e..68be5a0b24c 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -34,8 +34,24 @@ public final class com/stripe/android/crypto/onramp/OnrampCoordinator$Presenter
 	public static synthetic fun verifyKycInfo$default (Lcom/stripe/android/crypto/onramp/OnrampCoordinator$Presenter;Lcom/stripe/android/paymentsheet/PaymentSheet$Address;ILjava/lang/Object;)V
 }
 
-public final class com/stripe/android/crypto/onramp/exception/AppAttestationException : com/stripe/android/crypto/onramp/exception/CryptoOnrampException {
-	public static final field $stable I
+public final class com/stripe/android/crypto/onramp/exception/APIErrorContext {
+	public static final field $stable I
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/core/exception/StripeException;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component10 ()Ljava/lang/String;
+	public final fun component11 ()Lcom/stripe/android/core/exception/StripeException;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun component3 ()Ljava/lang/String;
+	public final fun component4 ()Ljava/lang/String;
+	public final fun component5 ()Ljava/lang/String;
+	public final fun component6 ()Ljava/lang/String;
+	public final fun component7 ()Ljava/lang/String;
+	public final fun component8 ()Ljava/lang/String;
+	public final fun component9 ()Ljava/lang/String;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/core/exception/StripeException;)Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
+	public static synthetic fun copy$default (Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/core/exception/StripeException;ILjava/lang/Object;)Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
+	public final fun developerMessage (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
+	public fun equals (Ljava/lang/Object;)Z
 	public final fun getApiErrorCode ()Ljava/lang/String;
 	public final fun getApiErrorMessage ()Ljava/lang/String;
 	public final fun getApiErrorType ()Ljava/lang/String;
@@ -45,7 +61,16 @@ public final class com/stripe/android/crypto/onramp/exception/AppAttestationExce
 	public final fun getMode ()Ljava/lang/String;
 	public final fun getOperation ()Ljava/lang/String;
 	public final fun getReason ()Ljava/lang/String;
+	public final fun getRequestId ()Ljava/lang/String;
 	public final fun getSdkVersion ()Ljava/lang/String;
+	public final fun getUnderlyingError ()Lcom/stripe/android/core/exception/StripeException;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
+public final class com/stripe/android/crypto/onramp/exception/AppAttestationException : com/stripe/android/crypto/onramp/exception/CryptoOnrampException {
+	public static final field $stable I
+	public final fun getContext ()Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
 	public fun getUserMessage ()Ljava/lang/String;
 }
 
@@ -78,16 +103,7 @@ public final class com/stripe/android/crypto/onramp/exception/PaymentFailedExcep
 
 public final class com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException : com/stripe/android/crypto/onramp/exception/CryptoOnrampException {
 	public static final field $stable I
-	public final fun getApiErrorCode ()Ljava/lang/String;
-	public final fun getApiErrorMessage ()Ljava/lang/String;
-	public final fun getApiErrorType ()Ljava/lang/String;
-	public final fun getApiUserMessage ()Ljava/lang/String;
-	public final fun getAppPackageName ()Ljava/lang/String;
-	public final fun getDocUrl ()Ljava/lang/String;
-	public final fun getMode ()Ljava/lang/String;
-	public final fun getOperation ()Ljava/lang/String;
-	public final fun getReason ()Ljava/lang/String;
-	public final fun getSdkVersion ()Ljava/lang/String;
+	public final fun getContext ()Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
 	public fun getUserMessage ()Ljava/lang/String;
 }
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
index 5efaf34a233..8bea241a8be 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
@@ -1,6 +1,5 @@
 package com.stripe.android.crypto.onramp.exception
 
-import com.stripe.android.core.exception.StripeException
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 
 /**
@@ -8,65 +7,14 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
  */
 @ExperimentalCryptoOnramp
 class AppAttestationException internal constructor(
-    /**
-     * The raw backend reason, when present.
-     */
-    val reason: String?,
-    /**
-     * The Crypto Onramp operation that failed.
-     */
-    val operation: String,
-    /**
-     * The Android application package name used for the request.
-     */
-    val appPackageName: String,
-    /**
-     * The Stripe mode inferred from the publishable key, when available.
-     */
-    val mode: String?,
-    /**
-     * The SDK version that produced the request.
-     */
-    val sdkVersion: String,
-    /**
-     * The raw backend error code, when present.
-     */
-    val apiErrorCode: String?,
-    /**
-     * The raw backend error type, when present.
-     */
-    val apiErrorType: String?,
-    /**
-     * The raw backend developer-facing message, when present.
-     */
-    val apiErrorMessage: String?,
-    /**
-     * The raw backend end-user-facing message, when present.
-     */
-    val apiUserMessage: String?,
-    /**
-     * A documentation URL for recovery guidance, when available.
-     */
-    val docUrl: String?,
+    val context: APIErrorContext,
     fallbackUserMessage: Lazy<String>,
-    cause: Throwable,
 ) : CryptoOnrampException(
-    message = apiUserMessage ?: fallbackUserMessage.value,
-    developerMessage = buildAppAttestationDeveloperMessage(
-        operation = operation,
-        appPackageName = appPackageName,
-        mode = mode,
-        sdkVersion = sdkVersion,
-        reason = reason,
-        requestId = (cause as? StripeException)?.requestId,
-        apiErrorCode = apiErrorCode,
-        apiErrorType = apiErrorType,
-        apiErrorMessage = apiErrorMessage,
-        docUrl = docUrl,
-    ),
-    cause = cause,
+    message = context.apiUserMessage ?: fallbackUserMessage.value,
+    developerMessage = buildAppAttestationDeveloperMessage(context),
+    cause = context.underlyingError,
 ) {
-    override val userMessage: String = apiUserMessage ?: fallbackUserMessage.value
+    override val userMessage: String = context.apiUserMessage ?: fallbackUserMessage.value
 }
 
 private const val ATTESTATION_NOT_ENABLED_REASON = "attestation_not_enabled"
@@ -142,33 +90,16 @@ private fun attestationSummary(description: String): String {
 }
 
 private fun buildAppAttestationDeveloperMessage(
-    operation: String,
-    appPackageName: String,
-    mode: String?,
-    sdkVersion: String,
-    reason: String?,
-    requestId: String?,
-    apiErrorCode: String?,
-    apiErrorType: String?,
-    apiErrorMessage: String?,
-    docUrl: String?,
+    context: APIErrorContext,
 ): String {
-    return buildDeveloperMessage(
-        summary = appAttestationSummary(reason) ?: (apiErrorMessage ?: "App attestation failed."),
-        operation = operation,
-        appPackageName = appPackageName,
-        mode = mode,
-        reason = reason,
-        requestId = requestId,
-        apiErrorCode = apiErrorCode,
-        apiErrorType = apiErrorType,
-        nextStep = appAttestationNextStep(reason)
+    return context.developerMessage(
+        summary = appAttestationSummary(context.reason)
+            ?: (context.apiErrorMessage ?: "App attestation failed."),
+        nextStep = appAttestationNextStep(context.reason)
             ?: (
-                apiErrorMessage
+                context.apiErrorMessage
                 ?: "Inspect the preserved Stripe API error for details and retry after " +
                     "correcting the app attestation configuration."
             ),
-        docUrl = docUrl,
-        sdkVersion = sdkVersion,
     )
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index 638fd9dfa45..af846607648 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -32,79 +32,104 @@ abstract class CryptoOnrampException internal constructor(
     }
 }
 
+data class APIErrorContext(
+    /**
+     * The raw backend reason, when present.
+     */
+    val reason: String?,
+    /**
+     * The Crypto Onramp operation that failed.
+     */
+    val operation: String,
+    /**
+     * The Android application package name used for the request.
+     */
+    val appPackageName: String,
+    /**
+     * The Stripe mode inferred from the publishable key, when available.
+     */
+    val mode: String?,
+    /**
+     * The SDK version that produced the request.
+     */
+    val sdkVersion: String,
+    /**
+     * The raw backend error code, when present.
+     */
+    val apiErrorCode: String?,
+    /**
+     * The raw backend error type, when present.
+     */
+    val apiErrorType: String?,
+    /**
+     * The raw backend developer-facing message, when present.
+     */
+    val apiErrorMessage: String?,
+    /**
+     * The raw backend end-user-facing message, when present.
+     */
+    val apiUserMessage: String?,
+    /**
+     * A documentation URL for recovery guidance, when available.
+     */
+    val docUrl: String?,
+    /**
+     * The original Stripe exception that was mapped into this context.
+     */
+    val underlyingError: StripeException,
+) {
+    /**
+     * The Stripe API request ID associated with this error, when available.
+     */
+    val requestId: String?
+        get() = underlyingError.requestId
+
+    fun developerMessage(
+        summary: String,
+        nextStep: String,
+    ): String {
+        val context = listOfNotNull(
+            "  - operation: $operation",
+            "  - app_id: $appPackageName",
+            mode?.let { "  - mode: $it" },
+            reason?.let { "  - reason: $it" },
+            requestId?.let { "  - request_id: $it" },
+            apiErrorCode?.let { "  - code: $it" },
+            apiErrorType?.let { "  - type: $it" },
+        )
+
+        return buildList {
+            add("Summary")
+            add("  $summary")
+            add("")
+            add("Context")
+            addAll(context)
+            add("")
+            add("Next step")
+            add("  $nextStep")
+            docUrl?.let {
+                add("")
+                add("Docs")
+                add("  $it")
+            }
+            add("")
+            add("SDK")
+            add("  stripe-android@$sdkVersion")
+        }.joinToString(separator = "\n")
+    }
+}
+
 internal fun buildGenericDeveloperMessage(
-    operation: String,
-    appPackageName: String,
-    mode: String?,
-    sdkVersion: String,
-    reason: String?,
-    requestId: String?,
-    apiErrorCode: String?,
-    apiErrorType: String?,
-    apiErrorMessage: String?,
-    apiUserMessage: String?,
-    docUrl: String?,
+    context: APIErrorContext,
 ): String {
-    return buildDeveloperMessage(
-        summary = apiErrorMessage ?: "Stripe API request failed.",
-        operation = operation,
-        appPackageName = appPackageName,
-        mode = mode,
-        reason = reason,
-        requestId = requestId,
-        apiErrorCode = apiErrorCode,
-        apiErrorType = apiErrorType,
-        nextStep = apiUserMessage.orFallbackTo(
+    return context.developerMessage(
+        summary = context.apiErrorMessage ?: "Stripe API request failed.",
+        nextStep = context.apiUserMessage.orFallbackTo(
             "Inspect the preserved Stripe API error for details and retry after correcting the request."
         ),
-        docUrl = docUrl,
-        sdkVersion = sdkVersion,
     )
 }
 
-internal fun buildDeveloperMessage(
-    summary: String,
-    operation: String,
-    appPackageName: String,
-    mode: String?,
-    reason: String?,
-    requestId: String?,
-    apiErrorCode: String?,
-    apiErrorType: String?,
-    nextStep: String,
-    docUrl: String?,
-    sdkVersion: String,
-): String {
-    val context = listOfNotNull(
-        "  - operation: $operation",
-        "  - app_id: $appPackageName",
-        mode?.let { "  - mode: $it" },
-        reason?.let { "  - reason: $it" },
-        requestId?.let { "  - request_id: $it" },
-        apiErrorCode?.let { "  - code: $it" },
-        apiErrorType?.let { "  - type: $it" },
-    )
-
-    return buildList {
-        add("Summary")
-        add("  $summary")
-        add("")
-        add("Context")
-        addAll(context)
-        add("")
-        add("Next step")
-        add("  $nextStep")
-        docUrl?.let {
-            add("")
-            add("Docs")
-            add("  $it")
-        }
-        add("")
-        add("SDK")
-        add("  stripe-android@$sdkVersion")
-    }.joinToString(separator = "\n")
-}
-
 private fun String?.orFallbackTo(fallback: String): String {
     return this?.takeIf { it.isNotBlank() } ?: fallback
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index dbefbb2c2b8..c9e4dbacc42 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -18,43 +18,33 @@ internal fun Throwable.toCryptoOnrampError(
     val stripeException = this as? StripeException ?: return this
     val stripeError = stripeException.stripeError ?: return this
 
-    val reason = stripeError.extraFields?.get(FIELD_REASON)
-    val apiErrorType = stripeException.apiErrorType()
-    val apiUserMessage = stripeError.extraFields?.get(FIELD_USER_MESSAGE)?.takeIf { it.isNotBlank() }
+    val apiErrorContext = APIErrorContext(
+        reason = stripeError.extraFields?.get(FIELD_REASON),
+        operation = operation.value,
+        appPackageName = context.packageName,
+        mode = publishableKey.toMode(),
+        sdkVersion = StripeSdkVersion.VERSION,
+        apiErrorCode = stripeError.code,
+        apiErrorType = stripeException.apiErrorType(),
+        apiErrorMessage = stripeError.message,
+        apiUserMessage = stripeError.extraFields?.get(FIELD_USER_MESSAGE)?.takeIf { it.isNotBlank() },
+        docUrl = stripeError.docUrl,
+        underlyingError = stripeException,
+    )
 
     return if (stripeError.isAppAttestationError()) {
         AppAttestationException(
-            reason = reason,
-            operation = operation.value,
-            appPackageName = context.packageName,
-            mode = publishableKey.toMode(),
-            sdkVersion = StripeSdkVersion.VERSION,
-            apiErrorCode = stripeError.code,
-            apiErrorType = apiErrorType,
-            apiErrorMessage = stripeError.message,
-            apiUserMessage = apiUserMessage,
-            docUrl = stripeError.docUrl,
+            context = apiErrorContext,
             fallbackUserMessage = lazy(LazyThreadSafetyMode.NONE) {
                 context.getString(R.string.stripe_onramp_app_attestation_default_user_message)
             },
-            cause = stripeException,
         )
     } else {
         UncategorizedApiErrorException(
-            reason = reason,
-            operation = operation.value,
-            appPackageName = context.packageName,
-            mode = publishableKey.toMode(),
-            sdkVersion = StripeSdkVersion.VERSION,
-            apiErrorCode = stripeError.code,
-            apiErrorType = apiErrorType,
-            apiErrorMessage = stripeError.message,
-            apiUserMessage = apiUserMessage,
-            docUrl = stripeError.docUrl,
+            context = apiErrorContext,
             fallbackUserMessage = lazy(LazyThreadSafetyMode.NONE) {
                 context.getString(R.string.stripe_onramp_default_api_error_user_message)
             },
-            cause = stripeException,
         )
     }
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
index e1be004ba4e..794a4721e47 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
@@ -1,6 +1,5 @@
 package com.stripe.android.crypto.onramp.exception
 
-import com.stripe.android.core.exception.StripeException
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 
 /**
@@ -8,64 +7,12 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
  */
 @ExperimentalCryptoOnramp
 class UncategorizedApiErrorException internal constructor(
-    /**
-     * The raw backend reason, when present.
-     */
-    val reason: String?,
-    /**
-     * The Crypto Onramp operation that failed.
-     */
-    val operation: String,
-    /**
-     * The Android application package name used for the request.
-     */
-    val appPackageName: String,
-    /**
-     * The Stripe mode inferred from the publishable key, when available.
-     */
-    val mode: String?,
-    /**
-     * The SDK version that produced the request.
-     */
-    val sdkVersion: String,
-    /**
-     * The raw backend error code, when present.
-     */
-    val apiErrorCode: String?,
-    /**
-     * The raw backend error type, when present.
-     */
-    val apiErrorType: String?,
-    /**
-     * The raw backend developer-facing message, when present.
-     */
-    val apiErrorMessage: String?,
-    /**
-     * The raw backend end-user-facing message, when present.
-     */
-    val apiUserMessage: String?,
-    /**
-     * A documentation URL for recovery guidance, when available.
-     */
-    val docUrl: String?,
+    val context: APIErrorContext,
     fallbackUserMessage: Lazy<String>,
-    cause: Throwable,
 ) : CryptoOnrampException(
-    message = apiUserMessage ?: fallbackUserMessage.value,
-    developerMessage = buildGenericDeveloperMessage(
-        operation = operation,
-        appPackageName = appPackageName,
-        mode = mode,
-        sdkVersion = sdkVersion,
-        reason = reason,
-        requestId = (cause as? StripeException)?.requestId,
-        apiErrorCode = apiErrorCode,
-        apiErrorType = apiErrorType,
-        apiErrorMessage = apiErrorMessage,
-        apiUserMessage = apiUserMessage,
-        docUrl = docUrl,
-    ),
-    cause = cause,
+    message = context.apiUserMessage ?: fallbackUserMessage.value,
+    developerMessage = buildGenericDeveloperMessage(context),
+    cause = context.underlyingError,
 ) {
-    override val userMessage: String = apiUserMessage ?: fallbackUserMessage.value
+    override val userMessage: String = context.apiUserMessage ?: fallbackUserMessage.value
 }
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 7dd862d478f..c5645540ceb 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -232,9 +232,9 @@ class OnrampInteractorTest {
             .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
         assertThat(attestationError.message)
             .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
-        assertThat(attestationError.reason).isEqualTo("app_not_play_recognized")
-        assertThat(attestationError.mode).isEqualTo("test")
-        assertThat(attestationError.apiErrorType).isEqualTo("api_error")
+        assertThat(attestationError.context.reason).isEqualTo("app_not_play_recognized")
+        assertThat(attestationError.context.mode).isEqualTo("test")
+        assertThat(attestationError.context.apiErrorType).isEqualTo("api_error")
         assertThat(attestationError.developerMessage).contains("Summary")
         assertThat(attestationError.developerMessage).contains("Context")
         assertThat(attestationError.developerMessage).contains("Next step")
@@ -278,9 +278,9 @@ class OnrampInteractorTest {
         assertThat(error).isInstanceOf(AppAttestationException::class.java)
 
         val attestationError = error as AppAttestationException
-        assertThat(attestationError.reason).isEqualTo("app_not_play_recognized")
-        assertThat(attestationError.mode).isEqualTo("test")
-        assertThat(attestationError.apiErrorType).isNull()
+        assertThat(attestationError.context.reason).isEqualTo("app_not_play_recognized")
+        assertThat(attestationError.context.mode).isEqualTo("test")
+        assertThat(attestationError.context.apiErrorType).isNull()
         assertThat(attestationError.message)
             .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
         assertThat(attestationError.developerMessage).contains("Summary")
@@ -321,10 +321,10 @@ class OnrampInteractorTest {
         assertThat(error).isInstanceOf(UncategorizedApiErrorException::class.java)
 
         val apiError = error as UncategorizedApiErrorException
-        assertThat(apiError.reason).isEqualTo("email_blocked")
+        assertThat(apiError.context.reason).isEqualTo("email_blocked")
         assertThat(apiError.userMessage).isEqualTo("This email can't be used. Try another one.")
         assertThat(apiError.message).isEqualTo("This email can't be used. Try another one.")
-        assertThat(apiError.apiErrorType).isNull()
+        assertThat(apiError.context.apiErrorType).isNull()
         assertThat(apiError.developerMessage).contains("Summary")
         assertThat(apiError.developerMessage).contains("Context")
         assertThat(apiError.developerMessage).contains("Next step")
@@ -378,7 +378,7 @@ class OnrampInteractorTest {
         val apiError = error as UncategorizedApiErrorException
         assertThat(apiError.userMessage).isEqualTo("Something went wrong. Please try again later.")
         assertThat(apiError.message).isEqualTo("Something went wrong. Please try again later.")
-        assertThat(apiError.apiErrorType).isNull()
+        assertThat(apiError.context.apiErrorType).isNull()
         assertThat(apiError.developerMessage).contains("Developer-facing message")
         assertThat(apiError.developerMessage).contains("Next step")
         assertThat(apiError.developerMessage)
@@ -428,8 +428,8 @@ class OnrampInteractorTest {
         assertThat(error).isInstanceOf(AppAttestationException::class.java)
 
         val attestationError = error as AppAttestationException
-        assertThat(attestationError.reason).isEqualTo("android_environment_mismatch")
-        assertThat(attestationError.apiErrorType).isNull()
+        assertThat(attestationError.context.reason).isEqualTo("android_environment_mismatch")
+        assertThat(attestationError.context.apiErrorType).isNull()
         assertThat(attestationError.userMessage)
             .isEqualTo(
                 "This app couldn't be verified due to an attestation error. Please try " +

From d465fc21b00615cb09c41850e7a04a393abf2e58 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Wed, 27 May 2026 17:04:43 -0400
Subject: [PATCH 49/57] Removing unnecessary lazy string loading

---
 .../exception/AppAttestationException.kt      |  6 +++---
 .../onramp/exception/CryptoOnrampException.kt |  4 ++++
 .../onramp/exception/OnrampErrorMapper.kt     | 16 +++++++--------
 .../UncategorizedApiErrorException.kt         |  6 +++---
 .../crypto/onramp/OnrampInteractorTest.kt     | 20 ++++++++++++++++++-
 5 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
index 8bea241a8be..e847a169e4a 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
@@ -8,13 +8,13 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 @ExperimentalCryptoOnramp
 class AppAttestationException internal constructor(
     val context: APIErrorContext,
-    fallbackUserMessage: Lazy<String>,
+    fallbackUserMessage: String,
 ) : CryptoOnrampException(
-    message = context.apiUserMessage ?: fallbackUserMessage.value,
+    message = context.userMessage(fallbackUserMessage),
     developerMessage = buildAppAttestationDeveloperMessage(context),
     cause = context.underlyingError,
 ) {
-    override val userMessage: String = context.apiUserMessage ?: fallbackUserMessage.value
+    override val userMessage: String = context.userMessage(fallbackUserMessage)
 }
 
 private const val ATTESTATION_NOT_ENABLED_REASON = "attestation_not_enabled"
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index af846607648..c8e13c6b662 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -130,6 +130,10 @@ internal fun buildGenericDeveloperMessage(
     )
 }
 
+internal fun APIErrorContext.userMessage(fallbackUserMessage: String): String {
+    return apiUserMessage ?: fallbackUserMessage
+}
+
 private fun String?.orFallbackTo(fallback: String): String {
     return this?.takeIf { it.isNotBlank() } ?: fallback
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index c9e4dbacc42..7330aa53d49 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -6,7 +6,6 @@ import com.stripe.android.core.exception.StripeException
 import com.stripe.android.core.version.StripeSdkVersion
 import com.stripe.android.crypto.onramp.R
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent
-import kotlin.LazyThreadSafetyMode
 
 internal fun Throwable.toCryptoOnrampError(
     context: Context,
@@ -17,6 +16,7 @@ internal fun Throwable.toCryptoOnrampError(
 
     val stripeException = this as? StripeException ?: return this
     val stripeError = stripeException.stripeError ?: return this
+    val apiUserMessage = stripeError.extraFields?.get(FIELD_USER_MESSAGE)?.takeIf { it.isNotBlank() }
 
     val apiErrorContext = APIErrorContext(
         reason = stripeError.extraFields?.get(FIELD_REASON),
@@ -27,7 +27,7 @@ internal fun Throwable.toCryptoOnrampError(
         apiErrorCode = stripeError.code,
         apiErrorType = stripeException.apiErrorType(),
         apiErrorMessage = stripeError.message,
-        apiUserMessage = stripeError.extraFields?.get(FIELD_USER_MESSAGE)?.takeIf { it.isNotBlank() },
+        apiUserMessage = apiUserMessage,
         docUrl = stripeError.docUrl,
         underlyingError = stripeException,
     )
@@ -35,16 +35,16 @@ internal fun Throwable.toCryptoOnrampError(
     return if (stripeError.isAppAttestationError()) {
         AppAttestationException(
             context = apiErrorContext,
-            fallbackUserMessage = lazy(LazyThreadSafetyMode.NONE) {
-                context.getString(R.string.stripe_onramp_app_attestation_default_user_message)
-            },
+            fallbackUserMessage = context.getString(
+                R.string.stripe_onramp_app_attestation_default_user_message,
+            ),
         )
     } else {
         UncategorizedApiErrorException(
             context = apiErrorContext,
-            fallbackUserMessage = lazy(LazyThreadSafetyMode.NONE) {
-                context.getString(R.string.stripe_onramp_default_api_error_user_message)
-            },
+            fallbackUserMessage = context.getString(
+                R.string.stripe_onramp_default_api_error_user_message,
+            ),
         )
     }
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
index 794a4721e47..fc1c96c68f8 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
@@ -8,11 +8,11 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 @ExperimentalCryptoOnramp
 class UncategorizedApiErrorException internal constructor(
     val context: APIErrorContext,
-    fallbackUserMessage: Lazy<String>,
+    fallbackUserMessage: String,
 ) : CryptoOnrampException(
-    message = context.apiUserMessage ?: fallbackUserMessage.value,
+    message = context.userMessage(fallbackUserMessage),
     developerMessage = buildGenericDeveloperMessage(context),
     cause = context.underlyingError,
 ) {
-    override val userMessage: String = context.apiUserMessage ?: fallbackUserMessage.value
+    override val userMessage: String = context.userMessage(fallbackUserMessage)
 }
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index c5645540ceb..33698348b12 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -1276,11 +1276,12 @@ class OnrampInteractorTest {
             .build()
 
     private fun createInteractor(
+        application: Application = createApplication(),
         cryptoApiRepository: CryptoApiRepository,
         savedStateHandle: SavedStateHandle,
     ): OnrampInteractor {
         return OnrampInteractor(
-            application = RuntimeEnvironment.getApplication(),
+            application = application,
             linkController = linkController,
             cryptoApiRepository = cryptoApiRepository,
             analyticsServiceFactory = analyticsServiceFactory,
@@ -1289,6 +1290,23 @@ class OnrampInteractorTest {
         )
     }
 
+    private fun createApplication(
+        defaultApiErrorUserMessage: String = "Something went wrong. Please try again later.",
+        defaultAppAttestationUserMessage: String =
+            "This app couldn't be verified due to an attestation error. Please try again later " +
+                "or contact the developer if the issue persists.",
+    ): Application {
+        val runtimeApplication = RuntimeEnvironment.getApplication()
+
+        return mock {
+            on { packageName } doReturn runtimeApplication.packageName
+            on { getString(R.string.stripe_onramp_default_api_error_user_message) } doReturn
+                defaultApiErrorUserMessage
+            on { getString(R.string.stripe_onramp_app_attestation_default_user_message) } doReturn
+                defaultAppAttestationUserMessage
+        }
+    }
+
     private suspend fun stubCheckoutRequiresNextAction() {
         whenever(linkController.configure(any())).thenReturn(ConfigureResult.Success)
         interactor.configure(createConfigurationState(cryptoCustomerId = "cpt_123"))

From a58f7f484f593ab87e0271072ee2b152dcd5197f Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Thu, 28 May 2026 12:53:18 -0400
Subject: [PATCH 50/57] Minor changes to make casting less onerous for api
 exceptions

---
 crypto-onramp/api/crypto-onramp.api           | 11 +++++----
 .../exception/AppAttestationException.kt      | 19 +++++++--------
 .../onramp/exception/CryptoOnrampException.kt | 24 +++++++++++++------
 .../UncategorizedApiErrorException.kt         |  6 ++---
 4 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 68be5a0b24c..7bc0b300568 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -68,12 +68,16 @@ public final class com/stripe/android/crypto/onramp/exception/APIErrorContext {
 	public fun toString ()Ljava/lang/String;
 }
 
-public final class com/stripe/android/crypto/onramp/exception/AppAttestationException : com/stripe/android/crypto/onramp/exception/CryptoOnrampException {
+public final class com/stripe/android/crypto/onramp/exception/AppAttestationException : com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException {
 	public static final field $stable I
-	public final fun getContext ()Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
 	public fun getUserMessage ()Ljava/lang/String;
 }
 
+public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException : com/stripe/android/crypto/onramp/exception/CryptoOnrampException {
+	public static final field $stable I
+	public final fun getContext ()Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
+}
+
 public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampException : com/stripe/android/core/exception/StripeException {
 	public static final field $stable I
 	public final fun getDeveloperMessage ()Ljava/lang/String;
@@ -101,9 +105,8 @@ public final class com/stripe/android/crypto/onramp/exception/PaymentFailedExcep
 	public static final field $stable I
 }
 
-public final class com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException : com/stripe/android/crypto/onramp/exception/CryptoOnrampException {
+public final class com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException : com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException {
 	public static final field $stable I
-	public final fun getContext ()Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
 	public fun getUserMessage ()Ljava/lang/String;
 }
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
index e847a169e4a..f6e27a3a547 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
@@ -7,12 +7,12 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
  */
 @ExperimentalCryptoOnramp
 class AppAttestationException internal constructor(
-    val context: APIErrorContext,
+    context: APIErrorContext,
     fallbackUserMessage: String,
-) : CryptoOnrampException(
+) : CryptoOnrampApiException(
+    context = context,
     message = context.userMessage(fallbackUserMessage),
     developerMessage = buildAppAttestationDeveloperMessage(context),
-    cause = context.underlyingError,
 ) {
     override val userMessage: String = context.userMessage(fallbackUserMessage)
 }
@@ -54,6 +54,8 @@ private const val ANDROID_ENVIRONMENT_MISMATCH_NEXT_STEP =
     "Install the app from the Google Play track that matches this Stripe mode, then retry the Onramp flow."
 private const val ANDROID_VERDICT_VALIDATION_FAILED_NEXT_STEP =
     "Generate a new Play Integrity verdict and retry the Onramp flow. If the issue persists, check your app attestation configuration."
+private const val DEFAULT_ATTESTATION_NEXT_STEP =
+    "Inspect the preserved Stripe API error for details and retry after correcting the app attestation configuration."
 
 private fun appAttestationSummary(reason: String?): String? {
     return appAttestationDescription(reason)?.let(::attestationSummary)
@@ -72,7 +74,7 @@ private fun appAttestationDescription(reason: String?): String? {
     }
 }
 
-private fun appAttestationNextStep(reason: String?): String? {
+private fun appAttestationNextStep(reason: String?): String {
     return when (reason) {
         ATTESTATION_NOT_ENABLED_REASON -> ATTESTATION_NOT_ENABLED_NEXT_STEP
         APP_NOT_REGISTERED_REASON -> APP_NOT_REGISTERED_NEXT_STEP
@@ -81,7 +83,7 @@ private fun appAttestationNextStep(reason: String?): String? {
         ANDROID_PACKAGE_NAME_MISMATCH_REASON -> ANDROID_PACKAGE_NAME_MISMATCH_NEXT_STEP
         ANDROID_ENVIRONMENT_MISMATCH_REASON -> ANDROID_ENVIRONMENT_MISMATCH_NEXT_STEP
         ANDROID_VERDICT_VALIDATION_FAILED_REASON -> ANDROID_VERDICT_VALIDATION_FAILED_NEXT_STEP
-        else -> null
+        else -> DEFAULT_ATTESTATION_NEXT_STEP
     }
 }
 
@@ -95,11 +97,6 @@ private fun buildAppAttestationDeveloperMessage(
     return context.developerMessage(
         summary = appAttestationSummary(context.reason)
             ?: (context.apiErrorMessage ?: "App attestation failed."),
-        nextStep = appAttestationNextStep(context.reason)
-            ?: (
-                context.apiErrorMessage
-                ?: "Inspect the preserved Stripe API error for details and retry after " +
-                    "correcting the app attestation configuration."
-            ),
+        nextStep = appAttestationNextStep(context.reason),
     )
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index c8e13c6b662..5c9816a0ab5 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -32,6 +32,22 @@ abstract class CryptoOnrampException internal constructor(
     }
 }
 
+/**
+ * Base exception type for Crypto Onramp failures that originate from a Stripe API error payload.
+ *
+ * [context] preserves the original API-facing fields and SDK-local debugging metadata.
+ */
+@ExperimentalCryptoOnramp
+abstract class CryptoOnrampApiException internal constructor(
+    val context: APIErrorContext,
+    message: String,
+    developerMessage: String,
+) : CryptoOnrampException(
+    message = message,
+    developerMessage = developerMessage,
+    cause = context.underlyingError,
+)
+
 data class APIErrorContext(
     /**
      * The raw backend reason, when present.
@@ -124,16 +140,10 @@ internal fun buildGenericDeveloperMessage(
 ): String {
     return context.developerMessage(
         summary = context.apiErrorMessage ?: "Stripe API request failed.",
-        nextStep = context.apiUserMessage.orFallbackTo(
-            "Inspect the preserved Stripe API error for details and retry after correcting the request."
-        ),
+        nextStep = "Inspect the preserved Stripe API error for details and retry after correcting the request.",
     )
 }
 
 internal fun APIErrorContext.userMessage(fallbackUserMessage: String): String {
     return apiUserMessage ?: fallbackUserMessage
 }
-
-private fun String?.orFallbackTo(fallback: String): String {
-    return this?.takeIf { it.isNotBlank() } ?: fallback
-}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
index fc1c96c68f8..5f776b753d5 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
@@ -7,12 +7,12 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
  */
 @ExperimentalCryptoOnramp
 class UncategorizedApiErrorException internal constructor(
-    val context: APIErrorContext,
+    context: APIErrorContext,
     fallbackUserMessage: String,
-) : CryptoOnrampException(
+) : CryptoOnrampApiException(
+    context = context,
     message = context.userMessage(fallbackUserMessage),
     developerMessage = buildGenericDeveloperMessage(context),
-    cause = context.underlyingError,
 ) {
     override val userMessage: String = context.userMessage(fallbackUserMessage)
 }

From f86e8721a5a77703ae7883d96c4974c2dcbaab2a Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Thu, 28 May 2026 14:09:18 -0400
Subject: [PATCH 51/57] Make cause more clear as a StripeException

---
 crypto-onramp/api/crypto-onramp.api             |  1 +
 .../onramp/exception/CryptoOnrampException.kt   | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 7bc0b300568..b04995d878e 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -81,6 +81,7 @@ public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampApi
 public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampException : com/stripe/android/core/exception/StripeException {
 	public static final field $stable I
 	public final fun getDeveloperMessage ()Ljava/lang/String;
+	public final fun getStripeException ()Lcom/stripe/android/core/exception/StripeException;
 	public abstract fun getUserMessage ()Ljava/lang/String;
 }
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index 5c9816a0ab5..c96d77fef15 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -13,12 +13,15 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 abstract class CryptoOnrampException internal constructor(
     message: String,
     val developerMessage: String,
-    cause: Throwable,
+    /**
+     * The original Stripe exception that was wrapped by this richer Crypto Onramp error.
+     */
+    val stripeException: StripeException,
 ) : StripeException(
-    stripeError = (cause as? StripeException)?.stripeError,
-    requestId = (cause as? StripeException)?.requestId,
-    statusCode = (cause as? StripeException)?.statusCode ?: DEFAULT_STATUS_CODE,
-    cause = cause,
+    stripeError = stripeException.stripeError,
+    requestId = stripeException.requestId,
+    statusCode = stripeException.statusCode,
+    cause = stripeException,
     message = message,
 ) {
     /**
@@ -28,7 +31,7 @@ abstract class CryptoOnrampException internal constructor(
 
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     override fun analyticsValue(): String {
-        return (cause as? StripeException)?.analyticsValue() ?: super.analyticsValue()
+        return stripeException.analyticsValue()
     }
 }
 
@@ -45,7 +48,7 @@ abstract class CryptoOnrampApiException internal constructor(
 ) : CryptoOnrampException(
     message = message,
     developerMessage = developerMessage,
-    cause = context.underlyingError,
+    stripeException = context.underlyingError,
 )
 
 data class APIErrorContext(

From 374c41fe4670d96e8d996f6708e3a12bc78f363e Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 1 Jun 2026 16:11:03 -0400
Subject: [PATCH 52/57] Switch to a CryptoOnrampErrorRenderer

---
 crypto-onramp/api/crypto-onramp.api           |  1 -
 .../exception/AppAttestationException.kt      |  3 +-
 .../exception/CryptoOnrampErrorRenderer.kt    | 72 +++++++++++++++++++
 .../onramp/exception/CryptoOnrampException.kt | 43 -----------
 .../UncategorizedApiErrorException.kt         |  2 +-
 .../crypto/onramp/OnrampInteractorTest.kt     | 60 ++++++++++------
 6 files changed, 112 insertions(+), 69 deletions(-)
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index b04995d878e..b681ee83f00 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -50,7 +50,6 @@ public final class com/stripe/android/crypto/onramp/exception/APIErrorContext {
 	public final fun component9 ()Ljava/lang/String;
 	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/core/exception/StripeException;)Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
 	public static synthetic fun copy$default (Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/core/exception/StripeException;ILjava/lang/Object;)Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
-	public final fun developerMessage (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getApiErrorCode ()Ljava/lang/String;
 	public final fun getApiErrorMessage ()Ljava/lang/String;
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
index f6e27a3a547..7308a2d4793 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
@@ -94,7 +94,8 @@ private fun attestationSummary(description: String): String {
 private fun buildAppAttestationDeveloperMessage(
     context: APIErrorContext,
 ): String {
-    return context.developerMessage(
+    return CryptoOnrampErrorRenderer.renderApiDeveloperMessage(
+        context = context,
         summary = appAttestationSummary(context.reason)
             ?: (context.apiErrorMessage ?: "App attestation failed."),
         nextStep = appAttestationNextStep(context.reason),
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt
new file mode 100644
index 00000000000..be7a3340acb
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt
@@ -0,0 +1,72 @@
+package com.stripe.android.crypto.onramp.exception
+
+internal object CryptoOnrampErrorRenderer {
+    fun renderGenericApiDeveloperMessage(
+        context: APIErrorContext,
+    ): String {
+        return renderApiDeveloperMessage(
+            context = context,
+            summary = context.apiErrorMessage ?: "Stripe API request failed.",
+            nextStep = "Inspect the preserved Stripe API error for details and retry after correcting the request.",
+        )
+    }
+
+    fun renderApiDeveloperMessage(
+        context: APIErrorContext,
+        summary: String,
+        nextStep: String,
+    ): String {
+        return renderDeveloperMessage(
+            summary = summary,
+            requestContext = requestContextLines(context),
+            code = context.apiErrorCode,
+            nextStep = nextStep,
+            docUrl = context.docUrl,
+            sdk = "stripe-android@${context.sdkVersion}",
+        )
+    }
+
+    private fun renderDeveloperMessage(
+        summary: String,
+        requestContext: List<String>,
+        code: String?,
+        nextStep: String,
+        docUrl: String?,
+        sdk: String,
+    ): String {
+        val footer = buildList {
+            code?.let {
+                add("Code: $it")
+            }
+            add("Next step: $nextStep")
+            docUrl?.let {
+                add("Docs: $it")
+            }
+            add("SDK: $sdk")
+        }
+
+        return buildList {
+            add(summary)
+            if (requestContext.isNotEmpty()) {
+                add("")
+                add("Request Context:")
+                addAll(requestContext.map { "  $it" })
+            }
+            add("")
+            addAll(footer)
+        }.joinToString(separator = "\n")
+    }
+
+    private fun requestContextLines(
+        context: APIErrorContext,
+    ): List<String> {
+        return listOfNotNull(
+            "operation: ${context.operation}",
+            "app_id: ${context.appPackageName}",
+            context.mode?.let { "mode: $it" },
+            context.reason?.let { "reason: $it" },
+            context.requestId?.let { "request_id: $it" },
+            context.apiErrorType?.let { "type: $it" },
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index c96d77fef15..b813f3da0de 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -102,49 +102,6 @@ data class APIErrorContext(
      */
     val requestId: String?
         get() = underlyingError.requestId
-
-    fun developerMessage(
-        summary: String,
-        nextStep: String,
-    ): String {
-        val context = listOfNotNull(
-            "  - operation: $operation",
-            "  - app_id: $appPackageName",
-            mode?.let { "  - mode: $it" },
-            reason?.let { "  - reason: $it" },
-            requestId?.let { "  - request_id: $it" },
-            apiErrorCode?.let { "  - code: $it" },
-            apiErrorType?.let { "  - type: $it" },
-        )
-
-        return buildList {
-            add("Summary")
-            add("  $summary")
-            add("")
-            add("Context")
-            addAll(context)
-            add("")
-            add("Next step")
-            add("  $nextStep")
-            docUrl?.let {
-                add("")
-                add("Docs")
-                add("  $it")
-            }
-            add("")
-            add("SDK")
-            add("  stripe-android@$sdkVersion")
-        }.joinToString(separator = "\n")
-    }
-}
-
-internal fun buildGenericDeveloperMessage(
-    context: APIErrorContext,
-): String {
-    return context.developerMessage(
-        summary = context.apiErrorMessage ?: "Stripe API request failed.",
-        nextStep = "Inspect the preserved Stripe API error for details and retry after correcting the request.",
-    )
 }
 
 internal fun APIErrorContext.userMessage(fallbackUserMessage: String): String {
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
index 5f776b753d5..01331debc5d 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
@@ -12,7 +12,7 @@ class UncategorizedApiErrorException internal constructor(
 ) : CryptoOnrampApiException(
     context = context,
     message = context.userMessage(fallbackUserMessage),
-    developerMessage = buildGenericDeveloperMessage(context),
+    developerMessage = CryptoOnrampErrorRenderer.renderGenericApiDeveloperMessage(context),
 ) {
     override val userMessage: String = context.userMessage(fallbackUserMessage)
 }
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 33698348b12..33e603618f5 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -235,17 +235,24 @@ class OnrampInteractorTest {
         assertThat(attestationError.context.reason).isEqualTo("app_not_play_recognized")
         assertThat(attestationError.context.mode).isEqualTo("test")
         assertThat(attestationError.context.apiErrorType).isEqualTo("api_error")
-        assertThat(attestationError.developerMessage).contains("Summary")
-        assertThat(attestationError.developerMessage).contains("Context")
-        assertThat(attestationError.developerMessage).contains("Next step")
-        assertThat(attestationError.developerMessage).contains("SDK")
         assertThat(attestationError.developerMessage)
-            .contains("App attestation failed: this app is not recognized by Google Play.")
-        assertThat(attestationError.developerMessage)
-            .contains("app_id: ${RuntimeEnvironment.getApplication().packageName}")
-        assertThat(attestationError.developerMessage).contains("operation: register_wallet_address")
-        assertThat(attestationError.developerMessage).contains("request_id: req_123")
-        assertThat(attestationError.developerMessage).contains("type: api_error")
+            .isEqualTo(
+                """
+                App attestation failed: this app is not recognized by Google Play.
+
+                Request Context:
+                  operation: register_wallet_address
+                  app_id: ${RuntimeEnvironment.getApplication().packageName}
+                  mode: test
+                  reason: app_not_play_recognized
+                  request_id: req_123
+                  type: api_error
+
+                Code: link_failed_to_attest_request
+                Next step: Install the app from a Google Play testing or production track and retry the Onramp flow. Internal, closed, open testing, and production tracks are supported. Debug builds and sideloaded APKs will not pass this check.
+                SDK: stripe-android@${attestationError.context.sdkVersion}
+                """.trimIndent()
+            )
     }
 
     @Test
@@ -283,8 +290,7 @@ class OnrampInteractorTest {
         assertThat(attestationError.context.apiErrorType).isNull()
         assertThat(attestationError.message)
             .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
-        assertThat(attestationError.developerMessage).contains("Summary")
-        assertThat(attestationError.developerMessage).contains("Context")
+        assertThat(attestationError.developerMessage).contains("Request Context:")
         assertThat(attestationError.developerMessage).contains("operation: has_link_account")
         assertThat(attestationError.developerMessage).contains("request_id: req_456")
         assertThat(attestationError.developerMessage).doesNotContain("type:")
@@ -325,16 +331,24 @@ class OnrampInteractorTest {
         assertThat(apiError.userMessage).isEqualTo("This email can't be used. Try another one.")
         assertThat(apiError.message).isEqualTo("This email can't be used. Try another one.")
         assertThat(apiError.context.apiErrorType).isNull()
-        assertThat(apiError.developerMessage).contains("Summary")
-        assertThat(apiError.developerMessage).contains("Context")
-        assertThat(apiError.developerMessage).contains("Next step")
-        assertThat(apiError.developerMessage).contains("Docs")
-        assertThat(apiError.developerMessage).contains("This email address can't be used.")
-        assertThat(apiError.developerMessage).contains("operation: has_link_account")
-        assertThat(apiError.developerMessage).contains("request_id: req_789")
-        assertThat(apiError.developerMessage).contains("code: email_blocked")
-        assertThat(apiError.developerMessage).doesNotContain("type:")
-        assertThat(apiError.developerMessage).contains("https://stripe.com/docs/error-codes/email_blocked")
+        assertThat(apiError.developerMessage)
+            .isEqualTo(
+                """
+                This email address can't be used.
+
+                Request Context:
+                  operation: has_link_account
+                  app_id: ${RuntimeEnvironment.getApplication().packageName}
+                  mode: test
+                  reason: email_blocked
+                  request_id: req_789
+
+                Code: email_blocked
+                Next step: Inspect the preserved Stripe API error for details and retry after correcting the request.
+                Docs: https://stripe.com/docs/error-codes/email_blocked
+                SDK: stripe-android@${apiError.context.sdkVersion}
+                """.trimIndent()
+            )
     }
 
     @Test
@@ -380,7 +394,7 @@ class OnrampInteractorTest {
         assertThat(apiError.message).isEqualTo("Something went wrong. Please try again later.")
         assertThat(apiError.context.apiErrorType).isNull()
         assertThat(apiError.developerMessage).contains("Developer-facing message")
-        assertThat(apiError.developerMessage).contains("Next step")
+        assertThat(apiError.developerMessage).contains("Next step:")
         assertThat(apiError.developerMessage)
             .contains("Inspect the preserved Stripe API error for details and retry after correcting the request.")
     }

From 88699ae2f5d2f267abd2c8746e2b214034b5243c Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 2 Jun 2026 12:23:10 -0400
Subject: [PATCH 53/57] Implement a new StripeCryptoOnrampError protocol

---
 crypto-onramp/api/crypto-onramp.api           |  29 +++--
 .../exception/AppAttestationException.kt      |   6 +-
 .../exception/CryptoOnrampErrorRenderer.kt    |   5 +-
 .../onramp/exception/CryptoOnrampException.kt |  31 ++++--
 .../onramp/exception/OnrampErrorMapper.kt     |   4 +-
 .../exception/StripeCryptoOnrampError.kt      |  42 +++++++
 .../UncategorizedApiErrorException.kt         |   7 +-
 .../crypto/onramp/OnrampInteractorTest.kt     | 103 ++++++++++--------
 8 files changed, 163 insertions(+), 64 deletions(-)
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError.kt

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index b681ee83f00..2c64bb444a4 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -36,10 +36,9 @@ public final class com/stripe/android/crypto/onramp/OnrampCoordinator$Presenter
 
 public final class com/stripe/android/crypto/onramp/exception/APIErrorContext {
 	public static final field $stable I
-	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/core/exception/StripeException;)V
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/core/exception/StripeException;)V
 	public final fun component1 ()Ljava/lang/String;
-	public final fun component10 ()Ljava/lang/String;
-	public final fun component11 ()Lcom/stripe/android/core/exception/StripeException;
+	public final fun component10 ()Lcom/stripe/android/core/exception/StripeException;
 	public final fun component2 ()Ljava/lang/String;
 	public final fun component3 ()Ljava/lang/String;
 	public final fun component4 ()Ljava/lang/String;
@@ -48,8 +47,8 @@ public final class com/stripe/android/crypto/onramp/exception/APIErrorContext {
 	public final fun component7 ()Ljava/lang/String;
 	public final fun component8 ()Ljava/lang/String;
 	public final fun component9 ()Ljava/lang/String;
-	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/core/exception/StripeException;)Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
-	public static synthetic fun copy$default (Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/core/exception/StripeException;ILjava/lang/Object;)Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/core/exception/StripeException;)Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
+	public static synthetic fun copy$default (Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lcom/stripe/android/core/exception/StripeException;ILjava/lang/Object;)Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
 	public fun equals (Ljava/lang/Object;)Z
 	public final fun getApiErrorCode ()Ljava/lang/String;
 	public final fun getApiErrorMessage ()Ljava/lang/String;
@@ -61,7 +60,6 @@ public final class com/stripe/android/crypto/onramp/exception/APIErrorContext {
 	public final fun getOperation ()Ljava/lang/String;
 	public final fun getReason ()Ljava/lang/String;
 	public final fun getRequestId ()Ljava/lang/String;
-	public final fun getSdkVersion ()Ljava/lang/String;
 	public final fun getUnderlyingError ()Lcom/stripe/android/core/exception/StripeException;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
@@ -74,13 +72,19 @@ public final class com/stripe/android/crypto/onramp/exception/AppAttestationExce
 
 public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException : com/stripe/android/crypto/onramp/exception/CryptoOnrampException {
 	public static final field $stable I
+	public final fun getCode ()Ljava/lang/String;
 	public final fun getContext ()Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
+	public final fun getDocUrl ()Ljava/lang/String;
 }
 
-public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampException : com/stripe/android/core/exception/StripeException {
+public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampException : com/stripe/android/core/exception/StripeException, com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError {
 	public static final field $stable I
+	public abstract fun getCode ()Ljava/lang/String;
 	public final fun getDeveloperMessage ()Ljava/lang/String;
-	public final fun getStripeException ()Lcom/stripe/android/core/exception/StripeException;
+	public abstract fun getDocUrl ()Ljava/lang/String;
+	public final fun getSdkVersion ()Ljava/lang/String;
+	public final fun getUnderlyingError ()Lcom/stripe/android/core/exception/StripeException;
+	public synthetic fun getUnderlyingError ()Ljava/lang/Throwable;
 	public abstract fun getUserMessage ()Ljava/lang/String;
 }
 
@@ -105,6 +109,15 @@ public final class com/stripe/android/crypto/onramp/exception/PaymentFailedExcep
 	public static final field $stable I
 }
 
+public abstract interface class com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError {
+	public abstract fun getCode ()Ljava/lang/String;
+	public abstract fun getDeveloperMessage ()Ljava/lang/String;
+	public abstract fun getDocUrl ()Ljava/lang/String;
+	public abstract fun getSdkVersion ()Ljava/lang/String;
+	public abstract fun getUnderlyingError ()Ljava/lang/Throwable;
+	public abstract fun getUserMessage ()Ljava/lang/String;
+}
+
 public final class com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException : com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException {
 	public static final field $stable I
 	public fun getUserMessage ()Ljava/lang/String;
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
index 7308a2d4793..3c27b6d5358 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
@@ -8,11 +8,13 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 @ExperimentalCryptoOnramp
 class AppAttestationException internal constructor(
     context: APIErrorContext,
+    sdkVersion: String,
     fallbackUserMessage: String,
 ) : CryptoOnrampApiException(
     context = context,
     message = context.userMessage(fallbackUserMessage),
-    developerMessage = buildAppAttestationDeveloperMessage(context),
+    developerMessage = buildAppAttestationDeveloperMessage(context, sdkVersion),
+    sdkVersion = sdkVersion,
 ) {
     override val userMessage: String = context.userMessage(fallbackUserMessage)
 }
@@ -93,11 +95,13 @@ private fun attestationSummary(description: String): String {
 
 private fun buildAppAttestationDeveloperMessage(
     context: APIErrorContext,
+    sdkVersion: String,
 ): String {
     return CryptoOnrampErrorRenderer.renderApiDeveloperMessage(
         context = context,
         summary = appAttestationSummary(context.reason)
             ?: (context.apiErrorMessage ?: "App attestation failed."),
         nextStep = appAttestationNextStep(context.reason),
+        sdkVersion = sdkVersion,
     )
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt
index be7a3340acb..f1ee9e007a9 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt
@@ -3,11 +3,13 @@ package com.stripe.android.crypto.onramp.exception
 internal object CryptoOnrampErrorRenderer {
     fun renderGenericApiDeveloperMessage(
         context: APIErrorContext,
+        sdkVersion: String,
     ): String {
         return renderApiDeveloperMessage(
             context = context,
             summary = context.apiErrorMessage ?: "Stripe API request failed.",
             nextStep = "Inspect the preserved Stripe API error for details and retry after correcting the request.",
+            sdkVersion = sdkVersion,
         )
     }
 
@@ -15,6 +17,7 @@ internal object CryptoOnrampErrorRenderer {
         context: APIErrorContext,
         summary: String,
         nextStep: String,
+        sdkVersion: String,
     ): String {
         return renderDeveloperMessage(
             summary = summary,
@@ -22,7 +25,7 @@ internal object CryptoOnrampErrorRenderer {
             code = context.apiErrorCode,
             nextStep = nextStep,
             docUrl = context.docUrl,
-            sdk = "stripe-android@${context.sdkVersion}",
+            sdk = "stripe-android@$sdkVersion",
         )
     }
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
index b813f3da0de..1d5ce8c4619 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
@@ -12,22 +12,31 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 @ExperimentalCryptoOnramp
 abstract class CryptoOnrampException internal constructor(
     message: String,
-    val developerMessage: String,
+    final override val developerMessage: String,
+    final override val sdkVersion: String,
     /**
      * The original Stripe exception that was wrapped by this richer Crypto Onramp error.
      */
-    val stripeException: StripeException,
+    private val stripeException: StripeException,
 ) : StripeException(
     stripeError = stripeException.stripeError,
     requestId = stripeException.requestId,
     statusCode = stripeException.statusCode,
     cause = stripeException,
     message = message,
-) {
+),
+StripeCryptoOnrampError {
     /**
      * An end-user-facing message, when available.
      */
-    abstract val userMessage: String
+    abstract override val userMessage: String
+
+    abstract override val code: String?
+
+    abstract override val docUrl: String?
+
+    final override val underlyingError: StripeException
+        get() = stripeException
 
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     override fun analyticsValue(): String {
@@ -45,11 +54,19 @@ abstract class CryptoOnrampApiException internal constructor(
     val context: APIErrorContext,
     message: String,
     developerMessage: String,
+    sdkVersion: String,
 ) : CryptoOnrampException(
     message = message,
     developerMessage = developerMessage,
+    sdkVersion = sdkVersion,
     stripeException = context.underlyingError,
-)
+) {
+    final override val code: String?
+        get() = context.apiErrorCode
+
+    final override val docUrl: String?
+        get() = context.docUrl
+}
 
 data class APIErrorContext(
     /**
@@ -68,10 +85,6 @@ data class APIErrorContext(
      * The Stripe mode inferred from the publishable key, when available.
      */
     val mode: String?,
-    /**
-     * The SDK version that produced the request.
-     */
-    val sdkVersion: String,
     /**
      * The raw backend error code, when present.
      */
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index 7330aa53d49..3b23bb2441f 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -17,13 +17,13 @@ internal fun Throwable.toCryptoOnrampError(
     val stripeException = this as? StripeException ?: return this
     val stripeError = stripeException.stripeError ?: return this
     val apiUserMessage = stripeError.extraFields?.get(FIELD_USER_MESSAGE)?.takeIf { it.isNotBlank() }
+    val sdkVersion = StripeSdkVersion.VERSION
 
     val apiErrorContext = APIErrorContext(
         reason = stripeError.extraFields?.get(FIELD_REASON),
         operation = operation.value,
         appPackageName = context.packageName,
         mode = publishableKey.toMode(),
-        sdkVersion = StripeSdkVersion.VERSION,
         apiErrorCode = stripeError.code,
         apiErrorType = stripeException.apiErrorType(),
         apiErrorMessage = stripeError.message,
@@ -35,6 +35,7 @@ internal fun Throwable.toCryptoOnrampError(
     return if (stripeError.isAppAttestationError()) {
         AppAttestationException(
             context = apiErrorContext,
+            sdkVersion = sdkVersion,
             fallbackUserMessage = context.getString(
                 R.string.stripe_onramp_app_attestation_default_user_message,
             ),
@@ -42,6 +43,7 @@ internal fun Throwable.toCryptoOnrampError(
     } else {
         UncategorizedApiErrorException(
             context = apiErrorContext,
+            sdkVersion = sdkVersion,
             fallbackUserMessage = context.getString(
                 R.string.stripe_onramp_default_api_error_user_message,
             ),
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError.kt
new file mode 100644
index 00000000000..ec305ed9d12
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError.kt
@@ -0,0 +1,42 @@
+package com.stripe.android.crypto.onramp.exception
+
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * Common rich-error contract for Crypto Onramp failures that expose SDK-owned recovery guidance.
+ *
+ * [userMessage] is safe to display directly to app users. Use [developerMessage] for richer
+ * diagnostics.
+ */
+@ExperimentalCryptoOnramp
+interface StripeCryptoOnrampError {
+    /**
+     * An end-user-facing message, when available.
+     */
+    val userMessage: String
+
+    /**
+     * A richer developer-facing diagnostic message.
+     */
+    val developerMessage: String
+
+    /**
+     * A stable error code, when available.
+     */
+    val code: String?
+
+    /**
+     * A documentation URL for recovery guidance, when available.
+     */
+    val docUrl: String?
+
+    /**
+     * The SDK version that produced this error.
+     */
+    val sdkVersion: String
+
+    /**
+     * The original cause that was mapped into this richer Crypto Onramp error.
+     */
+    val underlyingError: Throwable?
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
index 01331debc5d..695a35272b8 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
@@ -8,11 +8,16 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 @ExperimentalCryptoOnramp
 class UncategorizedApiErrorException internal constructor(
     context: APIErrorContext,
+    sdkVersion: String,
     fallbackUserMessage: String,
 ) : CryptoOnrampApiException(
     context = context,
     message = context.userMessage(fallbackUserMessage),
-    developerMessage = CryptoOnrampErrorRenderer.renderGenericApiDeveloperMessage(context),
+    developerMessage = CryptoOnrampErrorRenderer.renderGenericApiDeveloperMessage(
+        context = context,
+        sdkVersion = sdkVersion,
+    ),
+    sdkVersion = sdkVersion,
 ) {
     override val userMessage: String = context.userMessage(fallbackUserMessage)
 }
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 33e603618f5..6876de62115 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -194,24 +194,23 @@ class OnrampInteractorTest {
     fun testRegisterWalletAddressMapsBackendAttestationError() = runTest {
         whenever(linkController.state(any())).thenReturn(MutableStateFlow(mockLinkStateWithAccount()))
         whenever(linkController.configure(any())).thenReturn(ConfigureResult.Success)
-        whenever(cryptoApiRepository.setWalletAddress(any(), any(), any())).thenReturn(
-            Result.failure(
-                APIException(
-                    stripeError = StripeError(
-                        type = "api_error",
-                        code = "link_failed_to_attest_request",
-                        message = "App attestation failed",
-                        extraFields = mapOf(
-                            "reason" to "app_not_play_recognized",
-                            "user_message" to
-                                "This app couldn't be verified. Install it from Google Play " +
-                                "and try again."
-                        )
-                    ),
-                    requestId = "req_123",
-                    statusCode = 400,
+        val backendError = APIException(
+            stripeError = StripeError(
+                type = "api_error",
+                code = "link_failed_to_attest_request",
+                message = "App attestation failed",
+                extraFields = mapOf(
+                    "reason" to "app_not_play_recognized",
+                    "user_message" to
+                        "This app couldn't be verified. Install it from Google Play " +
+                            "and try again."
                 )
-            )
+            ),
+            requestId = "req_123",
+            statusCode = 400,
+        )
+        whenever(cryptoApiRepository.setWalletAddress(any(), any(), any())).thenReturn(
+            Result.failure(backendError)
         )
 
         interactor.onLinkControllerState(mockLinkStateWithAccount())
@@ -228,31 +227,10 @@ class OnrampInteractorTest {
         assertThat(error).isInstanceOf(AppAttestationException::class.java)
 
         val attestationError = error as AppAttestationException
-        assertThat(attestationError.userMessage)
-            .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
-        assertThat(attestationError.message)
-            .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
-        assertThat(attestationError.context.reason).isEqualTo("app_not_play_recognized")
-        assertThat(attestationError.context.mode).isEqualTo("test")
-        assertThat(attestationError.context.apiErrorType).isEqualTo("api_error")
-        assertThat(attestationError.developerMessage)
-            .isEqualTo(
-                """
-                App attestation failed: this app is not recognized by Google Play.
-
-                Request Context:
-                  operation: register_wallet_address
-                  app_id: ${RuntimeEnvironment.getApplication().packageName}
-                  mode: test
-                  reason: app_not_play_recognized
-                  request_id: req_123
-                  type: api_error
-
-                Code: link_failed_to_attest_request
-                Next step: Install the app from a Google Play testing or production track and retry the Onramp flow. Internal, closed, open testing, and production tracks are supported. Debug builds and sideloaded APKs will not pass this check.
-                SDK: stripe-android@${attestationError.context.sdkVersion}
-                """.trimIndent()
-            )
+        assertAppNotPlayRecognizedAttestationError(
+            attestationError = attestationError,
+            backendError = backendError,
+        )
     }
 
     @Test
@@ -331,6 +309,10 @@ class OnrampInteractorTest {
         assertThat(apiError.userMessage).isEqualTo("This email can't be used. Try another one.")
         assertThat(apiError.message).isEqualTo("This email can't be used. Try another one.")
         assertThat(apiError.context.apiErrorType).isNull()
+        assertThat(apiError.code).isEqualTo("email_blocked")
+        assertThat(apiError.docUrl).isEqualTo("https://stripe.com/docs/error-codes/email_blocked")
+        assertThat(apiError.sdkVersion).isNotEmpty()
+        assertThat(apiError.underlyingError).isSameInstanceAs(apiError.context.underlyingError)
         assertThat(apiError.developerMessage)
             .isEqualTo(
                 """
@@ -346,7 +328,7 @@ class OnrampInteractorTest {
                 Code: email_blocked
                 Next step: Inspect the preserved Stripe API error for details and retry after correcting the request.
                 Docs: https://stripe.com/docs/error-codes/email_blocked
-                SDK: stripe-android@${apiError.context.sdkVersion}
+                SDK: stripe-android@${apiError.sdkVersion}
                 """.trimIndent()
             )
     }
@@ -1321,6 +1303,41 @@ class OnrampInteractorTest {
         }
     }
 
+    private fun assertAppNotPlayRecognizedAttestationError(
+        attestationError: AppAttestationException,
+        backendError: APIException,
+    ) {
+        assertThat(attestationError.userMessage)
+            .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
+        assertThat(attestationError.message)
+            .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
+        assertThat(attestationError.context.reason).isEqualTo("app_not_play_recognized")
+        assertThat(attestationError.context.mode).isEqualTo("test")
+        assertThat(attestationError.context.apiErrorType).isEqualTo("api_error")
+        assertThat(attestationError.code).isEqualTo("link_failed_to_attest_request")
+        assertThat(attestationError.docUrl).isNull()
+        assertThat(attestationError.sdkVersion).isNotEmpty()
+        assertThat(attestationError.underlyingError).isSameInstanceAs(backendError)
+        assertThat(attestationError.developerMessage)
+            .isEqualTo(
+                """
+                App attestation failed: this app is not recognized by Google Play.
+
+                Request Context:
+                  operation: register_wallet_address
+                  app_id: ${RuntimeEnvironment.getApplication().packageName}
+                  mode: test
+                  reason: app_not_play_recognized
+                  request_id: req_123
+                  type: api_error
+
+                Code: link_failed_to_attest_request
+                Next step: Install the app from a Google Play testing or production track and retry the Onramp flow. Internal, closed, open testing, and production tracks are supported. Debug builds and sideloaded APKs will not pass this check.
+                SDK: stripe-android@${attestationError.sdkVersion}
+                """.trimIndent()
+            )
+    }
+
     private suspend fun stubCheckoutRequiresNextAction() {
         whenever(linkController.configure(any())).thenReturn(ConfigureResult.Success)
         interactor.configure(createConfigurationState(cryptoCustomerId = "cpt_123"))

From 05b01f67c5dba7a5f4b1f1a910452f2fff12a2cd Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Tue, 2 Jun 2026 12:32:55 -0400
Subject: [PATCH 54/57] Switched from CryptoOnrampException to
 CryptoOnrampApiException

---
 CHANGELOG.md                                  |  2 +-
 crypto-onramp/api/crypto-onramp.api           | 14 +---
 .../exception/AppAttestationException.kt      |  6 +-
 ...ception.kt => CryptoOnrampApiException.kt} | 65 ++++++-------------
 .../onramp/exception/OnrampErrorMapper.kt     |  2 +-
 .../UncategorizedApiErrorException.kt         |  6 +-
 6 files changed, 28 insertions(+), 67 deletions(-)
 rename crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/{CryptoOnrampException.kt => CryptoOnrampApiException.kt} (68%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20b06c7fb8f..1ad0248665c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ NEXT_VERSION_BUMP: PATCH
 * [CHANGED][13144](https://github.com/stripe/stripe-android/pull/13144) On payment or setup confirmation failure, we now include error code, decline code, and error type in the exception thrown.
 
 ### CryptoOnramp
-* [ADDED][13156](https://github.com/stripe/stripe-android/pull/13156) Added `CryptoOnrampException`, `AppAttestationException`, and `UncategorizedApiErrorException` to expose richer developer-facing diagnostics and preserved backend API error context for Crypto Onramp failures.
+* [ADDED][13156](https://github.com/stripe/stripe-android/pull/13156) Added `StripeCryptoOnrampError`, `CryptoOnrampApiException`, `AppAttestationException`, and `UncategorizedApiErrorException` to expose richer developer-facing diagnostics and preserved backend API error context for Crypto Onramp failures.
 * [CHANGED][13156](https://github.com/stripe/stripe-android/pull/13156) Improved Crypto Onramp API error handling with localized fallback user messaging and more consistent error mapping across attestation, payment collection, and checkout flows.
 
 
diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 2c64bb444a4..0fe1b06ab80 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -67,25 +67,18 @@ public final class com/stripe/android/crypto/onramp/exception/APIErrorContext {
 
 public final class com/stripe/android/crypto/onramp/exception/AppAttestationException : com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException {
 	public static final field $stable I
-	public fun getUserMessage ()Ljava/lang/String;
 }
 
-public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException : com/stripe/android/crypto/onramp/exception/CryptoOnrampException {
+public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException : com/stripe/android/core/exception/StripeException, com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError {
 	public static final field $stable I
 	public final fun getCode ()Ljava/lang/String;
 	public final fun getContext ()Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
-	public final fun getDocUrl ()Ljava/lang/String;
-}
-
-public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampException : com/stripe/android/core/exception/StripeException, com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError {
-	public static final field $stable I
-	public abstract fun getCode ()Ljava/lang/String;
 	public final fun getDeveloperMessage ()Ljava/lang/String;
-	public abstract fun getDocUrl ()Ljava/lang/String;
+	public final fun getDocUrl ()Ljava/lang/String;
 	public final fun getSdkVersion ()Ljava/lang/String;
 	public final fun getUnderlyingError ()Lcom/stripe/android/core/exception/StripeException;
 	public synthetic fun getUnderlyingError ()Ljava/lang/Throwable;
-	public abstract fun getUserMessage ()Ljava/lang/String;
+	public final fun getUserMessage ()Ljava/lang/String;
 }
 
 public final class com/stripe/android/crypto/onramp/exception/MissingConsumerSecretException : java/lang/IllegalStateException {
@@ -120,7 +113,6 @@ public abstract interface class com/stripe/android/crypto/onramp/exception/Strip
 
 public final class com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException : com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException {
 	public static final field $stable I
-	public fun getUserMessage ()Ljava/lang/String;
 }
 
 public final class com/stripe/android/crypto/onramp/model/CryptoNetwork : java/lang/Enum {
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
index 3c27b6d5358..30d872b5af9 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
@@ -12,12 +12,10 @@ class AppAttestationException internal constructor(
     fallbackUserMessage: String,
 ) : CryptoOnrampApiException(
     context = context,
-    message = context.userMessage(fallbackUserMessage),
+    userMessage = context.userMessage(fallbackUserMessage),
     developerMessage = buildAppAttestationDeveloperMessage(context, sdkVersion),
     sdkVersion = sdkVersion,
-) {
-    override val userMessage: String = context.userMessage(fallbackUserMessage)
-}
+)
 
 private const val ATTESTATION_NOT_ENABLED_REASON = "attestation_not_enabled"
 private const val APP_NOT_REGISTERED_REASON = "app_not_registered"
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException.kt
similarity index 68%
rename from crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
rename to crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException.kt
index 1d5ce8c4619..c39532c5ee6 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException.kt
@@ -5,69 +5,42 @@ import com.stripe.android.core.exception.StripeException
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 
 /**
- * Base exception type for Crypto Onramp failures that expose SDK-owned recovery guidance.
+ * Base exception type for Crypto Onramp failures that originate from a Stripe API error payload.
+ *
+ * [context] preserves the original API-facing fields and SDK-local debugging metadata.
  *
- * `message` is safe to display directly to app users. Use [developerMessage] for richer diagnostics.
+ * `message` is safe to display directly to app users. Use [developerMessage] for richer
+ * diagnostics.
  */
 @ExperimentalCryptoOnramp
-abstract class CryptoOnrampException internal constructor(
-    message: String,
+abstract class CryptoOnrampApiException internal constructor(
+    val context: APIErrorContext,
+    final override val userMessage: String,
     final override val developerMessage: String,
     final override val sdkVersion: String,
-    /**
-     * The original Stripe exception that was wrapped by this richer Crypto Onramp error.
-     */
-    private val stripeException: StripeException,
 ) : StripeException(
-    stripeError = stripeException.stripeError,
-    requestId = stripeException.requestId,
-    statusCode = stripeException.statusCode,
-    cause = stripeException,
-    message = message,
+    stripeError = context.underlyingError.stripeError,
+    requestId = context.underlyingError.requestId,
+    statusCode = context.underlyingError.statusCode,
+    cause = context.underlyingError,
+    message = userMessage,
 ),
 StripeCryptoOnrampError {
-    /**
-     * An end-user-facing message, when available.
-     */
-    abstract override val userMessage: String
-
-    abstract override val code: String?
+    final override val code: String?
+        get() = context.apiErrorCode
 
-    abstract override val docUrl: String?
+    final override val docUrl: String?
+        get() = context.docUrl
 
     final override val underlyingError: StripeException
-        get() = stripeException
+        get() = context.underlyingError
 
     @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
     override fun analyticsValue(): String {
-        return stripeException.analyticsValue()
+        return context.underlyingError.analyticsValue()
     }
 }
 
-/**
- * Base exception type for Crypto Onramp failures that originate from a Stripe API error payload.
- *
- * [context] preserves the original API-facing fields and SDK-local debugging metadata.
- */
-@ExperimentalCryptoOnramp
-abstract class CryptoOnrampApiException internal constructor(
-    val context: APIErrorContext,
-    message: String,
-    developerMessage: String,
-    sdkVersion: String,
-) : CryptoOnrampException(
-    message = message,
-    developerMessage = developerMessage,
-    sdkVersion = sdkVersion,
-    stripeException = context.underlyingError,
-) {
-    final override val code: String?
-        get() = context.apiErrorCode
-
-    final override val docUrl: String?
-        get() = context.docUrl
-}
-
 data class APIErrorContext(
     /**
      * The raw backend reason, when present.
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index 3b23bb2441f..0a58c02d975 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -12,7 +12,7 @@ internal fun Throwable.toCryptoOnrampError(
     operation: OnrampAnalyticsEvent.ErrorOccurred.Operation,
     publishableKey: String?,
 ): Throwable {
-    if (this is CryptoOnrampException) return this
+    if (this is StripeCryptoOnrampError) return this
 
     val stripeException = this as? StripeException ?: return this
     val stripeError = stripeException.stripeError ?: return this
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
index 695a35272b8..6a0fe3f2235 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
@@ -12,12 +12,10 @@ class UncategorizedApiErrorException internal constructor(
     fallbackUserMessage: String,
 ) : CryptoOnrampApiException(
     context = context,
-    message = context.userMessage(fallbackUserMessage),
+    userMessage = context.userMessage(fallbackUserMessage),
     developerMessage = CryptoOnrampErrorRenderer.renderGenericApiDeveloperMessage(
         context = context,
         sdkVersion = sdkVersion,
     ),
     sdkVersion = sdkVersion,
-) {
-    override val userMessage: String = context.userMessage(fallbackUserMessage)
-}
+)

From b92bd3c9b8e77615730823352111dce2cb8f7904 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Thu, 4 Jun 2026 16:23:05 -0400
Subject: [PATCH 55/57] Matching iOS changes for sdk versioning

---
 CHANGELOG.md                                  |  2 +-
 crypto-onramp/api/crypto-onramp.api           | 20 +++++-
 .../android/crypto/onramp/OnrampInteractor.kt |  1 +
 .../exception/AppAttestationException.kt      | 10 +--
 .../exception/CryptoOnrampApiException.kt     |  4 +-
 .../exception/CryptoOnrampErrorRenderer.kt    | 17 +++--
 .../onramp/exception/OnrampErrorMapper.kt     |  8 +--
 .../crypto/onramp/exception/SDKVersion.kt     | 35 +++++++++++
 .../exception/StripeCryptoOnrampError.kt      |  5 +-
 .../UncategorizedApiErrorException.kt         |  6 +-
 .../onramp/model/OnrampConfiguration.kt       | 20 +++++-
 .../crypto/onramp/OnrampInteractorTest.kt     | 63 +++++++++++++++++--
 12 files changed, 159 insertions(+), 32 deletions(-)
 create mode 100644 crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/SDKVersion.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f658582d152..8f2fe8c8708 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,7 @@ NEXT_VERSION_BUMP: PATCH
 * [CHANGED][13144](https://github.com/stripe/stripe-android/pull/13144) On payment or setup confirmation failure, we now include error code, decline code, and error type in the exception thrown.
 
 ### CryptoOnramp
-* [ADDED][13156](https://github.com/stripe/stripe-android/pull/13156) Added `StripeCryptoOnrampError`, `CryptoOnrampApiException`, `AppAttestationException`, and `UncategorizedApiErrorException` to expose richer developer-facing diagnostics and preserved backend API error context for Crypto Onramp failures.
+* [ADDED][13156](https://github.com/stripe/stripe-android/pull/13156) Added `SDKVersion`, `StripeCryptoOnrampError`, `CryptoOnrampApiException`, `AppAttestationException`, and `UncategorizedApiErrorException` to expose richer developer-facing diagnostics and preserved backend API error context for Crypto Onramp failures.
 * [CHANGED][13156](https://github.com/stripe/stripe-android/pull/13156) Improved Crypto Onramp API error handling with localized fallback user messaging and more consistent error mapping across attestation, payment collection, and checkout flows.
 
 
diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 0fe1b06ab80..a2cb693b882 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -75,7 +75,7 @@ public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampApi
 	public final fun getContext ()Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
 	public final fun getDeveloperMessage ()Ljava/lang/String;
 	public final fun getDocUrl ()Ljava/lang/String;
-	public final fun getSdkVersion ()Ljava/lang/String;
+	public final fun getSdkVersions ()Ljava/util/List;
 	public final fun getUnderlyingError ()Lcom/stripe/android/core/exception/StripeException;
 	public synthetic fun getUnderlyingError ()Ljava/lang/Throwable;
 	public final fun getUserMessage ()Ljava/lang/String;
@@ -102,11 +102,26 @@ public final class com/stripe/android/crypto/onramp/exception/PaymentFailedExcep
 	public static final field $stable I
 }
 
+public final class com/stripe/android/crypto/onramp/exception/SDKVersion {
+	public static final field $stable I
+	public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
+	public final fun component1 ()Ljava/lang/String;
+	public final fun component2 ()Ljava/lang/String;
+	public final fun copy (Ljava/lang/String;Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/exception/SDKVersion;
+	public static synthetic fun copy$default (Lcom/stripe/android/crypto/onramp/exception/SDKVersion;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/stripe/android/crypto/onramp/exception/SDKVersion;
+	public fun equals (Ljava/lang/Object;)Z
+	public final fun getDebugDescription ()Ljava/lang/String;
+	public final fun getName ()Ljava/lang/String;
+	public final fun getVersion ()Ljava/lang/String;
+	public fun hashCode ()I
+	public fun toString ()Ljava/lang/String;
+}
+
 public abstract interface class com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError {
 	public abstract fun getCode ()Ljava/lang/String;
 	public abstract fun getDeveloperMessage ()Ljava/lang/String;
 	public abstract fun getDocUrl ()Ljava/lang/String;
-	public abstract fun getSdkVersion ()Ljava/lang/String;
+	public abstract fun getSdkVersions ()Ljava/util/List;
 	public abstract fun getUnderlyingError ()Ljava/lang/Throwable;
 	public abstract fun getUserMessage ()Ljava/lang/String;
 }
@@ -269,6 +284,7 @@ public final class com/stripe/android/crypto/onramp/model/OnrampCollectPaymentMe
 public final class com/stripe/android/crypto/onramp/model/OnrampConfiguration {
 	public static final field $stable I
 	public fun <init> ()V
+	public final fun additionalSdkVersions (Ljava/util/List;)Lcom/stripe/android/crypto/onramp/model/OnrampConfiguration;
 	public final fun appearance (Lcom/stripe/android/link/LinkAppearance;)Lcom/stripe/android/crypto/onramp/model/OnrampConfiguration;
 	public final fun cryptoCustomerId (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/OnrampConfiguration;
 	public final fun googlePayConfig (Lcom/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncher$Config;)Lcom/stripe/android/crypto/onramp/model/OnrampConfiguration;
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
index c5e9c41ae4a..b405336c13b 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/OnrampInteractor.kt
@@ -91,6 +91,7 @@ internal class OnrampInteractor @Inject constructor(
             context = application,
             operation = operation,
             publishableKey = state.value.configurationState?.publishableKey,
+            additionalSdkVersions = state.value.configurationState?.additionalSdkVersions.orEmpty(),
         )
     }
 
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
index 30d872b5af9..ffbbe947e7d 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
@@ -8,13 +8,13 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 @ExperimentalCryptoOnramp
 class AppAttestationException internal constructor(
     context: APIErrorContext,
-    sdkVersion: String,
+    sdkVersions: List<SDKVersion>,
     fallbackUserMessage: String,
 ) : CryptoOnrampApiException(
     context = context,
+    sdkVersions = sdkVersions,
     userMessage = context.userMessage(fallbackUserMessage),
-    developerMessage = buildAppAttestationDeveloperMessage(context, sdkVersion),
-    sdkVersion = sdkVersion,
+    developerMessage = buildAppAttestationDeveloperMessage(context, sdkVersions),
 )
 
 private const val ATTESTATION_NOT_ENABLED_REASON = "attestation_not_enabled"
@@ -93,13 +93,13 @@ private fun attestationSummary(description: String): String {
 
 private fun buildAppAttestationDeveloperMessage(
     context: APIErrorContext,
-    sdkVersion: String,
+    sdkVersions: List<SDKVersion>,
 ): String {
     return CryptoOnrampErrorRenderer.renderApiDeveloperMessage(
         context = context,
         summary = appAttestationSummary(context.reason)
             ?: (context.apiErrorMessage ?: "App attestation failed."),
         nextStep = appAttestationNextStep(context.reason),
-        sdkVersion = sdkVersion,
+        sdkVersions = sdkVersions,
     )
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException.kt
index c39532c5ee6..66a122849bb 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException.kt
@@ -7,7 +7,7 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 /**
  * Base exception type for Crypto Onramp failures that originate from a Stripe API error payload.
  *
- * [context] preserves the original API-facing fields and SDK-local debugging metadata.
+ * [context] preserves the original API-facing fields and request debugging metadata.
  *
  * `message` is safe to display directly to app users. Use [developerMessage] for richer
  * diagnostics.
@@ -15,9 +15,9 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 @ExperimentalCryptoOnramp
 abstract class CryptoOnrampApiException internal constructor(
     val context: APIErrorContext,
+    final override val sdkVersions: List<SDKVersion>,
     final override val userMessage: String,
     final override val developerMessage: String,
-    final override val sdkVersion: String,
 ) : StripeException(
     stripeError = context.underlyingError.stripeError,
     requestId = context.underlyingError.requestId,
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt
index f1ee9e007a9..1f7f420e543 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt
@@ -3,13 +3,13 @@ package com.stripe.android.crypto.onramp.exception
 internal object CryptoOnrampErrorRenderer {
     fun renderGenericApiDeveloperMessage(
         context: APIErrorContext,
-        sdkVersion: String,
+        sdkVersions: List<SDKVersion>,
     ): String {
         return renderApiDeveloperMessage(
             context = context,
             summary = context.apiErrorMessage ?: "Stripe API request failed.",
             nextStep = "Inspect the preserved Stripe API error for details and retry after correcting the request.",
-            sdkVersion = sdkVersion,
+            sdkVersions = sdkVersions,
         )
     }
 
@@ -17,7 +17,7 @@ internal object CryptoOnrampErrorRenderer {
         context: APIErrorContext,
         summary: String,
         nextStep: String,
-        sdkVersion: String,
+        sdkVersions: List<SDKVersion>,
     ): String {
         return renderDeveloperMessage(
             summary = summary,
@@ -25,7 +25,7 @@ internal object CryptoOnrampErrorRenderer {
             code = context.apiErrorCode,
             nextStep = nextStep,
             docUrl = context.docUrl,
-            sdk = "stripe-android@$sdkVersion",
+            sdkVersions = sdkVersions,
         )
     }
 
@@ -35,7 +35,7 @@ internal object CryptoOnrampErrorRenderer {
         code: String?,
         nextStep: String,
         docUrl: String?,
-        sdk: String,
+        sdkVersions: List<SDKVersion>,
     ): String {
         val footer = buildList {
             code?.let {
@@ -45,7 +45,7 @@ internal object CryptoOnrampErrorRenderer {
             docUrl?.let {
                 add("Docs: $it")
             }
-            add("SDK: $sdk")
+            add("SDK: ${sdkVersionDescription(sdkVersions)}")
         }
 
         return buildList {
@@ -60,6 +60,11 @@ internal object CryptoOnrampErrorRenderer {
         }.joinToString(separator = "\n")
     }
 
+    private fun sdkVersionDescription(sdkVersions: List<SDKVersion>): String {
+        val normalizedSdkVersions = sdkVersions.ifEmpty { listOf(SDKVersion.stripeAndroid) }
+        return normalizedSdkVersions.joinToString(separator = ", ") { it.debugDescription }
+    }
+
     private fun requestContextLines(
         context: APIErrorContext,
     ): List<String> {
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index 0a58c02d975..45c4e97afc7 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -3,7 +3,6 @@ package com.stripe.android.crypto.onramp.exception
 import android.content.Context
 import com.stripe.android.core.StripeError
 import com.stripe.android.core.exception.StripeException
-import com.stripe.android.core.version.StripeSdkVersion
 import com.stripe.android.crypto.onramp.R
 import com.stripe.android.crypto.onramp.analytics.OnrampAnalyticsEvent
 
@@ -11,13 +10,14 @@ internal fun Throwable.toCryptoOnrampError(
     context: Context,
     operation: OnrampAnalyticsEvent.ErrorOccurred.Operation,
     publishableKey: String?,
+    additionalSdkVersions: List<SDKVersion> = emptyList(),
 ): Throwable {
     if (this is StripeCryptoOnrampError) return this
 
     val stripeException = this as? StripeException ?: return this
     val stripeError = stripeException.stripeError ?: return this
     val apiUserMessage = stripeError.extraFields?.get(FIELD_USER_MESSAGE)?.takeIf { it.isNotBlank() }
-    val sdkVersion = StripeSdkVersion.VERSION
+    val sdkVersions = listOf(SDKVersion.stripeAndroid) + additionalSdkVersions
 
     val apiErrorContext = APIErrorContext(
         reason = stripeError.extraFields?.get(FIELD_REASON),
@@ -35,7 +35,7 @@ internal fun Throwable.toCryptoOnrampError(
     return if (stripeError.isAppAttestationError()) {
         AppAttestationException(
             context = apiErrorContext,
-            sdkVersion = sdkVersion,
+            sdkVersions = sdkVersions,
             fallbackUserMessage = context.getString(
                 R.string.stripe_onramp_app_attestation_default_user_message,
             ),
@@ -43,7 +43,7 @@ internal fun Throwable.toCryptoOnrampError(
     } else {
         UncategorizedApiErrorException(
             context = apiErrorContext,
-            sdkVersion = sdkVersion,
+            sdkVersions = sdkVersions,
             fallbackUserMessage = context.getString(
                 R.string.stripe_onramp_default_api_error_user_message,
             ),
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/SDKVersion.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/SDKVersion.kt
new file mode 100644
index 00000000000..ce2ee5da974
--- /dev/null
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/SDKVersion.kt
@@ -0,0 +1,35 @@
+package com.stripe.android.crypto.onramp.exception
+
+import com.stripe.android.core.version.StripeSdkVersion
+import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+
+/**
+ * A wrapper SDK name and version pair included in developer diagnostics.
+ *
+ * Do not use this type for the Stripe Android SDK version. Stripe Android is always included
+ * automatically.
+ */
+@ExperimentalCryptoOnramp
+data class SDKVersion(
+    /**
+     * The SDK name.
+     */
+    val name: String,
+    /**
+     * The SDK version.
+     */
+    val version: String,
+) {
+    /**
+     * A developer-facing SDK version description.
+     */
+    val debugDescription: String
+        get() = "$name@$version"
+
+    internal companion object {
+        val stripeAndroid = SDKVersion(
+            name = "stripe-android",
+            version = StripeSdkVersion.VERSION,
+        )
+    }
+}
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError.kt
index ec305ed9d12..495f9a2d3cb 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError.kt
@@ -31,9 +31,10 @@ interface StripeCryptoOnrampError {
     val docUrl: String?
 
     /**
-     * The SDK version that produced this error.
+     * SDK versions included in developer diagnostics, including Stripe Android and any
+     * additional wrapper SDK versions.
      */
-    val sdkVersion: String
+    val sdkVersions: List<SDKVersion>
 
     /**
      * The original cause that was mapped into this richer Crypto Onramp error.
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
index 6a0fe3f2235..28846d09fb6 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
@@ -8,14 +8,14 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 @ExperimentalCryptoOnramp
 class UncategorizedApiErrorException internal constructor(
     context: APIErrorContext,
-    sdkVersion: String,
+    sdkVersions: List<SDKVersion>,
     fallbackUserMessage: String,
 ) : CryptoOnrampApiException(
     context = context,
+    sdkVersions = sdkVersions,
     userMessage = context.userMessage(fallbackUserMessage),
     developerMessage = CryptoOnrampErrorRenderer.renderGenericApiDeveloperMessage(
         context = context,
-        sdkVersion = sdkVersion,
+        sdkVersions = sdkVersions,
     ),
-    sdkVersion = sdkVersion,
 )
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampConfiguration.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampConfiguration.kt
index 5b8a55d28a5..8a284ca5182 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampConfiguration.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/model/OnrampConfiguration.kt
@@ -1,6 +1,8 @@
 package com.stripe.android.crypto.onramp.model
 
+import androidx.annotation.RestrictTo
 import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
+import com.stripe.android.crypto.onramp.exception.SDKVersion
 import com.stripe.android.googlepaylauncher.GooglePayPaymentMethodLauncher
 import com.stripe.android.link.LinkAppearance
 
@@ -12,6 +14,7 @@ import com.stripe.android.link.LinkAppearance
  * @property appearance Appearance settings for the PaymentSheet UI.
  * @property cryptoCustomerId The unique customer ID for crypto onramp.
  * @property googlePayConfig The configuration for Google Pay, if Google Pay is supported by the merchant.
+ * @property additionalSdkVersions Additional wrapper SDK versions to include in developer diagnostics.
  */
 @ExperimentalCryptoOnramp
 class OnrampConfiguration {
@@ -20,6 +23,7 @@ class OnrampConfiguration {
     private var appearance: LinkAppearance? = null
     private var cryptoCustomerId: String? = null
     private var googlePayConfig: GooglePayPaymentMethodLauncher.Config? = null
+    private var additionalSdkVersions: List<SDKVersion> = emptyList()
 
     /**
      * Sets the display name of the merchant.
@@ -57,12 +61,23 @@ class OnrampConfiguration {
         this.googlePayConfig = googlePayConfig
     }
 
+    /**
+     * Additional wrapper SDK versions to include in developer diagnostics, such as the
+     * Stripe React Native SDK version. Do not include Stripe Android; it is always included
+     * automatically.
+     */
+    @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
+    fun additionalSdkVersions(additionalSdkVersions: List<SDKVersion>) = apply {
+        this.additionalSdkVersions = additionalSdkVersions
+    }
+
     internal class State(
         val merchantDisplayName: String,
         val publishableKey: String,
         val appearance: LinkAppearance,
         val cryptoCustomerId: String? = null,
-        val googlePayConfig: GooglePayPaymentMethodLauncher.Config? = null
+        val googlePayConfig: GooglePayPaymentMethodLauncher.Config? = null,
+        val additionalSdkVersions: List<SDKVersion> = emptyList()
     )
 
     internal fun build(): State {
@@ -75,7 +90,8 @@ class OnrampConfiguration {
             },
             appearance = appearance ?: LinkAppearance(),
             cryptoCustomerId = cryptoCustomerId,
-            googlePayConfig = googlePayConfig
+            googlePayConfig = googlePayConfig,
+            additionalSdkVersions = additionalSdkVersions
         )
     }
 }
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index 6876de62115..a96d761fd09 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -15,6 +15,7 @@ import com.stripe.android.crypto.onramp.exception.MissingConsumerSecretException
 import com.stripe.android.crypto.onramp.exception.MissingCryptoCustomerException
 import com.stripe.android.crypto.onramp.exception.MissingPaymentMethodException
 import com.stripe.android.crypto.onramp.exception.PaymentFailedException
+import com.stripe.android.crypto.onramp.exception.SDKVersion
 import com.stripe.android.crypto.onramp.exception.UncategorizedApiErrorException
 import com.stripe.android.crypto.onramp.model.CreatePaymentTokenResponse
 import com.stripe.android.crypto.onramp.model.CrsCarfDeclaration
@@ -311,7 +312,9 @@ class OnrampInteractorTest {
         assertThat(apiError.context.apiErrorType).isNull()
         assertThat(apiError.code).isEqualTo("email_blocked")
         assertThat(apiError.docUrl).isEqualTo("https://stripe.com/docs/error-codes/email_blocked")
-        assertThat(apiError.sdkVersion).isNotEmpty()
+        assertThat(apiError.sdkVersions).hasSize(1)
+        assertThat(apiError.sdkVersions.single().name).isEqualTo("stripe-android")
+        assertThat(apiError.sdkVersions.single().version).isNotEmpty()
         assertThat(apiError.underlyingError).isSameInstanceAs(apiError.context.underlyingError)
         assertThat(apiError.developerMessage)
             .isEqualTo(
@@ -328,11 +331,55 @@ class OnrampInteractorTest {
                 Code: email_blocked
                 Next step: Inspect the preserved Stripe API error for details and retry after correcting the request.
                 Docs: https://stripe.com/docs/error-codes/email_blocked
-                SDK: stripe-android@${apiError.sdkVersion}
+                SDK: ${apiError.sdkVersions.single().debugDescription}
                 """.trimIndent()
             )
     }
 
+    @Test
+    fun testHasLinkAccountIncludesAdditionalSdkVersionsInDeveloperMessage() = runTest {
+        whenever(linkController.configure(any())).thenReturn(ConfigureResult.Success)
+        val failedResult = mock<LinkController.LookupConsumerResult.Failed> {
+            on { email } doReturn "test@example.com"
+            on { error } doReturn InvalidRequestException(
+                stripeError = StripeError(
+                    code = "link_failed_to_attest_request",
+                    message = "App attestation failed",
+                    extraFields = mapOf(
+                        "reason" to "app_not_play_recognized",
+                    )
+                ),
+                requestId = "req_456",
+                statusCode = 400,
+            )
+        }
+        whenever(linkController.lookupConsumer(any())).thenReturn(failedResult)
+
+        interactor.configure(
+            createConfigurationState(
+                additionalSdkVersions = listOf(
+                    SDKVersion(name = "stripe-react-native", version = "1.2.3"),
+                ),
+            ),
+        )
+
+        val result = interactor.hasLinkAccount("test@example.com")
+
+        assertThat(result).isInstanceOf(OnrampHasLinkAccountResult.Failed::class.java)
+
+        val error = (result as OnrampHasLinkAccountResult.Failed).error
+        assertThat(error).isInstanceOf(AppAttestationException::class.java)
+
+        val attestationError = error as AppAttestationException
+        assertThat(attestationError.sdkVersions).containsExactly(
+            SDKVersion(name = "stripe-android", version = attestationError.sdkVersions.first().version),
+            SDKVersion(name = "stripe-react-native", version = "1.2.3"),
+        ).inOrder()
+        assertThat(attestationError.developerMessage).contains(
+            "SDK: stripe-android@${attestationError.sdkVersions.first().version}, stripe-react-native@1.2.3"
+        )
+    }
+
     @Test
     fun uncategorizedApiErrorExceptionFallsBackToSafeUserMessage() = runTest {
         val application = mock<Application> {
@@ -1263,12 +1310,16 @@ class OnrampInteractorTest {
         consumerSessionClientSecret = null
     )
 
-    private fun createConfigurationState(cryptoCustomerId: String? = null): OnrampConfiguration.State =
+    private fun createConfigurationState(
+        cryptoCustomerId: String? = null,
+        additionalSdkVersions: List<SDKVersion> = emptyList(),
+    ): OnrampConfiguration.State =
         OnrampConfiguration()
             .merchantDisplayName("merchant-display-name")
             .publishableKey("pk_test_12345")
             .appearance(mock())
             .cryptoCustomerId(cryptoCustomerId)
+            .additionalSdkVersions(additionalSdkVersions)
             .build()
 
     private fun createInteractor(
@@ -1316,7 +1367,9 @@ class OnrampInteractorTest {
         assertThat(attestationError.context.apiErrorType).isEqualTo("api_error")
         assertThat(attestationError.code).isEqualTo("link_failed_to_attest_request")
         assertThat(attestationError.docUrl).isNull()
-        assertThat(attestationError.sdkVersion).isNotEmpty()
+        assertThat(attestationError.sdkVersions).hasSize(1)
+        assertThat(attestationError.sdkVersions.single().name).isEqualTo("stripe-android")
+        assertThat(attestationError.sdkVersions.single().version).isNotEmpty()
         assertThat(attestationError.underlyingError).isSameInstanceAs(backendError)
         assertThat(attestationError.developerMessage)
             .isEqualTo(
@@ -1333,7 +1386,7 @@ class OnrampInteractorTest {
 
                 Code: link_failed_to_attest_request
                 Next step: Install the app from a Google Play testing or production track and retry the Onramp flow. Internal, closed, open testing, and production tracks are supported. Debug builds and sideloaded APKs will not pass this check.
-                SDK: stripe-android@${attestationError.sdkVersion}
+                SDK: ${attestationError.sdkVersions.single().debugDescription}
                 """.trimIndent()
             )
     }

From fdd17898881dc77d4d4518bbfc66c5c8fe411861 Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Thu, 4 Jun 2026 16:51:23 -0400
Subject: [PATCH 56/57] Update crypto-onramp.api

---
 crypto-onramp/api/crypto-onramp.api | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index a2cb693b882..8cdddd8efaf 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -284,7 +284,6 @@ public final class com/stripe/android/crypto/onramp/model/OnrampCollectPaymentMe
 public final class com/stripe/android/crypto/onramp/model/OnrampConfiguration {
 	public static final field $stable I
 	public fun <init> ()V
-	public final fun additionalSdkVersions (Ljava/util/List;)Lcom/stripe/android/crypto/onramp/model/OnrampConfiguration;
 	public final fun appearance (Lcom/stripe/android/link/LinkAppearance;)Lcom/stripe/android/crypto/onramp/model/OnrampConfiguration;
 	public final fun cryptoCustomerId (Ljava/lang/String;)Lcom/stripe/android/crypto/onramp/model/OnrampConfiguration;
 	public final fun googlePayConfig (Lcom/stripe/android/googlepaylauncher/GooglePayPaymentMethodLauncher$Config;)Lcom/stripe/android/crypto/onramp/model/OnrampConfiguration;

From b27bd276b2e9ee94591442243eb5409039af664e Mon Sep 17 00:00:00 2001
From: Twig <aharris.1990@gmail.com>
Date: Mon, 8 Jun 2026 10:03:55 -0400
Subject: [PATCH 57/57] Make code non-optional, prefer userMessage to
 apiUserMessage

---
 crypto-onramp/api/crypto-onramp.api           |  3 ++-
 .../exception/AppAttestationException.kt      | 18 ++++++++++---
 .../exception/CryptoOnrampApiException.kt     |  7 ++---
 .../exception/CryptoOnrampErrorRenderer.kt    | 11 ++++----
 .../onramp/exception/OnrampErrorMapper.kt     |  7 +++--
 .../exception/StripeCryptoOnrampError.kt      |  4 +--
 .../UncategorizedApiErrorException.kt         | 12 ++++++---
 .../crypto/onramp/OnrampInteractorTest.kt     | 27 ++++++++++++++-----
 8 files changed, 59 insertions(+), 30 deletions(-)

diff --git a/crypto-onramp/api/crypto-onramp.api b/crypto-onramp/api/crypto-onramp.api
index 8cdddd8efaf..886899b9607 100644
--- a/crypto-onramp/api/crypto-onramp.api
+++ b/crypto-onramp/api/crypto-onramp.api
@@ -67,11 +67,11 @@ public final class com/stripe/android/crypto/onramp/exception/APIErrorContext {
 
 public final class com/stripe/android/crypto/onramp/exception/AppAttestationException : com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException {
 	public static final field $stable I
+	public fun getCode ()Ljava/lang/String;
 }
 
 public abstract class com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException : com/stripe/android/core/exception/StripeException, com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError {
 	public static final field $stable I
-	public final fun getCode ()Ljava/lang/String;
 	public final fun getContext ()Lcom/stripe/android/crypto/onramp/exception/APIErrorContext;
 	public final fun getDeveloperMessage ()Ljava/lang/String;
 	public final fun getDocUrl ()Ljava/lang/String;
@@ -128,6 +128,7 @@ public abstract interface class com/stripe/android/crypto/onramp/exception/Strip
 
 public final class com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException : com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException {
 	public static final field $stable I
+	public fun getCode ()Ljava/lang/String;
 }
 
 public final class com/stripe/android/crypto/onramp/model/CryptoNetwork : java/lang/Enum {
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
index ffbbe947e7d..93d81a0fca4 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/AppAttestationException.kt
@@ -9,15 +9,23 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 class AppAttestationException internal constructor(
     context: APIErrorContext,
     sdkVersions: List<SDKVersion>,
-    fallbackUserMessage: String,
+    userMessage: String,
 ) : CryptoOnrampApiException(
     context = context,
     sdkVersions = sdkVersions,
-    userMessage = context.userMessage(fallbackUserMessage),
-    developerMessage = buildAppAttestationDeveloperMessage(context, sdkVersions),
-)
+    userMessage = userMessage,
+    developerMessage = buildAppAttestationDeveloperMessage(
+        context = context,
+        code = context.code(fallback = APP_ATTESTATION_ERROR_CODE),
+        sdkVersions = sdkVersions,
+    ),
+) {
+    override val code: String
+        get() = context.code(fallback = APP_ATTESTATION_ERROR_CODE)
+}
 
 private const val ATTESTATION_NOT_ENABLED_REASON = "attestation_not_enabled"
+internal const val APP_ATTESTATION_ERROR_CODE = "link_failed_to_attest_request"
 private const val APP_NOT_REGISTERED_REASON = "app_not_registered"
 private const val ATTESTATION_DATA_MISSING_REASON = "attestation_data_missing"
 private const val APP_NOT_PLAY_RECOGNIZED_REASON = "app_not_play_recognized"
@@ -93,12 +101,14 @@ private fun attestationSummary(description: String): String {
 
 private fun buildAppAttestationDeveloperMessage(
     context: APIErrorContext,
+    code: String,
     sdkVersions: List<SDKVersion>,
 ): String {
     return CryptoOnrampErrorRenderer.renderApiDeveloperMessage(
         context = context,
         summary = appAttestationSummary(context.reason)
             ?: (context.apiErrorMessage ?: "App attestation failed."),
+        code = code,
         nextStep = appAttestationNextStep(context.reason),
         sdkVersions = sdkVersions,
     )
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException.kt
index 66a122849bb..ff59e95fe09 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampApiException.kt
@@ -26,9 +26,6 @@ abstract class CryptoOnrampApiException internal constructor(
     message = userMessage,
 ),
 StripeCryptoOnrampError {
-    final override val code: String?
-        get() = context.apiErrorCode
-
     final override val docUrl: String?
         get() = context.docUrl
 
@@ -90,6 +87,6 @@ data class APIErrorContext(
         get() = underlyingError.requestId
 }
 
-internal fun APIErrorContext.userMessage(fallbackUserMessage: String): String {
-    return apiUserMessage ?: fallbackUserMessage
+internal fun APIErrorContext.code(fallback: String): String {
+    return apiErrorCode ?: fallback
 }
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt
index 1f7f420e543..a3dff5addf0 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/CryptoOnrampErrorRenderer.kt
@@ -3,11 +3,13 @@ package com.stripe.android.crypto.onramp.exception
 internal object CryptoOnrampErrorRenderer {
     fun renderGenericApiDeveloperMessage(
         context: APIErrorContext,
+        code: String,
         sdkVersions: List<SDKVersion>,
     ): String {
         return renderApiDeveloperMessage(
             context = context,
             summary = context.apiErrorMessage ?: "Stripe API request failed.",
+            code = code,
             nextStep = "Inspect the preserved Stripe API error for details and retry after correcting the request.",
             sdkVersions = sdkVersions,
         )
@@ -16,13 +18,14 @@ internal object CryptoOnrampErrorRenderer {
     fun renderApiDeveloperMessage(
         context: APIErrorContext,
         summary: String,
+        code: String,
         nextStep: String,
         sdkVersions: List<SDKVersion>,
     ): String {
         return renderDeveloperMessage(
             summary = summary,
             requestContext = requestContextLines(context),
-            code = context.apiErrorCode,
+            code = code,
             nextStep = nextStep,
             docUrl = context.docUrl,
             sdkVersions = sdkVersions,
@@ -32,15 +35,13 @@ internal object CryptoOnrampErrorRenderer {
     private fun renderDeveloperMessage(
         summary: String,
         requestContext: List<String>,
-        code: String?,
+        code: String,
         nextStep: String,
         docUrl: String?,
         sdkVersions: List<SDKVersion>,
     ): String {
         val footer = buildList {
-            code?.let {
-                add("Code: $it")
-            }
+            add("Code: $code")
             add("Next step: $nextStep")
             docUrl?.let {
                 add("Docs: $it")
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
index 45c4e97afc7..1eb11bdef2b 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/OnrampErrorMapper.kt
@@ -36,7 +36,7 @@ internal fun Throwable.toCryptoOnrampError(
         AppAttestationException(
             context = apiErrorContext,
             sdkVersions = sdkVersions,
-            fallbackUserMessage = context.getString(
+            userMessage = context.getString(
                 R.string.stripe_onramp_app_attestation_default_user_message,
             ),
         )
@@ -44,7 +44,7 @@ internal fun Throwable.toCryptoOnrampError(
         UncategorizedApiErrorException(
             context = apiErrorContext,
             sdkVersions = sdkVersions,
-            fallbackUserMessage = context.getString(
+            userMessage = context.getString(
                 R.string.stripe_onramp_default_api_error_user_message,
             ),
         )
@@ -52,7 +52,7 @@ internal fun Throwable.toCryptoOnrampError(
 }
 
 private fun StripeError.isAppAttestationError(): Boolean {
-    return code == ERROR_CODE_APP_ATTESTATION_FAILED
+    return code == APP_ATTESTATION_ERROR_CODE
 }
 
 private fun StripeException.apiErrorType(): String? {
@@ -68,6 +68,5 @@ private fun String?.toMode(): String? {
     }
 }
 
-private const val ERROR_CODE_APP_ATTESTATION_FAILED = "link_failed_to_attest_request"
 private const val FIELD_REASON = "reason"
 private const val FIELD_USER_MESSAGE = "user_message"
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError.kt
index 495f9a2d3cb..e5f1dc24582 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/StripeCryptoOnrampError.kt
@@ -21,9 +21,9 @@ interface StripeCryptoOnrampError {
     val developerMessage: String
 
     /**
-     * A stable error code, when available.
+     * A stable SDK-owned error code.
      */
-    val code: String?
+    val code: String
 
     /**
      * A documentation URL for recovery guidance, when available.
diff --git a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
index 28846d09fb6..df3eaa46a59 100644
--- a/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
+++ b/crypto-onramp/src/main/java/com/stripe/android/crypto/onramp/exception/UncategorizedApiErrorException.kt
@@ -9,13 +9,19 @@ import com.stripe.android.crypto.onramp.ExperimentalCryptoOnramp
 class UncategorizedApiErrorException internal constructor(
     context: APIErrorContext,
     sdkVersions: List<SDKVersion>,
-    fallbackUserMessage: String,
+    userMessage: String,
 ) : CryptoOnrampApiException(
     context = context,
     sdkVersions = sdkVersions,
-    userMessage = context.userMessage(fallbackUserMessage),
+    userMessage = userMessage,
     developerMessage = CryptoOnrampErrorRenderer.renderGenericApiDeveloperMessage(
         context = context,
+        code = context.code(fallback = UNCATEGORIZED_API_ERROR_CODE),
         sdkVersions = sdkVersions,
     ),
-)
+) {
+    override val code: String
+        get() = context.code(fallback = UNCATEGORIZED_API_ERROR_CODE)
+}
+
+private const val UNCATEGORIZED_API_ERROR_CODE = "uncategorized_api_error"
diff --git a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
index a96d761fd09..4eb56612159 100644
--- a/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
+++ b/crypto-onramp/src/test/java/com/stripe/android/crypto/onramp/OnrampInteractorTest.kt
@@ -267,8 +267,13 @@ class OnrampInteractorTest {
         assertThat(attestationError.context.reason).isEqualTo("app_not_play_recognized")
         assertThat(attestationError.context.mode).isEqualTo("test")
         assertThat(attestationError.context.apiErrorType).isNull()
-        assertThat(attestationError.message)
+        assertThat(attestationError.context.apiUserMessage)
             .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
+        assertThat(attestationError.message)
+            .isEqualTo(
+                "This app couldn't be verified due to an attestation error. Please try again later " +
+                    "or contact the developer if the issue persists."
+            )
         assertThat(attestationError.developerMessage).contains("Request Context:")
         assertThat(attestationError.developerMessage).contains("operation: has_link_account")
         assertThat(attestationError.developerMessage).contains("request_id: req_456")
@@ -307,8 +312,9 @@ class OnrampInteractorTest {
 
         val apiError = error as UncategorizedApiErrorException
         assertThat(apiError.context.reason).isEqualTo("email_blocked")
-        assertThat(apiError.userMessage).isEqualTo("This email can't be used. Try another one.")
-        assertThat(apiError.message).isEqualTo("This email can't be used. Try another one.")
+        assertThat(apiError.context.apiUserMessage).isEqualTo("This email can't be used. Try another one.")
+        assertThat(apiError.userMessage).isEqualTo("Something went wrong. Please try again later.")
+        assertThat(apiError.message).isEqualTo("Something went wrong. Please try again later.")
         assertThat(apiError.context.apiErrorType).isNull()
         assertThat(apiError.code).isEqualTo("email_blocked")
         assertThat(apiError.docUrl).isEqualTo("https://stripe.com/docs/error-codes/email_blocked")
@@ -400,7 +406,6 @@ class OnrampInteractorTest {
             on { email } doReturn "test@example.com"
             on { error } doReturn InvalidRequestException(
                 stripeError = StripeError(
-                    code = "unknown_error",
                     message = "Developer-facing message"
                 ),
                 requestId = "req_999",
@@ -421,8 +426,10 @@ class OnrampInteractorTest {
         val apiError = error as UncategorizedApiErrorException
         assertThat(apiError.userMessage).isEqualTo("Something went wrong. Please try again later.")
         assertThat(apiError.message).isEqualTo("Something went wrong. Please try again later.")
+        assertThat(apiError.code).isEqualTo("uncategorized_api_error")
         assertThat(apiError.context.apiErrorType).isNull()
         assertThat(apiError.developerMessage).contains("Developer-facing message")
+        assertThat(apiError.developerMessage).contains("Code: uncategorized_api_error")
         assertThat(apiError.developerMessage).contains("Next step:")
         assertThat(apiError.developerMessage)
             .contains("Inspect the preserved Stripe API error for details and retry after correcting the request.")
@@ -1358,10 +1365,18 @@ class OnrampInteractorTest {
         attestationError: AppAttestationException,
         backendError: APIException,
     ) {
-        assertThat(attestationError.userMessage)
+        assertThat(attestationError.context.apiUserMessage)
             .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
+        assertThat(attestationError.userMessage)
+            .isEqualTo(
+                "This app couldn't be verified due to an attestation error. Please try again later " +
+                    "or contact the developer if the issue persists."
+            )
         assertThat(attestationError.message)
-            .isEqualTo("This app couldn't be verified. Install it from Google Play and try again.")
+            .isEqualTo(
+                "This app couldn't be verified due to an attestation error. Please try again later " +
+                    "or contact the developer if the issue persists."
+            )
         assertThat(attestationError.context.reason).isEqualTo("app_not_play_recognized")
         assertThat(attestationError.context.mode).isEqualTo("test")
         assertThat(attestationError.context.apiErrorType).isEqualTo("api_error")