Skip to content

fix(add-money): stop pushing Coinbase email verification twice #1096

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
bmc08gt merged 1 commit into from
Jul 17, 2026
+16 −4
Merged

fix(add-money): stop pushing Coinbase email verification twice #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ...ts/src/main/kotlin/com/flipcash/app/payments/internal/InternalPurchaseMethodController.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,18 @@ class InternalPurchaseMethodController @Inject constructor(
PurchaseMethod.CoinbaseOnRamp -> {
val profile = userManager.profile
val needsPhone = profile?.verifiedPhoneNumber == null
val email = profile?.email?.value
val needsEmailVerification = userFlags.resolvedFlags.value
.requireCoinbaseEmailVerification.effectiveValue
val needsEmail = needsEmailVerification || email == null
// Match CoinbaseOnRampController.resolveEmail(): when verification is required only a
// server-verified email is usable, otherwise any entered email counts. Diverging here
// (forcing verification whenever the flag is on) made this gate disagree with the
// purchase-time check and could send an already-verified user to verification.
val email = if (needsEmailVerification) {
profile?.verifiedEmailAddress
} else {
profile?.email?.value
}
val needsEmail = email == null
trace("needsPhone: $needsPhone, needsEmail: $needsEmail, needsEmailVerification: $needsEmailVerification")
val swapRoute = AppRoute.Token.Swap(
purpose = SwapPurpose.Buy(Mint.usdf, FundingSource.Coinbase),
Expand Down
8 changes: 6 additions & 2 deletions apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SwapViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1138,6 +1138,12 @@ class SwapViewModel @Inject constructor(
.onEach { (method, metadata) ->
when (method) {
PurchaseMethod.CoinbaseOnRamp -> {
// The add-money deposit sheet (presentDepositOptions) emits a Plain
// selection with no amount and owns its own email/phone gate + navigation.
// Only react to an actual purchase (which carries an amount) here — reacting
// to the deposit selection would push the verification screen a second time.
val amount = metadata.purchaseAmount ?: return@onEach

analytics.buttonTapped(Button.TokenBuyWithCoinbase)
dispatchEvent(Event.CoinbaseSelected)

Expand All @@ -1163,8 +1169,6 @@ class SwapViewModel @Inject constructor(
return@onEach
}

val amount = metadata.purchaseAmount ?: return@onEach

if (amount < minimumCoinbasePurchaseAmount) {
BottomBarManager.showAlert(
title = resources.getString(R.string.error_title_onrampAmountTooLow),
Expand Down
Loading