fix(cash): detect expired blockhash and show accurate retry message

bmc08gt · bmc08gt · commit 5889f5f2fe5a · 2026-05-20T14:33:40.000-04:00
When a Phantom wallet round-trip exceeds ~60s, the blockhash baked into
the transaction expires and Solana rejects it with "Blockhash not found".
Previously this surfaced a misleading "Make sure you have enough USDC
and SOL" error.

- Add TransactionExpired error variant to DeeplinkOnRampErrors
- Detect blockhash errors in sendSwapTransaction before the generic
  FailedToSendTransaction fallback
- Move processing state and navigation to onSuccess so progress only
  starts after the user returns from Phantom
- Observe PhantomCeremonyFailed on the processing screen so dismissing
  the alert exits instead of leaving the user stuck

Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/tokens/SwapStep.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/tokens/SwapStep.kt
@@ -28,7 +28,5 @@ sealed interface SwapStep : FlowStep, Parcelable {
     data object PhantomConfirmTransaction: SwapStep
     @Parcelize
     @Serializable
-    data class Processing(
-        val swapId: SwapId,
-    ) : SwapStep, NonDismissableRoute, NonDraggableRoute
+    data object Processing : SwapStep, NonDismissableRoute, NonDraggableRoute
 }
diff --git a/apps/flipcash/core/src/main/res/values/strings.xml b/apps/flipcash/core/src/main/res/values/strings.xml
@@ -234,6 +234,8 @@
     <string name="error_title_deeplinkOnRampFailedToSimulateTransaction">Something Went Wrong</string>
     <string name="error_title_deeplinkOnRampFailedToCreateDeeplink">Something Went Wrong</string>
     <string name="error_title_deeplinkOnRampFailedToSendTransaction">Transaction Failed</string>
+    <string name="error_title_deeplinkOnRampTransactionExpired">Transaction Expired</string>
+    <string name="error_description_deeplinkOnRampTransactionExpired">The transaction took too long to process. Please try again</string>
     <string name="error_title_deeplinkOnRampDisconnected">Something Went Wrong</string>
     <string name="error_title_deeplinkOnRampUnauthorized">Something Went Wrong</string>
     <string name="error_title_deeplinkOnRampUserRejected">Request Rejected in %1$s</string>
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/PhantomWalletScreens.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/PhantomWalletScreens.kt
@@ -132,8 +132,8 @@ internal fun PhantomTransactionConfirmationScreen() {
     LaunchedEffect(viewModel) {
         viewModel.eventFlow
             .filterIsInstance<SwapViewModel.Event.PhantomNavigateToProcessing>()
-            .onEach { event ->
-                flowNavigator.navigateTo(SwapStep.Processing(event.swapId))
+            .onEach {
+                flowNavigator.navigateTo(SwapStep.Processing)
             }.launchIn(this)
     }
 
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SwapEntryScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SwapEntryScreen.kt
@@ -89,9 +89,8 @@ internal fun SwapEntryScreen(
     LaunchedEffect(viewModel) {
         viewModel.eventFlow
             .filterIsInstance<SwapViewModel.Event.OnPurchaseSubmitted>()
-            .map { it.swapId }
-            .onEach { swapId ->
-                flowNavigator.navigateTo(SwapStep.Processing(swapId))
+            .onEach {
+                flowNavigator.navigateTo(SwapStep.Processing)
             }.launchIn(this)
     }
 
@@ -130,9 +129,7 @@ internal fun SwapEntryScreen(
         coinbaseOnRampController.pendingNavigation.collect { route ->
             if (route is AppRoute.Token.TxProcessing) {
                 viewModel.dispatchEvent(SwapViewModel.Event.OnSwapIdChanged(route.swapId))
-                flowNavigator.navigateTo(
-                    SwapStep.Processing(route.swapId)
-                )
+                flowNavigator.navigateTo(SwapStep.Processing)
             }
         }
     }
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SwapFlowScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/SwapFlowScreen.kt
@@ -61,7 +61,7 @@ private fun swapEntryProvider(): (NavKey) -> NavEntry<NavKey> = entryProvider {
     annotatedEntry<SwapStep.PhantomConfirmTransaction> {
         PhantomTransactionConfirmationScreen()
     }
-    annotatedEntry<SwapStep.Processing> { step ->
-        SwapProcessingScreen(step.swapId)
+    annotatedEntry<SwapStep.Processing> {
+        SwapProcessingScreen()
     }
 }
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenSellReceiptScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenSellReceiptScreen.kt
@@ -52,9 +52,8 @@ internal fun SellReceiptScreen() {
     LaunchedEffect(viewModel) {
         viewModel.eventFlow
             .filterIsInstance<SwapViewModel.Event.OnSellSubmitted>()
-            .map { it.swapId }
-            .onEach { swapId ->
-                flowNavigator.navigateTo(SwapStep.Processing(swapId))
+            .onEach {
+                flowNavigator.navigateTo(SwapStep.Processing)
             }.launchIn(this)
     }
 }
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
@@ -24,18 +24,12 @@ import kotlinx.coroutines.flow.onEach
  * Flow-aware swap processing content, used inside `SwapFlowScreen`.
  */
 @Composable
-internal fun SwapProcessingScreen(
-    swapId: SwapId,
-) {
+internal fun SwapProcessingScreen() {
     val flowNavigator = rememberFlowNavigator<SwapStep, SwapResult>()
     val viewModel = flowSharedViewModel<SwapViewModel>()
 
     TokenTxProcessingScreen(viewModel = viewModel)
 
-    LaunchedEffect(viewModel) {
-        viewModel.dispatchEvent(Event.UpdateProcessingState(loading = true))
-    }
-
     LaunchedEffect(viewModel) {
         viewModel.eventFlow
             .filterIsInstance<Event.OnTransactionSuccessful>()
@@ -52,6 +46,14 @@ internal fun SwapProcessingScreen(
             }.launchIn(this)
     }
 
+    LaunchedEffect(viewModel) {
+        viewModel.eventFlow
+            .filterIsInstance<Event.PhantomCeremonyFailed>()
+            .onEach {
+                flowNavigator.exitCanceled()
+            }.launchIn(this)
+    }
+
     BackHandler { /* intercept */ }
 }
 
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/DeeplinkOnRampErrors.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/DeeplinkOnRampErrors.kt
@@ -25,6 +25,11 @@ sealed class DeeplinkOnRampError(
         override val cause: Throwable? = null
     ) : DeeplinkOnRampError(code = code, message = message, cause = cause)
 
+    class TransactionExpired(
+        override val message: String?,
+        override val cause: Throwable? = null
+    ) : DeeplinkOnRampError(message = message, cause = cause)
+
     class FailedToSubmitBuyToServer(
         override val code: Long = -100,
         override val message: String?,
@@ -70,6 +75,7 @@ val DeeplinkOnRampError.isAlert: Boolean
         DeeplinkError.Disconnected,
         DeeplinkError.TransactionRejected,
     ) || this is DeeplinkOnRampError.FailedToSendTransaction
+        || this is DeeplinkOnRampError.TransactionExpired
         || this is DeeplinkOnRampError.InsufficientSol
         || this is DeeplinkOnRampError.InsufficientUsdc
         || (this is DeeplinkOnRampError.FailedToSimulateTransaction && cause?.isNetworkError() == true)
@@ -83,6 +89,7 @@ fun DeeplinkOnRampError.messaging(getString: (Int) -> String, provider: String):
     is DeeplinkOnRampError.FailedToCreateTransaction -> getString(R.string.error_title_deeplinkOnRampFailedToCreateTransaction) to getString(R.string.error_description_deeplinkOnRampFailedToCreateTransaction)
     is DeeplinkOnRampError.FailedToSimulateTransaction -> getString(R.string.error_title_deeplinkOnRampFailedToSimulateTransaction) to getString(R.string.error_description_deeplinkOnRampFailedToSimulateTransaction)
     is DeeplinkOnRampError.FailedToSendTransaction -> getString(R.string.error_title_deeplinkOnRampFailedToSendTransaction) to getString(R.string.error_description_deeplinkOnRampFailedToSendTransaction).format(provider)
+    is DeeplinkOnRampError.TransactionExpired -> getString(R.string.error_title_deeplinkOnRampTransactionExpired) to getString(R.string.error_description_deeplinkOnRampTransactionExpired)
     is DeeplinkOnRampError.FailedToSubmitBuyToServer -> getString(R.string.error_title_deeplinkOnRampExternalFundBuy) to getString(R.string.error_description_deeplinkOnRampExternalFundBuy).format(provider)
     is DeeplinkOnRampError.InsufficientSol -> getString(R.string.error_title_deeplinkOnRampInsufficientSol) to getString(R.string.error_description_deeplinkOnRampInsufficientSol).format(provider)
     is DeeplinkOnRampError.InsufficientUsdc -> getString(R.string.error_title_deeplinkOnRampInsufficientUsdc) to getString(R.string.error_description_deeplinkOnRampInsufficientUsdc).format(provider)
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/PhantomWalletController.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/PhantomWalletController.kt
@@ -277,14 +277,30 @@ class PhantomWalletController @Inject constructor(
                             }
                         }
                     )
-                    ErrorUtils.handleError(error)
-                    return@withContext Result.failure(
-                        DeeplinkOnRampError.FailedToSendTransaction(
-                            code = code ?: -99L,
-                            message = error.message,
-                            cause = error,
-                        )
-                    )
+
+                    when {
+                        // Detect expired blockhash — occurs when the Phantom wallet
+                        // round-trip exceeds ~60 seconds (Solana's blockhash lifetime).
+                        error is RpcException && error.isBlockhashNotFound -> {
+                            ErrorUtils.handleError(error)
+                            return@withContext Result.failure(
+                                DeeplinkOnRampError.TransactionExpired(
+                                    message = error.message,
+                                    cause = error,
+                                )
+                            )
+                        }
+                        else -> {
+                            ErrorUtils.handleError(error)
+                            return@withContext Result.failure(
+                                DeeplinkOnRampError.FailedToSendTransaction(
+                                    code = code ?: -99L,
+                                    message = error.message,
+                                    cause = error,
+                                )
+                            )
+                        }
+                    }
                 }
 
             Result.success(Unit)
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/DeeplinkErrorTest.kt b/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/DeeplinkErrorTest.kt
@@ -75,6 +75,7 @@ class DeeplinkErrorTest {
     fun `DeeplinkOnRampError subtypes are Throwable`() {
         val errors: List<Throwable> = listOf(
             DeeplinkOnRampError.FailedToSendTransaction(message = "fail"),
+            DeeplinkOnRampError.TransactionExpired(message = "expired"),
             DeeplinkOnRampError.WalletProvidedError(
                 error = DeeplinkError.Disconnected,
                 message = "disconnected"
@@ -87,6 +88,24 @@ class DeeplinkErrorTest {
         }
     }
 
+    @Test
+    fun `TransactionExpired isAlert returns true`() {
+        val error = DeeplinkOnRampError.TransactionExpired(message = "Blockhash not found")
+        assertTrue(error.isAlert, "TransactionExpired should be an alert")
+    }
+
+    @Test
+    fun `TransactionExpired preserves cause chain`() {
+        val cause = RuntimeException("Blockhash not found")
+        val error = DeeplinkOnRampError.TransactionExpired(
+            message = cause.message,
+            cause = cause,
+        )
+
+        assertEquals("Blockhash not found", error.message)
+        assertEquals(cause, error.cause)
+    }
+
     @Test
     fun `WalletProvidedError code matches error code`() {
         val error = DeeplinkOnRampError.WalletProvidedError(
diff --git a/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SwapViewModel.kt b/apps/flipcash/shared/tokens/src/main/kotlin/com/flipcash/app/tokens/ui/SwapViewModel.kt
@@ -982,14 +982,15 @@ class SwapViewModel @Inject constructor(
                 amount = amount,
                 fee = LocalFiat.Zero,
                 token = token,
-                onBeforeSign = { swapId ->
+                onBeforeSign = {
                     analytics.amountSelectedForWalletTransfer(
                         OnRampProvider.Phantom,
                         amount.localFiat.underlyingTokenAmount
                     )
-                    dispatchEvent(Event.PhantomNavigateToProcessing(swapId))
                 },
             ).onSuccess { swapId ->
+                dispatchEvent(Event.UpdateProcessingState(loading = true))
+                dispatchEvent(Event.PhantomNavigateToProcessing(swapId))
                 dispatchEvent(Event.OnSwapIdChanged(swapId))
             }.onFailure { error ->
                 handlePhantomError(error)
diff --git a/libs/crypto/solana/src/main/kotlin/com/getcode/solana/rpc/Calls.kt b/libs/crypto/solana/src/main/kotlin/com/getcode/solana/rpc/Calls.kt
@@ -200,4 +200,8 @@ suspend fun Rpc20Driver.simulateTransaction(
 class RpcException(
     val code: Int,
     override val message: String,
-) : Throwable(message)
+) : Throwable(message) {
+    val isBlockhashNotFound: Boolean
+        get() = message.contains("Blockhash not found", ignoreCase = true) ||
+                message.contains("BlockhashNotFound", ignoreCase = true)
+}

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,5 @@ sealed interface SwapStep : FlowStep, Parcelable {`
`28`	`28`	`data object PhantomConfirmTransaction: SwapStep`
`29`	`29`	`@Parcelize`
`30`	`30`	`@Serializable`
`31`		`- data class Processing(`
`32`		`- val swapId: SwapId,`
`33`		`- ) : SwapStep, NonDismissableRoute, NonDraggableRoute`
	`31`	`+ data object Processing : SwapStep, NonDismissableRoute, NonDraggableRoute`
`34`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,9 +89,8 @@ internal fun SwapEntryScreen(`
`89`	`89`	`LaunchedEffect(viewModel) {`
`90`	`90`	`viewModel.eventFlow`
`91`	`91`	`.filterIsInstance<SwapViewModel.Event.OnPurchaseSubmitted>()`
`92`		`- .map { it.swapId }`
`93`		`- .onEach { swapId ->`
`94`		`- flowNavigator.navigateTo(SwapStep.Processing(swapId))`
	`92`	`+ .onEach {`
	`93`	`+ flowNavigator.navigateTo(SwapStep.Processing)`
`95`	`94`	`}.launchIn(this)`
`96`	`95`	`}`
`97`	`96`
`@@ -130,9 +129,7 @@ internal fun SwapEntryScreen(`
`130`	`129`	`coinbaseOnRampController.pendingNavigation.collect { route ->`
`131`	`130`	`if (route is AppRoute.Token.TxProcessing) {`
`132`	`131`	`viewModel.dispatchEvent(SwapViewModel.Event.OnSwapIdChanged(route.swapId))`
`133`		`- flowNavigator.navigateTo(`
`134`		`- SwapStep.Processing(route.swapId)`
`135`		`- )`
	`132`	`+ flowNavigator.navigateTo(SwapStep.Processing)`
`136`	`133`	`}`
`137`	`134`	`}`
`138`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ private fun swapEntryProvider(): (NavKey) -> NavEntry<NavKey> = entryProvider {`
`61`	`61`	`annotatedEntry<SwapStep.PhantomConfirmTransaction> {`
`62`	`62`	`PhantomTransactionConfirmationScreen()`
`63`	`63`	`}`
`64`		`- annotatedEntry<SwapStep.Processing> { step ->`
`65`		`- SwapProcessingScreen(step.swapId)`
	`64`	`+ annotatedEntry<SwapStep.Processing> {`
	`65`	`+ SwapProcessingScreen()`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,8 @@ internal fun SellReceiptScreen() {`
`52`	`52`	`LaunchedEffect(viewModel) {`
`53`	`53`	`viewModel.eventFlow`
`54`	`54`	`.filterIsInstance<SwapViewModel.Event.OnSellSubmitted>()`
`55`		`- .map { it.swapId }`
`56`		`- .onEach { swapId ->`
`57`		`- flowNavigator.navigateTo(SwapStep.Processing(swapId))`
	`55`	`+ .onEach {`
	`56`	`+ flowNavigator.navigateTo(SwapStep.Processing)`
`58`	`57`	`}.launchIn(this)`
`59`	`58`	`}`
`60`	`59`	`}`