Skip to content

fix(onramp): dismiss Google Pay sheet on commit_error #742

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
May 20, 2026
Merged

fix(onramp): dismiss Google Pay sheet on commit_error #742

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
24 changes: 15 additions & 9 deletions ...h/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampWebview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ private fun WebView.configureForCoinbaseOnRamp(

val autoClickTriggered = AtomicBoolean(false)
val terminalEventReceived = AtomicBoolean(false)
val paymentSheetPresented = AtomicBoolean(false)
var messageListenerInstalled = false

var initialTimeoutRunnable: Runnable? = null
Expand All @@ -89,6 +90,15 @@ private fun WebView.configureForCoinbaseOnRamp(
paymentSheetTimeoutRunnable?.let { removeCallbacks(it) }
}

fun dismissPaymentSheet() {
(context as? Activity)?.let { activity ->
val intent = Intent(activity, activity::class.java).apply {
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
}
activity.startActivity(intent)
}
}

val timeoutAction = Runnable {
if (terminalEventReceived.compareAndSet(false, true)) {
trace(
Expand Down Expand Up @@ -118,6 +128,9 @@ private fun WebView.configureForCoinbaseOnRamp(
val wrappedOnPaymentFailure: (CoinbaseOnRampWebError) -> Unit = { error ->
terminalEventReceived.set(true)
post { cancelAllTimeouts() }
if (paymentSheetPresented.get()) {
post { dismissPaymentSheet() }
}
onPaymentFailure(error)
}

Expand All @@ -135,20 +148,13 @@ private fun WebView.configureForCoinbaseOnRamp(
if (terminalEventReceived.compareAndSet(false, true)) {
trace(tag = "CoinbaseOnRamp", message = "Payment sheet timeout fired (60s)")
cancelAllTimeouts()
// The Google Pay sheet is a GMS Activity sitting on top of ours
// in the task stack. Relaunching our Activity with CLEAR_TOP
// finishes everything above it, dismissing the sheet.
(context as? Activity)?.let { activity ->
val intent = Intent(activity, activity::class.java).apply {
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
}
activity.startActivity(intent)
}
dismissPaymentSheet()
onPaymentFailure(CoinbaseOnRampWebError.PaymentSheetTimeout())
}
}

val pauseWatchdog: () -> Unit = {
paymentSheetPresented.set(true)
post {
cancelAllTimeouts()
val runnable = Runnable { paymentSheetTimeoutAction.run() }
Expand Down
Loading