fix(onramp/coinbase): poll lookupOrder for txHash + pass amount through TxProcessing

bmc08gt · bmc08gt · commit c18ad344cbd4 · 2026-04-29T09:52:27.000-04:00
lookupOrder() is called once after payment but txHash may not yet be
populated by Coinbase. Poll with 3s intervals (100 attempts / ~5min
timeout) using the new pollUntil utility until txHash appears.

Also threads the purchase amount from CoinbaseOnRampState.Completed
through to TxProcessing and SwapViewModel so the UI can display it.

Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/navigation/AppScreenContent.kt b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/navigation/AppScreenContent.kt
@@ -109,7 +109,7 @@ fun appEntryProvider(
         SwapFlowScreen(route = key, resultStateRegistry = resultStateRegistry)
     }
     annotatedEntry<AppRoute.Token.TxProcessing> { key ->
-        TokenTxProcessingScreen(key.swapId, key.swapPurpose, key.awaitExternalWallet, key.isFundingShortfall)
+        TokenTxProcessingScreen(key.swapId, key.swapPurpose, key.amount, key.awaitExternalWallet, key.isFundingShortfall)
     }
     annotatedEntry<AppRoute.Token.OnRamp> { key -> OnRampCustomAmountScreen(key.mint) }
     annotatedEntry<AppRoute.Token.Discovery> { TokenDiscoveryScreen() }
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/AppRoute.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/AppRoute.kt
@@ -16,6 +16,7 @@ import com.flipcash.app.core.withdrawal.WithdrawalStep
 import com.getcode.navigation.NonDismissableRoute
 import com.getcode.navigation.NonDraggableRoute
 import com.getcode.navigation.flow.FlowRouteWithResult
+import com.getcode.opencode.exchange.VerifiedFiat
 import com.getcode.opencode.internal.solana.model.SwapId
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.solana.keys.Mint
@@ -139,6 +140,7 @@ sealed interface AppRoute : NavKey, Parcelable {
         data class TxProcessing(
             val swapId: SwapId,
             val swapPurpose: SwapPurpose? = null,
+            val amount: VerifiedFiat? = null,
             val awaitExternalWallet: Boolean = false,
             val isFundingShortfall: Boolean = false,
         ) : Token, NonDismissableRoute, NonDraggableRoute
diff --git a/apps/flipcash/features/onramp/src/main/kotlin/com/flipcash/app/onramp/OnRampCustomAmountScreen.kt b/apps/flipcash/features/onramp/src/main/kotlin/com/flipcash/app/onramp/OnRampCustomAmountScreen.kt
@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
@@ -14,6 +15,7 @@ import com.flipcash.app.onramp.internal.OnRampViewModel
 import com.flipcash.app.onramp.internal.screens.OnRampAmountScreen
 import com.flipcash.features.onramp.R
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.ui.components.AppBarWithTitle
 import kotlinx.coroutines.flow.filterIsInstance
@@ -26,13 +28,14 @@ fun OnRampCustomAmountScreen(mint: Mint) {
     val navigator = LocalCodeNavigator.current
     val viewModel = hiltViewModel<OnRampViewModel>()
 
+    val state by viewModel.stateFlow.collectAsStateWithLifecycle()
     Column(
         modifier = Modifier.fillMaxSize(),
     ) {
         AppBarWithTitle(
             title = stringResource(R.string.title_amountToBuy),
             isInModal = true,
-            backButton = true,
+            backButton = state.orderLookup.isIdle,
             onBackIconClicked = { navigator.pop() },
             titleAlignment = Alignment.CenterHorizontally,
         )
diff --git a/apps/flipcash/features/onramp/src/main/kotlin/com/flipcash/app/onramp/internal/OnRampViewModel.kt b/apps/flipcash/features/onramp/src/main/kotlin/com/flipcash/app/onramp/internal/OnRampViewModel.kt
@@ -98,6 +98,7 @@ internal class OnRampViewModel @Inject constructor(
         val hasVerifiedEmail: Boolean = false,
         val selectedProvider: OnRampProvider.ThirdParty? = null,
         val amountEntryState: AmountEntryState = AmountEntryState(),
+        val orderLookup: LoadingSuccessState = LoadingSuccessState(),
     ) {
         val minimumPurchaseAmount = 5.toFiat()
     }
@@ -132,6 +133,11 @@ internal class OnRampViewModel @Inject constructor(
             val success: Boolean = false
         ) : Event
 
+        data class UpdateOrderLookupState(
+            val loading: Boolean = false,
+            val success: Boolean = false
+        ): Event
+
         data class OnAmountAccepted(val amount: VerifiedFiat) : Event
 
         data class CreateAndSendTransactionToWallet(val amount: VerifiedFiat) : Event
@@ -158,10 +164,13 @@ internal class OnRampViewModel @Inject constructor(
         numberInputHelper.reset()
 
         onRampController.state
-            .filter { it !is CoinbaseOnRampState.Paying }
-            .onEach {
-                if (stateFlow.value.amountEntryState.confirmingAmount.loading) {
-                    dispatchEvent(Event.UpdateConfirmingAmountState())
+            .onEach { s ->
+                when (s) {
+                    is CoinbaseOnRampState.Completed -> dispatchEvent(Event.UpdateOrderLookupState(success = true))
+                    is CoinbaseOnRampState.Failed -> dispatchEvent(Event.UpdateOrderLookupState())
+                    CoinbaseOnRampState.Idle -> dispatchEvent(Event.UpdateOrderLookupState())
+                    is CoinbaseOnRampState.Paying -> dispatchEvent(Event.UpdateOrderLookupState(loading = true))
+                    is CoinbaseOnRampState.Processing -> dispatchEvent(Event.UpdateOrderLookupState(loading = true))
                 }
             }
             .launchIn(viewModelScope)
@@ -452,6 +461,16 @@ internal class OnRampViewModel @Inject constructor(
                     )
                 }
 
+                is Event.UpdateOrderLookupState -> { state ->
+                    val lookupState = state.orderLookup
+                    state.copy(
+                        orderLookup = lookupState.copy(
+                            loading = event.loading,
+                            success = event.success,
+                        )
+                    )
+                }
+
                 is Event.OnVerificationNeeded,
                 is Event.CreateAndSendTransactionToWallet,
                 Event.OnAmountConfirmed,
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenTxProcessingScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenTxProcessingScreen.kt
@@ -21,7 +21,9 @@ import com.flipcash.app.tokens.ui.SwapViewModel.Event
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.navigation.flow.flowSharedViewModel
 import com.getcode.navigation.flow.rememberFlowNavigator
+import com.getcode.opencode.exchange.VerifiedFiat
 import com.getcode.opencode.internal.solana.model.SwapId
+import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.view.LoadingSuccessState
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.firstOrNull
@@ -98,6 +100,7 @@ internal fun SwapProcessingContent(
 fun TokenTxProcessingScreen(
     swapId: SwapId,
     swapPurpose: SwapPurpose?,
+    swapAmount: VerifiedFiat?,
     awaitExternalWallet: Boolean = false,
     isFundingShortfall: Boolean = false,
 ) {
@@ -136,6 +139,9 @@ fun TokenTxProcessingScreen(
             if (swapPurpose != null) {
                 viewModel.dispatchEvent(Event.OnPurposeChanged(swapPurpose))
             }
+            if (swapAmount != null) {
+                viewModel.dispatchEvent(Event.OnAmountAccepted(swapAmount, swapAmount.localFiat.nativeAmount))
+            }
         }
     }
 
diff --git a/apps/flipcash/shared/onramp/coinbase/build.gradle.kts b/apps/flipcash/shared/onramp/coinbase/build.gradle.kts
@@ -24,4 +24,5 @@ dependencies {
     implementation(project(":apps:flipcash:shared:web"))
     api(project(":libs:network:coinbase:onramp"))
     implementation(project(":libs:network:jwt"))
+    implementation(project(":libs:network:connectivity:public"))
 }
diff --git a/apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampController.kt b/apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampController.kt
@@ -26,7 +26,7 @@ import com.getcode.opencode.model.financial.Token
 import com.getcode.opencode.model.financial.usdf
 import com.getcode.opencode.model.transactions.SwapFundingSource
 import com.getcode.solana.keys.base58
-import com.getcode.utils.base64
+import com.getcode.utils.network.pollUntil
 import com.getcode.vendor.Base58
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.onramp.internal.CoinbaseOnRampWebError
@@ -43,6 +43,7 @@ import kotlinx.serialization.json.Json
 import retrofit2.HttpException
 import java.security.SecureRandom
 import javax.inject.Inject
+import kotlin.time.Duration.Companion.seconds
 
 typealias OrderWithPaymentLink = Pair<String, OnRampPurchaseResponse.PaymentLink>
 
@@ -121,11 +122,15 @@ class CoinbaseOnRampController @Inject constructor(
             return Result.failure(IllegalStateException("Not in Processing state"))
         }
 
-        return lookupOrder(current.orderId)
-            .mapCatching { order ->
+        return pollUntil(
+                call = { lookupOrder(current.orderId).getOrThrow() },
+                required = { order -> order.txHash != null },
+                maxAttempts = 100,
+                interval = 3.seconds,
+                tag = "CoinbaseOrderPoller",
+            ).mapCatching { order ->
                 order.txHash ?: throw IllegalStateException("No hash provided from provider")
-            }
-            .mapCatching { txHash ->
+            }.mapCatching { txHash ->
                 val owner = userManager.accountCluster
                     ?: throw IllegalStateException("No account cluster")
 
@@ -142,7 +147,7 @@ class CoinbaseOnRampController @Inject constructor(
                 ).getOrThrow()
             }
             .onSuccess { swapId ->
-                _state.update { CoinbaseOnRampState.Completed(swapId, current.token) }
+                _state.update { CoinbaseOnRampState.Completed(swapId,  current.token, current.amount) }
             }
             .onFailure {
                 reset()
diff --git a/apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampHandler.kt b/apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampHandler.kt
@@ -53,7 +53,7 @@ fun CoinbaseOnRampHandler(
         is CoinbaseOnRampState.Completed -> {
             LaunchedEffect(current) {
                 controller.emitPendingNavigation(
-                    AppRoute.Token.TxProcessing(current.swapId, SwapPurpose.Buy(current.token.address))
+                    AppRoute.Token.TxProcessing(current.swapId, SwapPurpose.Buy(current.token.address), current.amount)
                 )
                 controller.reset()
             }
diff --git a/apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampState.kt b/apps/flipcash/shared/onramp/coinbase/src/main/kotlin/com/flipcash/app/onramp/CoinbaseOnRampState.kt
@@ -18,6 +18,6 @@ sealed interface CoinbaseOnRampState {
     data object Idle : CoinbaseOnRampState
     data class Paying(val order: OnrampOrder, val token: Token, val amount: VerifiedFiat) : CoinbaseOnRampState
     data class Processing(val orderId: String, val token: Token, val amount: VerifiedFiat) : CoinbaseOnRampState
-    data class Completed(val swapId: SwapId, val token: Token) : CoinbaseOnRampState
+    data class Completed(val swapId: SwapId, val token: Token, val amount: VerifiedFiat) : CoinbaseOnRampState
     data class Failed(val error: CoinbaseOnRampWebError) : CoinbaseOnRampState
 }
diff --git a/libs/messaging/src/main/kotlin/com/getcode/manager/BottomBarManager.kt b/libs/messaging/src/main/kotlin/com/getcode/manager/BottomBarManager.kt
@@ -128,7 +128,8 @@ object BottomBarManager {
     private val _messages: MutableStateFlow<List<BottomBarMessage>> = MutableStateFlow(emptyList())
     val messages: StateFlow<List<BottomBarMessage>> get() = _messages.asStateFlow()
 
-    private fun showMessage(bottomBarMessage: BottomBarMessage) {
+    @PublishedApi
+    internal fun showMessage(bottomBarMessage: BottomBarMessage) {
         _messages.update { currentMessages ->
             currentMessages + bottomBarMessage
         }
@@ -281,21 +282,17 @@ object BottomBarManager {
      * Additional [BottomBarAction]'s can be included via [actions] and dismiss callbacks
      * are available via [onDismiss].
      */
-    fun showError(
+    inline fun showError(
         title: String,
         message: String,
         additionalInfo: Map<String, Any?> = emptyMap(),
         actions: List<BottomBarAction> = listOf(BottomBarAction.Ok),
         showCancel: Boolean = false,
-        onDismiss: (fromAction: Boolean) -> Unit = { },
+        noinline onDismiss: (fromAction: Boolean) -> Unit = { },
     ) {
         val callSite = Throwable().stackTrace
-            .firstOrNull { it.className != BottomBarManager::class.java.name }
-            ?.let {
-                val file = it.fileName
-                    ?: it.className.substringAfterLast('.').substringBefore('$')
-                "$file:${it.lineNumber}"
-            }
+            .firstOrNull { it.fileName != null }
+            ?.let { "${it.fileName}:${it.lineNumber}" }
 
         showMessage(
             BottomBarMessage(
diff --git a/libs/network/connectivity/public/src/main/kotlin/com/getcode/utils/network/Polling.kt b/libs/network/connectivity/public/src/main/kotlin/com/getcode/utils/network/Polling.kt
@@ -0,0 +1,63 @@
+package com.getcode.utils.network
+
+import com.getcode.utils.TraceType
+import com.getcode.utils.trace
+import kotlinx.coroutines.delay
+import kotlin.time.Duration
+import kotlin.time.Duration.Companion.seconds
+
+class PollTimeoutException(
+    tag: String,
+    attempts: Int,
+) : Exception("$tag: polling timed out after $attempts attempts")
+
+suspend fun <T> pollUntil(
+    call: suspend () -> T,
+    required: (T) -> Boolean,
+    maxAttempts: Int = 100,
+    interval: Duration = 3.seconds,
+    tag: String = "pollUntil",
+): Result<T> {
+    return doPoll(call, required, maxAttempts, interval, tag, attempt = 0)
+}
+
+private tailrec suspend fun <T> doPoll(
+    call: suspend () -> T,
+    predicate: (T) -> Boolean,
+    maxAttempts: Int,
+    interval: Duration,
+    tag: String,
+    attempt: Int,
+): Result<T> {
+    if (attempt >= maxAttempts) {
+        trace(
+            tag = tag,
+            type = TraceType.Error,
+            message = "Polling timed out after $maxAttempts attempts",
+        )
+        return Result.failure(PollTimeoutException(tag, maxAttempts))
+    }
+
+    if (attempt > 0) {
+        delay(interval)
+    }
+
+    val value = call()
+
+    if (predicate(value)) {
+        trace(
+            tag = tag,
+            type = TraceType.Process,
+            message = "Polling succeeded after ${attempt + 1} attempt(s)",
+        )
+        return Result.success(value)
+    }
+
+    trace(
+        tag = tag,
+        type = TraceType.Process,
+        message = "Attempt ${attempt + 1}/$maxAttempts: predicate not satisfied, retrying in $interval",
+    )
+
+    return doPoll(call, predicate, maxAttempts, interval, tag, attempt + 1)
+}
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/exchange/VerifiedFiatCalculator.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/exchange/VerifiedFiatCalculator.kt
@@ -1,17 +1,26 @@
 package com.getcode.opencode.exchange
 
+import android.os.Parcelable
 import com.getcode.opencode.internal.manager.VerifiedState
 import com.getcode.opencode.model.financial.CurrencyCode
 import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.opencode.model.financial.Rate
 import com.getcode.opencode.model.financial.Token
 import com.getcode.solana.keys.Mint
+import kotlinx.parcelize.IgnoredOnParcel
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
 
+@Parcelize
+@Serializable
 data class VerifiedFiat(
     val localFiat: LocalFiat,
-    val verifiedState: VerifiedState?,
-)
+    @Transient
+    @IgnoredOnParcel
+    val verifiedState: VerifiedState? = null,
+) : Parcelable
 
 interface VerifiedFiatCalculator {
     suspend fun resolveVerifiedState(

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ fun appEntryProvider(`
`109`	`109`	`SwapFlowScreen(route = key, resultStateRegistry = resultStateRegistry)`
`110`	`110`	`}`
`111`	`111`	`annotatedEntry<AppRoute.Token.TxProcessing> { key ->`
`112`		`- TokenTxProcessingScreen(key.swapId, key.swapPurpose, key.awaitExternalWallet, key.isFundingShortfall)`
	`112`	`+ TokenTxProcessingScreen(key.swapId, key.swapPurpose, key.amount, key.awaitExternalWallet, key.isFundingShortfall)`
`113`	`113`	`}`
`114`	`114`	`annotatedEntry<AppRoute.Token.OnRamp> { key -> OnRampCustomAmountScreen(key.mint) }`
`115`	`115`	`annotatedEntry<AppRoute.Token.Discovery> { TokenDiscoveryScreen() }`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,5 @@ dependencies {`
`24`	`24`	`implementation(project(":apps:flipcash:shared:web"))`
`25`	`25`	`api(project(":libs:network:coinbase:onramp"))`
`26`	`26`	`implementation(project(":libs:network:jwt"))`
	`27`	`+ implementation(project(":libs:network:connectivity:public"))`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ fun CoinbaseOnRampHandler(`
`53`	`53`	`is CoinbaseOnRampState.Completed -> {`
`54`	`54`	`LaunchedEffect(current) {`
`55`	`55`	`controller.emitPendingNavigation(`
`56`		`- AppRoute.Token.TxProcessing(current.swapId, SwapPurpose.Buy(current.token.address))`
	`56`	`+ AppRoute.Token.TxProcessing(current.swapId, SwapPurpose.Buy(current.token.address), current.amount)`
`57`	`57`	`)`
`58`	`58`	`controller.reset()`
`59`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,6 @@ sealed interface CoinbaseOnRampState {`
`18`	`18`	`data object Idle : CoinbaseOnRampState`
`19`	`19`	`data class Paying(val order: OnrampOrder, val token: Token, val amount: VerifiedFiat) : CoinbaseOnRampState`
`20`	`20`	`data class Processing(val orderId: String, val token: Token, val amount: VerifiedFiat) : CoinbaseOnRampState`
`21`		`- data class Completed(val swapId: SwapId, val token: Token) : CoinbaseOnRampState`
	`21`	`+ data class Completed(val swapId: SwapId, val token: Token, val amount: VerifiedFiat) : CoinbaseOnRampState`
`22`	`22`	`data class Failed(val error: CoinbaseOnRampWebError) : CoinbaseOnRampState`
`23`	`23`	`}`