From 6e2d0a214848f629da53d676e461a2fb710c8a74 Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Thu, 14 May 2026 20:10:48 -0400
Subject: [PATCH 1/2] feat(onramp): migrate Phantom integration from manual
 deeplinks to SDK

Replace hand-rolled deeplink protocol (URL building, X25519 key exchange,
NaCl encryption, callback activity) with phantom-connect-wallet SDK.

- PhantomWalletConnector now drives connect and sign in-process
- connectAndSign() handles the full ceremony; signAndSend() covers the
  deferred-amount path (Token.Info / CurrencyCreator)
- Remove manual deeplink parsing, BoxKeyPair, and DeeplinkType routing
- Update Hilt module to provide SDK-backed connector
- Clean up manifest (callback activity, query intent)

Signed-off-by: Brandon McAnsh <git@bmcreations.dev>
---
 apps/flipcash/app/build.gradle.kts            |   3 +
 .../flipcash/app/src/main/AndroidManifest.xml |  48 +---
 .../kotlin/com/flipcash/app/FlipcashApp.kt    |   2 +
 .../com/flipcash/app/internal/ui/App.kt       |   6 -
 .../app/core/navigation/DeeplinkAction.kt     |   1 -
 .../app/core/navigation/DeeplinkType.kt       |  26 +-
 .../WalletDeeplinkConnectionResult.kt         | 109 --------
 .../onramp/ui/ConfirmInWalletButtonLabel.kt   |   7 +-
 .../com/flipcash/app/analytics/Events.kt      |   2 -
 .../shared/onramp/deeplinks/build.gradle.kts  |   3 +
 .../app/onramp/DeeplinkOnRampErrors.kt        |  14 --
 .../onramp/ExternalWalletOnRampController.kt  | 238 ++++++++----------
 .../app/onramp/ExternalWalletOnRampHandler.kt |  85 ++-----
 .../app/onramp/ExternalWalletOnRampState.kt   |   2 -
 .../app/onramp/inject/PhantomWalletModule.kt  |  27 ++
 .../flipcash/app/onramp/internal/Deeplinks.kt |  98 --------
 .../flipcash/app/onramp/DeeplinkErrorTest.kt  |   1 -
 .../ExternalWalletBalanceCheckTest.kt         |  17 +-
 .../ExternalWalletDeeplinkStateErrorTest.kt   |  84 ++++---
 .../flipcash/app/router/internal/AppRouter.kt |  83 +-----
 .../app/router/internal/AppRouterTest.kt      | 147 +----------
 .../com/flipcash/app/userflags/Field.kt       |  10 -
 gradle/libs.versions.toml                     |   3 +
 .../internal/domain/UserFlagsMapper.kt        |   5 +-
 .../model/thirdparty/OnRampProvider.kt        |   4 -
 .../internal/domain/UserFlagsMapperTest.kt    |   4 +-
 26 files changed, 240 insertions(+), 789 deletions(-)
 create mode 100644 apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/inject/PhantomWalletModule.kt
 delete mode 100644 apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/internal/Deeplinks.kt

diff --git a/apps/flipcash/app/build.gradle.kts b/apps/flipcash/app/build.gradle.kts
index 1afb1e1d5..47f080f8f 100644
--- a/apps/flipcash/app/build.gradle.kts
+++ b/apps/flipcash/app/build.gradle.kts
@@ -153,6 +153,9 @@ dependencies {
     implementation(project(":apps:flipcash:shared:notifications"))
     implementation(project(":apps:flipcash:shared:onramp:coinbase"))
     implementation(project(":apps:flipcash:shared:onramp:deeplinks"))
+    implementation(libs.phantom.connect) {
+        exclude(group = "com.ionspin.kotlin", module = "multiplatform-crypto-libsodium-bindings-android-debug")
+    }
     implementation(project(":apps:flipcash:shared:payments"))
     implementation(project(":apps:flipcash:shared:permissions"))
     implementation(project(":apps:flipcash:shared:phone"))
diff --git a/apps/flipcash/app/src/main/AndroidManifest.xml b/apps/flipcash/app/src/main/AndroidManifest.xml
index 215bf8f4e..6728d3b7b 100644
--- a/apps/flipcash/app/src/main/AndroidManifest.xml
+++ b/apps/flipcash/app/src/main/AndroidManifest.xml
@@ -28,16 +28,6 @@
             <action android:name="android.intent.action.VIEW" />
             <data android:host="phantom.app" />
         </intent>
-
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:host="backpack.app" />
-        </intent>
-
-        <intent>
-            <action android:name="android.intent.action.VIEW" />
-            <data android:host="solflare.com" />
-        </intent>
     </queries>
 
     <application
@@ -82,8 +72,6 @@
                 <data android:pathPattern="/login.*" />
                 <data android:pathPattern="/token.*" />
                 <data android:pathPattern="/verify.*" />
-                <data android:pathPattern="/external/.*/connected" />
-                <data android:pathPattern="/external/.*/signed" />
             </intent-filter>
 
             <!-- send.flipcash.com App Links -->
@@ -160,29 +148,6 @@
                     android:scheme="https" />
             </intent-filter>
 
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="app.flipcash.com"
-                    android:pathPattern="/external/.*/connected"
-                    android:scheme="https" />
-            </intent-filter>
-
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="app.flipcash.com"
-                    android:pathPattern="/external/.*/signed"
-                    android:scheme="https" />
-            </intent-filter>
 
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
@@ -232,6 +197,19 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name="dev.bmcreations.phantom.connect.wallet.PhantomWalletCallbackActivity"
+            android:exported="true"
+            android:launchMode="singleTask"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="codewallet" android:host="phantom-wallet-callback" />
+            </intent-filter>
+        </activity>
+
         <!--
              Prompt Google Play services to install the backported photo picker module
              https://developer.android.com/training/data-storage/shared/photopicker#device-availability
diff --git a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/FlipcashApp.kt b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/FlipcashApp.kt
index 23b22c8ea..16f332839 100644
--- a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/FlipcashApp.kt
+++ b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/FlipcashApp.kt
@@ -16,6 +16,7 @@ import com.flipcash.app.currency.PreferredCurrencyController
 import com.getcode.opencode.repositories.EventRepository
 import com.getcode.utils.ErrorUtils
 import com.getcode.utils.trace
+import dev.bmcreations.phantom.connect.PhantomSdk
 import dagger.hilt.android.HiltAndroidApp
 import io.reactivex.rxjava3.plugins.RxJavaPlugins
 import javax.inject.Inject
@@ -48,6 +49,7 @@ class FlipcashApp : Application(), Configuration.Provider, SingletonImageLoader.
             ErrorUtils.handleError(it)
         }
 
+        PhantomSdk.init(this)
         authManager.init()
 
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
diff --git a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/App.kt b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/App.kt
index da6a9ae8d..9337d9a63 100644
--- a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/App.kt
+++ b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/App.kt
@@ -47,7 +47,6 @@ import com.flipcash.app.internal.ui.navigation.decorators.rememberNavBlockingOve
 import com.flipcash.app.internal.ui.navigation.decorators.rememberNavMessagingEntryDecorator
 import com.flipcash.app.onramp.CoinbaseOnRampHandler
 import com.flipcash.app.onramp.ExternalWalletOnRampHandler
-import com.flipcash.app.onramp.LocalExternalWalletOnRampController
 import com.flipcash.app.router.LocalRouter
 import com.flipcash.app.session.LocalSessionController
 import com.flipcash.app.theme.FlipcashTheme
@@ -238,7 +237,6 @@ internal fun App(
                                 }
 
                                 val emailCodeChannel = LocalEmailCodeChannel.current
-                                val externalWalletController = LocalExternalWalletOnRampController.current
                                 LaunchedEffect(deepLink) {
                                     val link = deepLink ?: return@LaunchedEffect
 
@@ -267,10 +265,6 @@ internal fun App(
                                             }
                                         }
 
-                                        is DeeplinkAction.ExternalWallet -> externalWalletController.handleWalletDeeplink(
-                                            action.type
-                                        )
-
                                         is DeeplinkAction.Login -> viewModel.handleLoginEntropy(
                                             action.entropy,
                                             onSwitchAccount = {
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/navigation/DeeplinkAction.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/navigation/DeeplinkAction.kt
index e39876e0b..8bc6901ef 100644
--- a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/navigation/DeeplinkAction.kt
+++ b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/navigation/DeeplinkAction.kt
@@ -2,7 +2,6 @@ package com.flipcash.app.core.navigation
 
 sealed interface DeeplinkAction {
     data class Navigate(val routes: List<com.flipcash.app.core.AppRoute>) : DeeplinkAction
-    data class ExternalWallet(val type: DeeplinkType) : DeeplinkAction
     data class Login(val entropy: String) : DeeplinkAction
     data class OpenCashLink(val entropy: String) : DeeplinkAction
     data object None : DeeplinkAction
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/navigation/DeeplinkType.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/navigation/DeeplinkType.kt
index 364c8fa93..3cd7319a1 100644
--- a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/navigation/DeeplinkType.kt
+++ b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/navigation/DeeplinkType.kt
@@ -2,13 +2,7 @@ package com.flipcash.app.core.navigation
 
 import android.net.Uri
 import android.os.Parcelable
-import com.flipcash.app.core.onramp.deeplinks.WalletDeeplinkConnectionResult
-import com.flipcash.app.core.onramp.deeplinks.ExternalWalletDeeplinkError
-import com.flipcash.app.core.onramp.deeplinks.OnRampDeeplinkOrigin
-import com.flipcash.app.core.onramp.deeplinks.WalletDeeplinkSigningResult
-import com.getcode.ed25519.Ed25519
 import com.getcode.solana.keys.Mint
-import com.getcode.vendor.Base58
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 
@@ -21,24 +15,6 @@ sealed interface DeeplinkType: Parcelable {
 
     @Serializable data class TokenInfo(val mint: Mint): DeeplinkType, Navigatable
 
-    sealed interface ExternalWalletStep {
-        val origin: OnRampDeeplinkOrigin
-    }
-
-    @Serializable
-    data class ExternalWalletConnection(
-        override val origin: OnRampDeeplinkOrigin,
-        val result: WalletDeeplinkConnectionResult?,
-        val error: ExternalWalletDeeplinkError? = null
-    ): DeeplinkType, ExternalWalletStep, Navigatable
-
-    @Serializable
-    data class ExternalWalletSignedTransaction(
-        override val origin: OnRampDeeplinkOrigin,
-        val result: WalletDeeplinkSigningResult?,
-        val error: ExternalWalletDeeplinkError? = null
-    ): DeeplinkType, ExternalWalletStep, Navigatable
-
     @Serializable
     data class EmailVerification(
         val email: String,
@@ -88,4 +64,4 @@ sealed interface Key {
 }
 
 private operator fun Regex.contains(text: String?): Boolean =
-    text?.let { this.matches(it) } ?: false
\ No newline at end of file
+    text?.let { this.matches(it) } ?: false
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/onramp/deeplinks/WalletDeeplinkConnectionResult.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/onramp/deeplinks/WalletDeeplinkConnectionResult.kt
index e1087a6ac..99d2308c1 100644
--- a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/onramp/deeplinks/WalletDeeplinkConnectionResult.kt
+++ b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/onramp/deeplinks/WalletDeeplinkConnectionResult.kt
@@ -1,18 +1,7 @@
 package com.flipcash.app.core.onramp.deeplinks
 
 import android.os.Parcelable
-import com.flipcash.app.core.AppRoute
-import com.getcode.ed25519.Ed25519
-import com.getcode.opencode.model.core.ID
-import com.getcode.opencode.utils.base64
-import com.getcode.opencode.utils.base64UrlSafe
-import com.getcode.solana.keys.Mint
 import com.getcode.solana.keys.PublicKey
-import com.getcode.solana.keys.base58
-import com.getcode.utils.base58
-import com.getcode.utils.decodeBase58
-import com.getcode.utils.decodeBase64
-import com.getcode.utils.serializer.ByteListAsBase64Serializer
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -31,101 +20,3 @@ data class ExternallySignedTransaction(
     @SerialName("transaction")
     val serializedTransaction: String,
 ): Parcelable
-
-@Serializable
-@Parcelize
-sealed class OnRampDeeplinkOrigin: Parcelable {
-    @Serializable @Parcelize
-    data object Menu : OnRampDeeplinkOrigin()
-
-    @Serializable @Parcelize
-    data class Give(val tokenAddress: Mint?) : OnRampDeeplinkOrigin()
-
-    @Serializable @Parcelize
-    data object Wallet: OnRampDeeplinkOrigin()
-
-    @Serializable @Parcelize
-    data class TokenInfo(val mint: Mint): OnRampDeeplinkOrigin()
-
-    @Serializable @Parcelize
-    data object Reserves: OnRampDeeplinkOrigin()
-
-    @Serializable @Parcelize
-    data object CurrencyCreator: OnRampDeeplinkOrigin()
-
-
-    fun forUri(): String {
-        return when(this) {
-            Menu -> "menu"
-            is Give -> "give-${tokenAddress?.base58()?.base64UrlSafe}"
-            Wallet -> "wallet"
-            is TokenInfo -> "token-${mint.base58().base64UrlSafe}"
-            Reserves -> "reserves"
-            CurrencyCreator -> "currency-creator"
-        }.lowercase()
-    }
-
-    companion object Companion {
-        fun fromRoute(route: AppRoute?): OnRampDeeplinkOrigin? {
-            return when (route) {
-                is AppRoute.Sheets.Menu -> Menu
-                is AppRoute.Sheets.Give -> Give(route.mint)
-                is AppRoute.Sheets.Wallet -> Wallet
-                is AppRoute.Token.Info -> {
-                    if (route.mint == Mint.usdf) Reserves else TokenInfo(route.mint)
-                }
-                is AppRoute.Token.CurrencyCreator -> CurrencyCreator
-
-                else -> null
-            }
-        }
-
-        fun fromString(value: String?): OnRampDeeplinkOrigin? {
-            return when {
-                value == "menu" -> Menu
-                value?.startsWith("give-") == true -> {
-                    val tokenAddress = value.removePrefix("give-").decodeBase64().base58
-                    val mint = runCatching {
-                        Mint(tokenAddress)
-                    }.getOrNull() ?: return null
-                    Give(mint)
-                }
-                value == "wallet" -> Wallet
-                value == "reserves" -> Reserves
-                value == "currency-creator" -> CurrencyCreator
-                value?.startsWith("token-") == true -> {
-                    val mintString = value.removePrefix("token-").decodeBase64().base58
-                    val mint = runCatching {
-                        Mint(mintString)
-                    }.onFailure { it.printStackTrace() }.getOrNull() ?: return null
-
-                    TokenInfo(mint)
-                }
-
-                else -> return null
-            }
-        }
-    }
-}
-
-@Serializable
-@Parcelize
-data class WalletDeeplinkConnectionResult(
-    @Serializable(with = ByteListAsBase64Serializer::class) val encryptionPublicKey: List<Byte>,
-    @Serializable(with = ByteListAsBase64Serializer::class) val nonce: List<Byte>,
-    @Serializable(with = ByteListAsBase64Serializer::class) val encryptedData: List<Byte>
-): Parcelable
-
-@Serializable
-@Parcelize
-data class WalletDeeplinkSigningResult(
-    @Serializable(with = ByteListAsBase64Serializer::class) val nonce: List<Byte>,
-    @Serializable(with = ByteListAsBase64Serializer::class) val encryptedData: List<Byte>,
-): Parcelable
-
-@Serializable
-@Parcelize
-data class ExternalWalletDeeplinkError(
-    val errorCode: String,
-    val errorMessage: String,
-): Parcelable
\ No newline at end of file
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/onramp/ui/ConfirmInWalletButtonLabel.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/onramp/ui/ConfirmInWalletButtonLabel.kt
index 018ab66ce..8f07f2cca 100644
--- a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/onramp/ui/ConfirmInWalletButtonLabel.kt
+++ b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/onramp/ui/ConfirmInWalletButtonLabel.kt
@@ -9,12 +9,9 @@ import androidx.compose.foundation.text.appendInlineContent
 import androidx.compose.material.ButtonColors
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.key
-import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberUpdatedState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -36,9 +33,7 @@ fun buildExternalWalletButtonLabel(
     colors: ButtonColors = ButtonState.Filled.colors(),
 ): AnnotatedButtonLabel {
     val (title, icon) = when (provider) {
-        OnRampProvider.Backpack -> stringResource(R.string.label_backpack) to painterResource(R.drawable.ic_backpack_wallet)
         OnRampProvider.Phantom -> stringResource(R.string.label_phantom) to painterResource(R.drawable.ic_phantom_wallet)
-        OnRampProvider.Solflare -> stringResource(R.string.label_solflare) to painterResource(R.drawable.ic_solflare_wallet)
     }
 
     val currentIsEnabled by rememberUpdatedState(isEnabled)
@@ -74,4 +69,4 @@ fun buildExternalWalletButtonLabel(
             }
         )
     )
-}
\ No newline at end of file
+}
diff --git a/apps/flipcash/shared/analytics/src/main/kotlin/com/flipcash/app/analytics/Events.kt b/apps/flipcash/shared/analytics/src/main/kotlin/com/flipcash/app/analytics/Events.kt
index a38aaf29f..4f1960e32 100644
--- a/apps/flipcash/shared/analytics/src/main/kotlin/com/flipcash/app/analytics/Events.kt
+++ b/apps/flipcash/shared/analytics/src/main/kotlin/com/flipcash/app/analytics/Events.kt
@@ -157,8 +157,6 @@ internal sealed interface AnalyticsEvent {
     sealed interface WalletEvent : AnalyticsEvent {
         val provider: OnRampProvider.UsesDeeplinks
         val providerName get() = when (provider) {
-            OnRampProvider.Backpack -> "Backpack"
-            OnRampProvider.Solflare -> "Solflare"
             OnRampProvider.Phantom -> "Phantom"
         }
     }
diff --git a/apps/flipcash/shared/onramp/deeplinks/build.gradle.kts b/apps/flipcash/shared/onramp/deeplinks/build.gradle.kts
index f14806af3..f2fe590a1 100644
--- a/apps/flipcash/shared/onramp/deeplinks/build.gradle.kts
+++ b/apps/flipcash/shared/onramp/deeplinks/build.gradle.kts
@@ -12,6 +12,9 @@ dependencies {
     testImplementation(project(":libs:test-utils"))
 
     implementation(libs.bundles.kotlinx.serialization)
+    implementation(libs.phantom.connect.wallet) {
+        exclude(group = "com.ionspin.kotlin", module = "multiplatform-crypto-libsodium-bindings-android-debug")
+    }
 
     implementation(project(":apps:flipcash:shared:analytics"))
     implementation(project(":apps:flipcash:shared:userflags"))
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
index 1add48339..ecb797a62 100644
--- 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
@@ -6,9 +6,6 @@ sealed class DeeplinkOnRampError(
     override val cause: Throwable? = null,
 ) : Throwable(message) {
 
-    class FailedToGenerateDeeplink(
-        override val message: String? = null
-    ) : DeeplinkOnRampError(message = message)
     class FailedToCreateTransaction(
         override val message: String?,
         override val cause: Throwable? = null
@@ -31,16 +28,6 @@ sealed class DeeplinkOnRampError(
         override val cause: Throwable? = null
     ): DeeplinkOnRampError(message = message, cause = cause)
 
-    class DecryptionError(
-        override val message: String?,
-        override val cause: Throwable? = null
-    ) : DeeplinkOnRampError(message = message, cause = cause)
-
-    class DeserializationError(
-        override val message: String?,
-        override val cause: Throwable? = null
-    ) : DeeplinkOnRampError(message = message, cause = cause)
-
     class InsufficientSol(
         val requiredLamports: Long,
         val actualLamports: Long,
@@ -73,4 +60,3 @@ enum class DeeplinkError(val code: Long) {
         fun fromCode(code: String?) = fromCode(code?.toLongOrNull())
     }
 }
-
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampController.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampController.kt
index 443685b16..1b61942a8 100644
--- a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampController.kt
+++ b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampController.kt
@@ -1,10 +1,8 @@
 package com.flipcash.app.onramp
 
 import com.flipcash.app.core.AppRoute
-import com.flipcash.app.core.encryption.boxOpen
-import com.flipcash.app.core.navigation.DeeplinkType
 import com.flipcash.app.core.onramp.deeplinks.ExternalWalletConnection
-import com.flipcash.app.core.onramp.deeplinks.ExternallySignedTransaction
+import com.flipcash.app.core.tokens.SwapPurpose
 import com.flipcash.app.userflags.UserFlagsCoordinator
 import com.flipcash.services.internal.model.thirdparty.OnRampProvider
 import com.flipcash.services.internal.model.thirdparty.UsdcLiquidtyPool
@@ -42,12 +40,14 @@ import com.getcode.utils.TraceType
 import com.getcode.utils.base64
 import com.getcode.utils.trace
 import com.getcode.vendor.Base58
-import com.ionspin.kotlin.crypto.box.Box
-import com.ionspin.kotlin.crypto.box.BoxKeyPair
 import com.solana.networking.Rpc20Driver
 import com.solana.transaction.Message
 import com.solana.transaction.toUnsignedTransaction
 import dagger.hilt.android.scopes.ActivityRetainedScoped
+import dev.bmcreations.phantom.connect.WalletConnectorResult
+import dev.bmcreations.phantom.connect.WalletSignResult
+import dev.bmcreations.phantom.connect.wallet.PhantomWalletConnector
+import dev.bmcreations.phantom.connect.wallet.PhantomWalletException
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.NonCancellable
 import kotlinx.coroutines.flow.MutableSharedFlow
@@ -56,10 +56,7 @@ import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.flow.firstOrNull
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.withContext
-import kotlinx.serialization.json.Json
 import javax.inject.Inject
 
 @ActivityRetainedScoped
@@ -68,9 +65,8 @@ class ExternalWalletOnRampController @Inject constructor(
     private val userFlags: UserFlagsCoordinator,
     private val transactionController: TransactionOperations,
     private val rpcConfig: RpcConfig,
+    private val phantomConnector: PhantomWalletConnector,
 ) {
-    val keyPair: BoxKeyPair = Box.keypair()
-
     private val _state = MutableStateFlow<ExternalWalletOnRampState>(ExternalWalletOnRampState.Idle)
     val state: StateFlow<ExternalWalletOnRampState> = _state.asStateFlow()
 
@@ -118,45 +114,111 @@ class ExternalWalletOnRampController @Inject constructor(
         _state.value = state
     }
 
-    fun handleWalletDeeplink(type: DeeplinkType) {
+    suspend fun connectAndSign(origin: AppRoute) {
         val currentState = _state.value
-        when (type) {
-            is DeeplinkType.ExternalWalletConnection -> {
-                val result = type.result
-                val error = type.error
-                if (result != null) {
-                    decryptConnection(result.encryptionPublicKey, result.encryptedData, result.nonce, currentState)
-                } else {
-                    val resolvedError = DeeplinkError.fromCode(error?.errorCode)
-                    val message = error?.errorMessage ?: "Something went wrong"
+        val provider = currentState.provider ?: return
+
+        phantomConnector.beginCeremony()
+        try {
+            // 1. Connect
+            transitionTo(
+                ExternalWalletOnRampState.Connecting(origin = origin, provider = provider)
+            )
+
+            when (val connectResult = phantomConnector.connect()) {
+                is WalletConnectorResult.Connected -> {
+                    val publicKey = PublicKey(Base58.decode(connectResult.publicKeyBase58).toList())
+                    val walletConnection = ExternalWalletConnection(
+                        publicKey = publicKey,
+                        session = connectResult.publicKeyBase58,
+                    )
                     transitionTo(
-                        ExternalWalletOnRampState.Failed(
-                            error = DeeplinkOnRampError.WalletProvidedError(resolvedError, message = message),
-                            origin = currentState.origin,
-                            provider = currentState.provider,
+                        ExternalWalletOnRampState.Connected(
+                            origin = origin,
+                            provider = provider,
+                            connection = walletConnection,
                         )
                     )
                 }
-            }
-            is DeeplinkType.ExternalWalletSignedTransaction -> {
-                val result = type.result
-                val error = type.error
-                if (result != null) {
-                    decryptSigning(result.encryptedData, result.nonce, currentState)
-                } else {
-                    val resolvedError = DeeplinkError.fromCode(error?.errorCode)
-                    val message = error?.errorMessage ?: "Something went wrong"
-                    transitionTo(
-                        ExternalWalletOnRampState.Failed(
-                            error = DeeplinkOnRampError.WalletProvidedError(resolvedError, message = message),
-                            origin = currentState.origin,
-                            provider = currentState.provider,
-                        )
+
+                is WalletConnectorResult.Cancelled -> {
+                    fail(
+                        DeeplinkOnRampError.WalletProvidedError(
+                            DeeplinkError.UserRejectedRequest,
+                            message = connectResult.reason ?: "User cancelled connection"
+                        ),
+                        currentState
                     )
+                    return
                 }
+
+                is WalletConnectorResult.Error -> {
+                    fail(mapConnectorError(connectResult.cause), currentState)
+                    return
+                }
+            }
+
+            // 2. Build transaction (waits for amount if needed)
+            val amount = _amount.value
+            if (amount != null) {
+                when (origin) {
+                    is AppRoute.Token.Info,
+                    is AppRoute.Token.CurrencyCreator -> createAndValidateSwapTransaction()
+                    else -> createAndValidateDepositTransaction()
+                }
+            } else {
+                // Amount not yet set — handler will navigate to amount entry.
+                // connectAndSign returns here; the handler re-triggers tx building
+                // once amount is set via the Connected state observation.
+                return
+            }
+
+            // 3. Sign + Send
+            signAndSend()
+        } catch (e: Exception) {
+            fail(
+                DeeplinkOnRampError.FailedToCreateTransaction(message = e.message, cause = e),
+                _state.value
+            )
+        } finally {
+            phantomConnector.endCeremony()
+        }
+    }
+
+    suspend fun signAndSend() {
+        val signingState = _state.value
+        if (signingState !is ExternalWalletOnRampState.Signing) return
+
+        val txBase58 = Base58.encode(signingState.unsignedTransaction.toByteArray())
+
+        when (val signResult = phantomConnector.signTransaction(txBase58)) {
+            is WalletSignResult.Success -> {
+                val signedTxBase58 = signResult.signature
+                val signature = firstSignature(signedTxBase58)
+                    ?: error("Could not extract signature from signed transaction")
+
+                transitionTo(
+                    ExternalWalletOnRampState.Signed(
+                        origin = signingState.origin,
+                        provider = signingState.provider,
+                        connection = signingState.connection,
+                        signedTransaction = signedTxBase58,
+                        signature = signature,
+                        amount = signingState.amount,
+                        fee = signingState.fee,
+                        token = signingState.token,
+                        swapId = signingState.swapId,
+                    )
+                )
+            }
+
+            is WalletSignResult.Error -> {
+                fail(mapConnectorError(signResult.cause), signingState)
+                return
             }
-            else -> {}
         }
+
+        sendTransaction()
     }
 
     suspend fun createAndValidateSwapTransaction() {
@@ -199,7 +261,6 @@ class ExternalWalletOnRampController @Inject constructor(
                         origin = state.origin,
                         provider = state.provider,
                         connection = state.connection,
-                        encryptionPublicKey = state.encryptionPublicKey,
                         unsignedTransaction = transaction.encode().toList(),
                         amount = amount,
                         fee = fee,
@@ -237,7 +298,6 @@ class ExternalWalletOnRampController @Inject constructor(
                         origin = state.origin,
                         provider = state.provider,
                         connection = state.connection,
-                        encryptionPublicKey = state.encryptionPublicKey,
                         unsignedTransaction = transaction.serialize().toList(),
                         amount = amount,
                         fee = fee,
@@ -321,92 +381,6 @@ class ExternalWalletOnRampController @Inject constructor(
         }
     }
 
-    private fun decryptConnection(
-        encryptionPublicKey: List<Byte>,
-        encryptedData: List<Byte>,
-        nonce: List<Byte>,
-        currentState: ExternalWalletOnRampState,
-    ) {
-        try {
-            val data = encryptedData.boxOpen(
-                privateKey = keyPair.secretKey.map { it.toByte() },
-                publicKey = encryptionPublicKey,
-                nonce = nonce,
-            ).map { String(it.toByteArray()) }
-                .fold(
-                    onSuccess = {
-                        runCatching { Json.decodeFromString<ExternalWalletConnection>(it) }
-                            .onFailure { error ->
-                                fail(
-                                    DeeplinkOnRampError.DeserializationError(error.message, cause = error),
-                                    currentState
-                                )
-                            }
-                    },
-                    onFailure = {
-                        Result.failure(it)
-                    }
-                ).getOrThrow()
-
-            transitionTo(
-                ExternalWalletOnRampState.Connected(
-                    origin = currentState.origin ?: error("Origin is null"),
-                    provider = currentState.provider ?: error("Provider is null"),
-                    connection = data,
-                    encryptionPublicKey = encryptionPublicKey,
-                )
-            )
-        } catch (e: Exception) {
-            fail(DeeplinkOnRampError.DecryptionError(e.message, cause = e), currentState)
-        }
-    }
-
-    private fun decryptSigning(
-        encryptedData: List<Byte>,
-        nonce: List<Byte>,
-        currentState: ExternalWalletOnRampState,
-    ) {
-        val signing = currentState as? ExternalWalletOnRampState.Signing ?: return
-        try {
-            val data = encryptedData.boxOpen(
-                privateKey = keyPair.secretKey.map { it.toByte() },
-                publicKey = signing.encryptionPublicKey,
-                nonce = nonce,
-            ).map { String(it.toByteArray()) }
-                .fold(
-                    onSuccess = {
-                        runCatching { Json.decodeFromString<ExternallySignedTransaction>(it) }
-                            .onFailure { error ->
-                                fail(
-                                    DeeplinkOnRampError.DeserializationError(error.message, cause = error),
-                                    currentState
-                                )
-                            }
-                    },
-                    onFailure = { Result.failure(it) }
-                ).getOrThrow()
-
-            val signature = firstSignature(data.serializedTransaction)
-                ?: error("Could not extract signature from signed transaction")
-
-            transitionTo(
-                ExternalWalletOnRampState.Signed(
-                    origin = signing.origin,
-                    provider = signing.provider,
-                    connection = signing.connection,
-                    signedTransaction = data.serializedTransaction,
-                    signature = signature,
-                    amount = signing.amount,
-                    fee = signing.fee,
-                    token = signing.token,
-                    swapId = signing.swapId,
-                )
-            )
-        } catch (e: Exception) {
-            fail(DeeplinkOnRampError.DecryptionError(e.message, cause = e), currentState)
-        }
-    }
-
     private suspend fun checkExternalWalletBalances(
         sender: PublicKey,
         requiredUsdcQuarks: Long,
@@ -592,6 +566,14 @@ class ExternalWalletOnRampController @Inject constructor(
             )
         )
     }
+
+    private fun mapConnectorError(cause: Throwable): DeeplinkOnRampError {
+        if (cause is PhantomWalletException) {
+            val deeplinkError = DeeplinkError.fromCode(cause.code.toLong())
+            return DeeplinkOnRampError.WalletProvidedError(deeplinkError, message = cause.message)
+        }
+        return DeeplinkOnRampError.FailedToCreateTransaction(message = cause.message, cause = cause)
+    }
 }
 
 // ~0.0065 SOL: covers up to 3 ATA rent exemptions + priority fee + base fee
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampHandler.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampHandler.kt
index 7d246c52f..2153cccf1 100644
--- a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampHandler.kt
+++ b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampHandler.kt
@@ -5,19 +5,11 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalResources
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.flipcash.app.analytics.rememberAnalytics
 import com.flipcash.app.core.AppRoute
-import com.flipcash.app.core.android.IntentUtils
-import com.flipcash.app.core.android.extensions.canNativelyHandle
 import com.flipcash.app.core.tokens.SwapPurpose
-import com.flipcash.app.onramp.internal.buildConnectDeeplink
-import com.flipcash.app.onramp.internal.buildTransactionDeeplink
-import com.flipcash.app.onramp.internal.curvePublicKey
-import com.flipcash.app.onramp.internal.packageName
 import com.flipcash.services.internal.model.thirdparty.OnRampProvider
 import com.flipcash.shared.onramp.deeplinks.R
 import com.getcode.manager.BottomBarAction
@@ -41,8 +33,6 @@ fun ExternalWalletOnRampHandler(
     val state by controller.state.collectAsStateWithLifecycle()
     val amount by controller.amount.collectAsStateWithLifecycle()
 
-    val uriHandler = LocalUriHandler.current
-    val context = LocalContext.current
     val resources = LocalResources.current
 
     fun close(exit: Boolean) {
@@ -78,38 +68,17 @@ fun ExternalWalletOnRampHandler(
             is ExternalWalletOnRampState.Idle -> Unit
 
             is ExternalWalletOnRampState.Started -> {
-                val uri = buildConnectDeeplink(
-                    provider = current.provider,
-                    curvePublicKey = controller.keyPair.curvePublicKey,
-                    origin = current.origin,
-                )
-                trace(
-                    tag = TAG,
-                    message = "wallet connect uri: $uri",
-                    type = TraceType.Process
-                )
-                if (uri?.canNativelyHandle(context) == true) {
-                    if (current.origin is AppRoute.Token.Info) {
-                        controller.emitPendingNavigation(
-                            AppRoute.Token.Swap(
-                                SwapPurpose.FundWithWallet(current.origin.mint),
-                                shortfall = current.origin.shortfall
-                            )
-                        )
-                    }
-
-                    analytics.connectWallet(current.provider)
-                    uriHandler.openUri(uri.toString())
-                    controller.transitionTo(
-                        ExternalWalletOnRampState.Connecting(
-                            origin = current.origin,
-                            provider = current.provider,
+                if (current.origin is AppRoute.Token.Info) {
+                    controller.emitPendingNavigation(
+                        AppRoute.Token.Swap(
+                            SwapPurpose.FundWithWallet(current.origin.mint),
+                            shortfall = current.origin.shortfall
                         )
                     )
-                } else {
-                    context.startActivity(IntentUtils.appStoreListing(current.provider.packageName))
-                    controller.reset()
                 }
+
+                analytics.connectWallet(current.provider)
+                composeScope.launch { controller.connectAndSign(current.origin) }
             }
 
             is ExternalWalletOnRampState.Connecting -> Unit
@@ -142,32 +111,6 @@ fun ExternalWalletOnRampHandler(
             }
 
             is ExternalWalletOnRampState.Signing -> {
-                val uri = buildTransactionDeeplink(
-                    provider = current.provider,
-                    curvePublicKey = controller.keyPair.curvePublicKey,
-                    encryptionPublicKey = current.encryptionPublicKey,
-                    unsignedTransaction = current.unsignedTransaction,
-                    session = current.connection.session,
-                    secretKey = controller.keyPair.secretKey.map { it.toByte() },
-                    origin = current.origin,
-                )
-                if (uri == null) {
-                    controller.transitionTo(
-                        ExternalWalletOnRampState.Failed(
-                            error = DeeplinkOnRampError.FailedToGenerateDeeplink(),
-                            origin = current.origin,
-                            provider = current.provider,
-                        )
-                    )
-                    return@LaunchedEffect
-                }
-
-                trace(
-                    tag = TAG,
-                    message = "wallet transact uri: $uri",
-                    type = TraceType.Process
-                )
-
                 val swapId = current.swapId
                 if (current.origin is AppRoute.Token.Info && swapId != null) {
                     controller.emitPendingNavigation(
@@ -178,7 +121,12 @@ fun ExternalWalletOnRampHandler(
                 }
 
                 analytics.amountSelectedForWalletTransfer(current.provider, current.amount.localFiat.underlyingTokenAmount)
-                uriHandler.openUri(uri.toString())
+
+                // When amount was deferred (Token.Info / CurrencyCreator), connectAndSign()
+                // returned early after connect. Drive the sign + send steps now.
+                if (current.origin is AppRoute.Token.Info || current.origin is AppRoute.Token.CurrencyCreator) {
+                    composeScope.launch { controller.signAndSend() }
+                }
             }
 
             is ExternalWalletOnRampState.Signed -> {
@@ -267,9 +215,7 @@ fun ExternalWalletOnRampHandler(
                 val (title, message) = error.messaging(
                     resources = resources,
                     provider = when (current.provider) {
-                        OnRampProvider.Backpack -> resources.getString(R.string.label_backpack)
                         OnRampProvider.Phantom -> resources.getString(R.string.label_phantom)
-                        OnRampProvider.Solflare -> resources.getString(R.string.label_solflare)
                         null -> ""
                     }
                 )
@@ -349,11 +295,8 @@ private typealias Title = String
 private typealias Message = String
 
 private fun DeeplinkOnRampError.messaging(resources: Resources, provider: String): Pair<Title, Message> = when (this) {
-    is DeeplinkOnRampError.DecryptionError -> resources.getString(R.string.error_title_deeplinkOnRampDecryption) to resources.getString(R.string.error_description_deeplinkOnRampDecryption).format(provider)
-    is DeeplinkOnRampError.DeserializationError -> resources.getString(R.string.error_title_deeplinkOnRampDeserialization) to resources.getString(R.string.error_description_deeplinkOnRampDeserialization).format(provider)
     is DeeplinkOnRampError.FailedToCreateTransaction -> resources.getString(R.string.error_title_deeplinkOnRampFailedToCreateTransaction) to resources.getString(R.string.error_description_deeplinkOnRampFailedToCreateTransaction)
     is DeeplinkOnRampError.FailedToSimulateTransaction -> resources.getString(R.string.error_title_deeplinkOnRampFailedToSimulateTransaction) to resources.getString(R.string.error_description_deeplinkOnRampFailedToSimulateTransaction)
-    is DeeplinkOnRampError.FailedToGenerateDeeplink -> resources.getString(R.string.error_title_deeplinkOnRampFailedToCreateDeeplink) to resources.getString(R.string.error_description_deeplinkOnRampFailedToCreateDeeplink)
     is DeeplinkOnRampError.FailedToSendTransaction -> resources.getString(R.string.error_title_deeplinkOnRampFailedToSendTransaction) to resources.getString(R.string.error_description_deeplinkOnRampFailedToSendTransaction).format(provider)
     is DeeplinkOnRampError.FailedToSubmitBuyToServer -> resources.getString(R.string.error_title_deeplinkOnRampExternalFundBuy) to resources.getString(R.string.error_description_deeplinkOnRampExternalFundBuy).format(provider)
     is DeeplinkOnRampError.InsufficientSol -> resources.getString(R.string.error_title_deeplinkOnRampInsufficientSol) to resources.getString(R.string.error_description_deeplinkOnRampInsufficientSol, provider)
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampState.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampState.kt
index fc1a85694..a797bc382 100644
--- a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampState.kt
+++ b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampState.kt
@@ -26,14 +26,12 @@ sealed interface ExternalWalletOnRampState {
         val origin: AppRoute,
         val provider: OnRampProvider.UsesDeeplinks,
         val connection: ExternalWalletConnection,
-        val encryptionPublicKey: List<Byte>,
     ) : ExternalWalletOnRampState
 
     data class Signing(
         val origin: AppRoute,
         val provider: OnRampProvider.UsesDeeplinks,
         val connection: ExternalWalletConnection,
-        val encryptionPublicKey: List<Byte>,
         val unsignedTransaction: List<Byte>,
         val amount: VerifiedFiat,
         val fee: LocalFiat,
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/inject/PhantomWalletModule.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/inject/PhantomWalletModule.kt
new file mode 100644
index 000000000..8ef4457ab
--- /dev/null
+++ b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/inject/PhantomWalletModule.kt
@@ -0,0 +1,27 @@
+package com.flipcash.app.onramp.inject
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.components.ActivityRetainedComponent
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.android.scopes.ActivityRetainedScoped
+import dev.bmcreations.phantom.connect.wallet.PhantomWalletConnector
+import dev.bmcreations.phantom.connect.wallet.createDeeplinkLauncher
+
+@Module
+@InstallIn(ActivityRetainedComponent::class)
+object PhantomWalletModule {
+    @Provides
+    @ActivityRetainedScoped
+    fun providePhantomWalletConnector(
+        @ApplicationContext context: Context,
+    ): PhantomWalletConnector {
+        return PhantomWalletConnector(
+            deeplinkLauncher = createDeeplinkLauncher(context),
+            appUrl = "https://app.flipcash.com",
+            callbackScheme = "codewallet",
+        )
+    }
+}
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/internal/Deeplinks.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/internal/Deeplinks.kt
deleted file mode 100644
index 8d97993b0..000000000
--- a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/internal/Deeplinks.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.flipcash.app.onramp.internal
-
-import android.net.Uri
-import com.flipcash.app.core.AppRoute
-import com.flipcash.app.core.encryption.boxSeal
-import com.flipcash.app.core.encryption.toPublicKey
-import com.flipcash.app.core.onramp.deeplinks.OnRampDeeplinkOrigin
-import com.flipcash.services.internal.model.thirdparty.OnRampProvider
-import com.getcode.solana.keys.base58
-import com.getcode.utils.base58
-import com.ionspin.kotlin.crypto.box.BoxKeyPair
-import com.ionspin.kotlin.crypto.secretbox.crypto_secretbox_NONCEBYTES
-import com.ionspin.kotlin.crypto.util.LibsodiumRandom
-import kotlinx.serialization.json.Json
-
-
-private val OnRampProvider.UsesDeeplinks.authority: String
-    get() = when (this) {
-        OnRampProvider.Backpack -> "backpack.app"
-        OnRampProvider.Phantom -> "phantom.app"
-        OnRampProvider.Solflare -> "solflare.com"
-    }
-
-internal val OnRampProvider.UsesDeeplinks.packageName: String
-    get() = when (this) {
-        OnRampProvider.Backpack -> "app.backpack.mobile"
-        OnRampProvider.Phantom -> "app.phantom"
-        OnRampProvider.Solflare -> "com.solflare.mobile"
-    }
-
-private val OnRampProvider.UsesDeeplinks.redirectUrlPrefix: String
-    // pathSegment[1] is fed into encryption pub key look up in the URI
-    // backpack returns 'wallet_'
-    get() = when (this) {
-        OnRampProvider.Backpack -> "https://app.flipcash.com/external/wallet"
-        OnRampProvider.Phantom -> "https://app.flipcash.com/external/phantom"
-        OnRampProvider.Solflare -> "https://app.flipcash.com/external/solflare"
-    }
-
-internal val BoxKeyPair.curvePublicKey: String?
-    get() = publicKey.toPublicKey().base58()
-
-internal fun buildConnectDeeplink(
-    provider: OnRampProvider.UsesDeeplinks,
-    curvePublicKey: String?,
-    origin: AppRoute?,
-): Uri? {
-    val deeplinkOrigin = OnRampDeeplinkOrigin.fromRoute(origin)
-    val originEncoded = deeplinkOrigin?.forUri() ?: "unknown"
-    val redirectUrl = "${provider.redirectUrlPrefix}/connected?origin=$originEncoded"
-    return Uri.Builder()
-        .scheme("https")
-        .authority(provider.authority)
-        .path("ul/v1/connect")
-        .appendQueryParameter("app_url", "https://app.flipcash.com")
-        .appendQueryParameter("dapp_encryption_public_key", curvePublicKey)
-        .appendQueryParameter("cluster", "mainnet-beta")
-        .appendQueryParameter("redirect_link", redirectUrl)
-        .build()
-}
-
-internal fun buildTransactionDeeplink(
-    provider: OnRampProvider.UsesDeeplinks,
-    curvePublicKey: String?,
-    encryptionPublicKey: List<Byte>,
-    unsignedTransaction: List<Byte>,
-    session: String?,
-    secretKey: List<Byte>,
-    origin: AppRoute?,
-): Uri? {
-    val nonce = LibsodiumRandom.buf(crypto_secretbox_NONCEBYTES).map { it.toByte() }
-    val payload = mapOf(
-        "transaction" to unsignedTransaction.base58,
-        "session" to session
-    )
-
-    val message = Json.encodeToString(payload).boxSeal(
-        privateKey = secretKey,
-        publicKey = encryptionPublicKey,
-        nonce = nonce,
-    ).getOrNull() ?: return null
-
-    val deeplinkOrigin = OnRampDeeplinkOrigin.fromRoute(origin)
-    val originEncoded = deeplinkOrigin?.forUri() ?: "unknown"
-
-    val redirectUrl = "${provider.redirectUrlPrefix}/signed?origin=$originEncoded"
-    return Uri.Builder()
-        .scheme("https")
-        .authority(provider.authority)
-        .path("ul/v1/signTransaction")
-        .appendQueryParameter("app_url", "https://app.flipcash.com")
-        .appendQueryParameter("dapp_encryption_public_key", curvePublicKey)
-        .appendQueryParameter("cluster", "mainnet-beta")
-        .appendQueryParameter("nonce", nonce.base58)
-        .appendQueryParameter("payload", message.base58)
-        .appendQueryParameter("redirect_link", redirectUrl)
-        .build()
-}
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
index 3b05e8004..db7fb5d32 100644
--- 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
@@ -80,7 +80,6 @@ class DeeplinkErrorTest {
                 message = "disconnected"
             ),
             DeeplinkOnRampError.FailedToCreateTransaction(message = "fail"),
-            DeeplinkOnRampError.DecryptionError(message = "fail"),
         )
 
         errors.forEach { error ->
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletBalanceCheckTest.kt b/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletBalanceCheckTest.kt
index 7f1a0c3f2..4dd11a3ec 100644
--- a/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletBalanceCheckTest.kt
+++ b/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletBalanceCheckTest.kt
@@ -14,17 +14,12 @@ import com.getcode.opencode.model.financial.Fiat
 import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.solana.keys.PublicKey
 import com.getcode.solana.rpc.RpcConfig
-import com.ionspin.kotlin.crypto.box.Box
-import com.ionspin.kotlin.crypto.box.BoxKeyPair
 import com.solana.networking.HttpNetworkDriver
 import com.solana.networking.HttpRequest
+import dev.bmcreations.phantom.connect.wallet.PhantomWalletConnector
 import io.mockk.coEvery
-import io.mockk.every
 import io.mockk.mockk
-import io.mockk.mockkObject
-import io.mockk.unmockkObject
 import kotlinx.coroutines.test.runTest
-import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import kotlin.test.assertTrue
@@ -36,6 +31,7 @@ class ExternalWalletBalanceCheckTest {
     private val transactionController = mockk<TransactionOperations>(relaxed = true)
     private val networkDriver = mockk<HttpNetworkDriver>()
     private val rpcConfig = RpcConfig(networkDriver = networkDriver, rpcUrl = "https://localhost")
+    private val phantomConnector = mockk<PhantomWalletConnector>(relaxed = true)
 
     private lateinit var controller: ExternalWalletOnRampController
 
@@ -43,21 +39,15 @@ class ExternalWalletBalanceCheckTest {
 
     @Before
     fun setUp() {
-        mockkObject(Box)
-        every { Box.keypair() } returns mockk<BoxKeyPair>(relaxed = true)
         controller = ExternalWalletOnRampController(
             userManager = userManager,
             userFlags = userFlags,
             transactionController = transactionController,
             rpcConfig = rpcConfig,
+            phantomConnector = phantomConnector,
         )
     }
 
-    @After
-    fun tearDown() {
-        unmockkObject(Box)
-    }
-
     private fun putControllerInConnectedState(requiredQuarks: Long = 10_000_000L) {
         controller.transitionTo(
             ExternalWalletOnRampState.Connected(
@@ -67,7 +57,6 @@ class ExternalWalletBalanceCheckTest {
                     publicKey = testPublicKey,
                     session = "test-session",
                 ),
-                encryptionPublicKey = List(32) { 0.toByte() },
             )
         )
         controller.setAmount(
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletDeeplinkStateErrorTest.kt b/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletDeeplinkStateErrorTest.kt
index 71d97d2d2..8cf336b83 100644
--- a/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletDeeplinkStateErrorTest.kt
+++ b/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletDeeplinkStateErrorTest.kt
@@ -1,24 +1,24 @@
 package com.flipcash.app.onramp.internal
 
-import com.flipcash.app.core.navigation.DeeplinkType
-import com.flipcash.app.core.onramp.deeplinks.ExternalWalletDeeplinkError
-import com.flipcash.app.core.onramp.deeplinks.OnRampDeeplinkOrigin
+import com.flipcash.app.core.AppRoute
 import com.flipcash.app.onramp.DeeplinkError
 import com.flipcash.app.onramp.DeeplinkOnRampError
 import com.flipcash.app.onramp.ExternalWalletOnRampController
 import com.flipcash.app.onramp.ExternalWalletOnRampState
 import com.flipcash.app.userflags.UserFlagsCoordinator
+import com.flipcash.services.internal.model.thirdparty.OnRampProvider
 import com.flipcash.services.user.UserManager
 import com.getcode.opencode.controllers.TransactionOperations
 import com.getcode.solana.rpc.RpcConfig
-import com.ionspin.kotlin.crypto.box.Box
-import com.ionspin.kotlin.crypto.box.BoxKeyPair
 import com.solana.networking.HttpNetworkDriver
-import io.mockk.every
+import dev.bmcreations.phantom.connect.WalletConnectorResult
+import dev.bmcreations.phantom.connect.WalletSignResult
+import dev.bmcreations.phantom.connect.wallet.PhantomWalletConnector
+import dev.bmcreations.phantom.connect.wallet.PhantomWalletException
+import io.mockk.coEvery
+import io.mockk.coVerify
 import io.mockk.mockk
-import io.mockk.mockkObject
-import io.mockk.unmockkObject
-import org.junit.After
+import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test
 import kotlin.test.assertEquals
@@ -30,64 +30,74 @@ class ExternalWalletDeeplinkStateErrorTest {
     private val transactionController = mockk<TransactionOperations>(relaxed = true)
     private val networkDriver = mockk<HttpNetworkDriver>(relaxed = true)
     private val rpcConfig = RpcConfig(networkDriver = networkDriver, rpcUrl = "https://localhost")
-
     private val userFlags = mockk<UserFlagsCoordinator>(relaxed = true)
+    private val phantomConnector = mockk<PhantomWalletConnector>(relaxed = true)
 
     private lateinit var controller: ExternalWalletOnRampController
 
     @Before
     fun setUp() {
-        mockkObject(Box)
-        every { Box.keypair() } returns mockk<BoxKeyPair>(relaxed = true)
         controller = ExternalWalletOnRampController(
             userManager = userManager,
             userFlags = userFlags,
             transactionController = transactionController,
             rpcConfig = rpcConfig,
+            phantomConnector = phantomConnector,
         )
     }
 
-    @After
-    fun tearDown() {
-        unmockkObject(Box)
+    @Test
+    fun `user cancellation during connect transitions to Failed with UserRejectedRequest`() = runTest {
+        coEvery { phantomConnector.connect() } returns WalletConnectorResult.Cancelled("User rejected the request")
+
+        controller.start(AppRoute.Sheets.Menu, OnRampProvider.Phantom)
+        controller.connectAndSign(AppRoute.Sheets.Menu)
+
+        val state = controller.state.value
+        assertTrue(state is ExternalWalletOnRampState.Failed, "Expected Failed state, got $state")
+        val error = state.error
+        assertTrue(error is DeeplinkOnRampError.WalletProvidedError, "Expected WalletProvidedError, got $error")
+        assertEquals(DeeplinkError.UserRejectedRequest, error.error)
     }
 
     @Test
-    fun `wallet-provided error transitions to Failed state`() {
-        controller.handleWalletDeeplink(
-            DeeplinkType.ExternalWalletConnection(
-                origin = OnRampDeeplinkOrigin.Menu,
-                result = null,
-                error = ExternalWalletDeeplinkError(
-                    errorCode = "4001",
-                    errorMessage = "User rejected the request"
-                )
-            )
+    fun `PhantomWalletException during connect maps to WalletProvidedError`() = runTest {
+        coEvery { phantomConnector.connect() } returns WalletConnectorResult.Error(
+            PhantomWalletException(4001, "User rejected the request")
         )
 
+        controller.start(AppRoute.Sheets.Menu, OnRampProvider.Phantom)
+        controller.connectAndSign(AppRoute.Sheets.Menu)
+
         val state = controller.state.value
         assertTrue(state is ExternalWalletOnRampState.Failed, "Expected Failed state")
         val error = state.error
         assertTrue(error is DeeplinkOnRampError.WalletProvidedError, "Expected WalletProvidedError")
         assertEquals(DeeplinkError.UserRejectedRequest, error.error)
-        assertEquals("User rejected the request", error.message)
     }
 
     @Test
-    fun `wallet connection with null result and null error transitions to Failed with Unknown`() {
-        controller.handleWalletDeeplink(
-            DeeplinkType.ExternalWalletConnection(
-                origin = OnRampDeeplinkOrigin.Menu,
-                result = null,
-                error = null,
-            )
+    fun `generic error during connect maps to FailedToCreateTransaction`() = runTest {
+        coEvery { phantomConnector.connect() } returns WalletConnectorResult.Error(
+            RuntimeException("Something broke")
         )
 
+        controller.start(AppRoute.Sheets.Menu, OnRampProvider.Phantom)
+        controller.connectAndSign(AppRoute.Sheets.Menu)
+
         val state = controller.state.value
         assertTrue(state is ExternalWalletOnRampState.Failed, "Expected Failed state")
-        val error = state.error
-        assertTrue(error is DeeplinkOnRampError.WalletProvidedError, "Expected WalletProvidedError")
-        assertEquals(DeeplinkError.Unknown, error.error)
-        assertEquals("Something went wrong", error.message)
+        assertTrue(state.error is DeeplinkOnRampError.FailedToCreateTransaction, "Expected FailedToCreateTransaction")
+    }
+
+    @Test
+    fun `endCeremony is always called even on connect failure`() = runTest {
+        coEvery { phantomConnector.connect() } returns WalletConnectorResult.Cancelled("cancelled")
+
+        controller.start(AppRoute.Sheets.Menu, OnRampProvider.Phantom)
+        controller.connectAndSign(AppRoute.Sheets.Menu)
+
+        coVerify(exactly = 1) { phantomConnector.beginCeremony() }
+        coVerify(exactly = 1) { phantomConnector.endCeremony() }
     }
 }
diff --git a/apps/flipcash/shared/router/src/main/kotlin/com/flipcash/app/router/internal/AppRouter.kt b/apps/flipcash/shared/router/src/main/kotlin/com/flipcash/app/router/internal/AppRouter.kt
index 893df2623..baf44d145 100644
--- a/apps/flipcash/shared/router/src/main/kotlin/com/flipcash/app/router/internal/AppRouter.kt
+++ b/apps/flipcash/shared/router/src/main/kotlin/com/flipcash/app/router/internal/AppRouter.kt
@@ -6,20 +6,14 @@ import com.flipcash.app.core.navigation.DeeplinkAction
 import com.flipcash.app.core.navigation.DeeplinkType
 import com.flipcash.app.core.navigation.Key
 import com.flipcash.app.core.navigation.fragments
-import com.flipcash.app.core.onramp.deeplinks.ExternalWalletDeeplinkError
-import com.flipcash.app.core.onramp.deeplinks.OnRampDeeplinkOrigin
-import com.flipcash.app.core.onramp.deeplinks.WalletDeeplinkConnectionResult
-import com.flipcash.app.core.onramp.deeplinks.WalletDeeplinkSigningResult
 import com.flipcash.app.core.verification.email.EmailDeeplinkOrigin
 import com.flipcash.app.router.Router
 import com.flipcash.app.router.internal.AppRouter.Companion.cashLink
-import com.flipcash.app.router.internal.AppRouter.Companion.external
 import com.flipcash.app.router.internal.AppRouter.Companion.login
 import com.flipcash.app.router.internal.AppRouter.Companion.token
 import com.flipcash.app.router.internal.AppRouter.Companion.verification
 import com.flipcash.services.user.AuthState
 import com.getcode.solana.keys.Mint
-import com.getcode.utils.decodeBase58
 import com.getcode.utils.decodeBase64
 import com.getcode.utils.urlDecode
 import dev.theolm.rinku.DeepLink
@@ -31,7 +25,6 @@ internal class AppRouter(
     companion object {
         val login = listOf("login")
         val cashLink = listOf("c", "cash")
-        val external = listOf("external")
         val verification = listOf("verify")
         val token = listOf("token")
     }
@@ -59,10 +52,6 @@ internal class AppRouter(
                 listOf(AppRoute.Sheets.Wallet, AppRoute.Token.Info(type.mint, fromDeeplink = true))
             )
 
-            is DeeplinkType.ExternalWalletConnection,
-            is DeeplinkType.ExternalWalletSignedTransaction ->
-                DeeplinkAction.ExternalWallet(type)
-
             is DeeplinkType.EmailVerification -> resolveEmailVerification(type)
         }
     }
@@ -72,8 +61,6 @@ internal class AppRouter(
             deepLink.isLogin() -> deepLink.handleLoginLink()
             deepLink.isCashLink() -> deepLink.handleCashLink()
             deepLink.isToken() -> deepLink.handleTokenLink()
-            deepLink.isExternalWalletConnection() -> deepLink.handleWalletConnect()
-            deepLink.isExternalWalletSignedTransaction() -> deepLink.handleWalletSignedTransaction()
             deepLink.isEmailVerification() -> deepLink.handleEmailVerification()
             else -> null
         }
@@ -123,12 +110,6 @@ private fun DeepLink.isLogin(): Boolean = login.contains(pathSegments.getOrNull(
 private fun DeepLink.isCashLink(): Boolean = cashLink.contains(pathSegments.getOrNull(0))
 private fun DeepLink.isToken(): Boolean = token.contains(pathSegments.getOrNull(0))
 
-private fun DeepLink.isExternalWalletConnection(): Boolean = external.contains(pathSegments.getOrNull(0))
-        && pathSegments.getOrNull(2) == "connected"
-
-private fun DeepLink.isExternalWalletSignedTransaction(): Boolean = external.contains(pathSegments.getOrNull(0))
-        && pathSegments.getOrNull(2) == "signed"
-
 private fun DeepLink.isEmailVerification(): Boolean = verification.contains(pathSegments.getOrNull(0))
         && data.toUri().getQueryParameter("email") != null
 
@@ -156,66 +137,6 @@ private fun DeepLink.handleTokenLink(): DeeplinkType.TokenInfo? {
     return DeeplinkType.TokenInfo(Mint(mint))
 }
 
-private fun DeepLink.handleWalletConnect(): DeeplinkType.ExternalWalletConnection? {
-    val uri = data.toUri()
-    val wallet = uri.pathSegments.getOrNull(1) ?: return null
-    val origin = uri.getQueryParameter("origin")
-
-    val phantomOrigin = OnRampDeeplinkOrigin.fromString(origin) ?: return null
-    val errorCode = uri.getQueryParameter("errorCode")
-    val errorMessage = uri.getQueryParameter("errorMessage")
-
-    val encryptionPublicKey = uri.getQueryParameter("${wallet}_encryption_public_key")?.decodeBase58()?.toList()
-    val nonce = uri.getQueryParameter("nonce")?.decodeBase58()?.toList()
-    val data = uri.getQueryParameter("data")?.decodeBase58()?.toList()
-
-    val result = if (encryptionPublicKey != null && nonce != null && data != null) {
-        WalletDeeplinkConnectionResult(
-            encryptionPublicKey = encryptionPublicKey,
-            nonce = nonce,
-            encryptedData = data
-        )
-    } else {
-        null
-    }
-
-    return DeeplinkType.ExternalWalletConnection(
-        origin = phantomOrigin,
-        result = result,
-        error = if (errorCode != null && errorMessage != null) {
-            ExternalWalletDeeplinkError(errorCode, errorMessage)
-        } else null,
-    )
-}
-
-private fun DeepLink.handleWalletSignedTransaction(): DeeplinkType.ExternalWalletSignedTransaction? {
-    val uri = data.toUri()
-    val origin = uri.getQueryParameter("origin")
-
-    val phantomOrigin = OnRampDeeplinkOrigin.fromString(origin) ?: return null
-    val errorCode = uri.getQueryParameter("errorCode")
-    val errorMessage = uri.getQueryParameter("errorMessage")
-    val nonce = uri.getQueryParameter("nonce")?.decodeBase58()?.toList()
-    val data = uri.getQueryParameter("data")?.decodeBase58()?.toList()
-
-    val result = if (nonce != null && data != null) {
-        WalletDeeplinkSigningResult(
-            nonce = nonce,
-            encryptedData = data
-        )
-    } else {
-        null
-    }
-
-    return DeeplinkType.ExternalWalletSignedTransaction(
-        origin = phantomOrigin,
-        result = result,
-        error = if (errorCode != null && errorMessage != null) {
-            ExternalWalletDeeplinkError(errorCode, errorMessage)
-        } else null,
-    )
-}
-
 //  https://app.flipcash.com/verify?email={email}&code={code}&client_data={data}
 private fun DeepLink.handleEmailVerification(): DeeplinkType.EmailVerification? {
     val uri = data.toUri()
@@ -224,7 +145,9 @@ private fun DeepLink.handleEmailVerification(): DeeplinkType.EmailVerification?
     val clientData = uri.getQueryParameter("client_data")?.urlDecode()
         ?.let { JSONObject(it) }
 
-    val origin = clientData?.getString("origin")?.decodeBase64()?.let { String(it, Charsets.UTF_8) }
+    val origin = clientData?.getString("origin")?.decodeBase64()?.let {
+        String(it, Charsets.UTF_8)
+    }
     if (code != null && email != null) {
         return DeeplinkType.EmailVerification(
             email = email,
diff --git a/apps/flipcash/shared/router/src/test/kotlin/com/flipcash/app/router/internal/AppRouterTest.kt b/apps/flipcash/shared/router/src/test/kotlin/com/flipcash/app/router/internal/AppRouterTest.kt
index ff7425208..38b1908a2 100644
--- a/apps/flipcash/shared/router/src/test/kotlin/com/flipcash/app/router/internal/AppRouterTest.kt
+++ b/apps/flipcash/shared/router/src/test/kotlin/com/flipcash/app/router/internal/AppRouterTest.kt
@@ -4,10 +4,8 @@ import android.util.Base64
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.navigation.DeeplinkAction
 import com.flipcash.app.core.navigation.DeeplinkType
-import com.flipcash.app.core.onramp.deeplinks.OnRampDeeplinkOrigin
 import com.flipcash.services.user.AuthState
 import com.getcode.solana.keys.Mint
-import com.getcode.vendor.Base58
 import dev.theolm.rinku.DeepLink
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
@@ -90,73 +88,6 @@ class AppRouterTest {
 
     // endregion
 
-    // region classify — ExternalWallet
-
-    @Test
-    fun `classify recognizes external wallet connection`() {
-        val pubKey = Base58.encode(ByteArray(32) { 1 })
-        val nonce = Base58.encode(ByteArray(24) { 2 })
-        val data = Base58.encode(ByteArray(48) { 3 })
-
-        val url = "https://app.flipcash.com/external/phantom/connected" +
-                "?origin=menu" +
-                "&phantom_encryption_public_key=$pubKey" +
-                "&nonce=$nonce" +
-                "&data=$data"
-
-        val type = router.classify(DeepLink(url))
-        assertIs<DeeplinkType.ExternalWalletConnection>(type)
-        assertEquals(OnRampDeeplinkOrigin.Menu, type.origin)
-        assertTrue(type.result != null)
-        assertNull(type.error)
-    }
-
-    @Test
-    fun `classify recognizes external wallet connection error`() {
-        val url = "https://app.flipcash.com/external/phantom/connected" +
-                "?origin=menu" +
-                "&errorCode=4001" +
-                "&errorMessage=User+rejected+request"
-
-        val type = router.classify(DeepLink(url))
-        assertIs<DeeplinkType.ExternalWalletConnection>(type)
-        assertNull(type.result)
-        assertEquals("4001", type.error?.errorCode)
-    }
-
-    @Test
-    fun `classify recognizes external wallet signed transaction`() {
-        val nonce = Base58.encode(ByteArray(24) { 5 })
-        val data = Base58.encode(ByteArray(64) { 6 })
-
-        val url = "https://app.flipcash.com/external/phantom/signed" +
-                "?origin=menu" +
-                "&nonce=$nonce" +
-                "&data=$data"
-
-        val type = router.classify(DeepLink(url))
-        assertIs<DeeplinkType.ExternalWalletSignedTransaction>(type)
-        assertEquals(OnRampDeeplinkOrigin.Menu, type.origin)
-        assertTrue(type.result != null)
-    }
-
-    @Test
-    fun `classify recognizes wallet origin`() {
-        val nonce = Base58.encode(ByteArray(24) { 5 })
-        val data = Base58.encode(ByteArray(64) { 6 })
-
-        val url = "https://app.flipcash.com/external/phantom/signed" +
-                "?origin=wallet" +
-                "&nonce=$nonce" +
-                "&data=$data"
-
-        val type = router.classify(DeepLink(url))
-        assertIs<DeeplinkType.ExternalWalletSignedTransaction>(type)
-        assertEquals(OnRampDeeplinkOrigin.Wallet, type.origin)
-    }
-
-    // endregion
-
     // region classify — EmailVerification
 
     @Test
@@ -199,6 +130,12 @@ class AppRouterTest {
         assertNull(type)
     }
 
+    @Test
+    fun `classify returns null for old external wallet paths`() {
+        val type = router.classify(DeepLink("https://app.flipcash.com/external/phantom/connected?origin=menu"))
+        assertNull(type)
+    }
+
     // endregion
 
     // region dispatch — Not logged in
@@ -233,24 +170,6 @@ class AppRouterTest {
         assertIs<AppRoute.Onboarding.Login>(action.routes.single())
     }
 
-    @Test
-    fun `dispatch redirects external wallet to login when logged out`() {
-        loggedOut()
-        val pubKey = Base58.encode(ByteArray(32) { 1 })
-        val nonce = Base58.encode(ByteArray(24) { 2 })
-        val data = Base58.encode(ByteArray(48) { 3 })
-
-        val url = "https://app.flipcash.com/external/phantom/connected" +
-                "?origin=menu" +
-                "&phantom_encryption_public_key=$pubKey" +
-                "&nonce=$nonce" +
-                "&data=$data"
-
-        val action = router.dispatch(DeepLink(url))
-        assertIs<DeeplinkAction.Navigate>(action)
-        assertIs<AppRoute.Onboarding.Login>(action.routes.single())
-    }
-
     // endregion
 
     // region dispatch — Logged in: Login
@@ -303,60 +222,6 @@ class AppRouterTest {
 
     // endregion
 
-    // region dispatch — Logged in: ExternalWallet
-
-    @Test
-    fun `dispatch returns ExternalWallet for wallet connection deeplink`() {
-        loggedIn()
-        val pubKey = Base58.encode(ByteArray(32) { 1 })
-        val nonce = Base58.encode(ByteArray(24) { 2 })
-        val data = Base58.encode(ByteArray(48) { 3 })
-
-        val url = "https://app.flipcash.com/external/phantom/connected" +
-                "?origin=menu" +
-                "&phantom_encryption_public_key=$pubKey" +
-                "&nonce=$nonce" +
-                "&data=$data"
-
-        val action = router.dispatch(DeepLink(url))
-        assertIs<DeeplinkAction.ExternalWallet>(action)
-        assertIs<DeeplinkType.ExternalWalletConnection>(action.type)
-    }
-
-    @Test
-    fun `dispatch returns ExternalWallet for signed transaction deeplink`() {
-        loggedIn()
-        val nonce = Base58.encode(ByteArray(24) { 5 })
-        val data = Base58.encode(ByteArray(64) { 6 })
-
-        val url = "https://app.flipcash.com/external/phantom/signed" +
-                "?origin=wallet" +
-                "&nonce=$nonce" +
-                "&data=$data"
-
-        val action = router.dispatch(DeepLink(url))
-        assertIs<DeeplinkAction.ExternalWallet>(action)
-        assertIs<DeeplinkType.ExternalWalletSignedTransaction>(action.type)
-    }
-
-    @Test
-    fun `dispatch returns ExternalWallet even when wallet reports error`() {
-        loggedIn()
-        val url = "https://app.flipcash.com/external/phantom/connected" +
-                "?origin=menu" +
-                "&errorCode=4001" +
-                "&errorMessage=User+rejected"
-
-        val action = router.dispatch(DeepLink(url))
-        assertIs<DeeplinkAction.ExternalWallet>(action)
-        val type = action.type
-        assertIs<DeeplinkType.ExternalWalletConnection>(type)
-        assertNull(type.result)
-        assertEquals("4001", type.error?.errorCode)
-    }
-
-    // endregion
-
     // region dispatch — Logged in: EmailVerification (route building)
 
     @Test
diff --git a/apps/flipcash/shared/userflags/src/main/kotlin/com/flipcash/app/userflags/Field.kt b/apps/flipcash/shared/userflags/src/main/kotlin/com/flipcash/app/userflags/Field.kt
index 39be2b582..181d2a4cc 100644
--- a/apps/flipcash/shared/userflags/src/main/kotlin/com/flipcash/app/userflags/Field.kt
+++ b/apps/flipcash/shared/userflags/src/main/kotlin/com/flipcash/app/userflags/Field.kt
@@ -40,8 +40,6 @@ sealed class Field<Stored, Domain>(
             options = listOf(
                 "Manual Deposit" to OnRampProvider.ManualDeposit,
                 "Phantom" to OnRampProvider.Phantom,
-                "Solflare" to OnRampProvider.Solflare,
-                "Backpack" to OnRampProvider.Backpack,
                 "Coinbase" to OnRampProvider.Coinbase(OnRampType.Virtual),
             )
         ),
@@ -63,8 +61,6 @@ sealed class Field<Stored, Domain>(
             options = listOf(
                 "Manual Deposit" to OnRampProvider.ManualDeposit,
                 "Phantom" to OnRampProvider.Phantom,
-                "Solflare" to OnRampProvider.Solflare,
-                "Backpack" to OnRampProvider.Backpack,
                 "Coinbase" to OnRampProvider.Coinbase(OnRampType.Virtual),
             )
         )
@@ -178,8 +174,6 @@ sealed class Field<Stored, Domain>(
 internal fun OnRampProvider.Defined.encode(): String = when (this) {
     is OnRampProvider.ManualDeposit -> "manual_deposit"
     is OnRampProvider.Phantom -> "phantom"
-    is OnRampProvider.Solflare -> "solflare"
-    is OnRampProvider.Backpack -> "backpack"
     is OnRampProvider.Coinbase -> "coinbase"
 }
 
@@ -187,8 +181,6 @@ internal fun OnRampProvider.Defined.encode(): String = when (this) {
 internal fun decodeOnRampProvider(raw: String): OnRampProvider.Defined? = when (raw) {
     "manual_deposit" -> OnRampProvider.ManualDeposit
     "phantom" -> OnRampProvider.Phantom
-    "solflare" -> OnRampProvider.Solflare
-    "backpack" -> OnRampProvider.Backpack
     "coinbase" -> OnRampProvider.Coinbase(OnRampType.Virtual)
     else -> null
 }
@@ -196,8 +188,6 @@ internal fun decodeOnRampProvider(raw: String): OnRampProvider.Defined? = when (
 private fun OnRampProvider.Defined.displayName(): String = when (this) {
     is OnRampProvider.ManualDeposit -> "Manual Deposit"
     is OnRampProvider.Phantom -> "Phantom"
-    is OnRampProvider.Solflare -> "Solflare"
-    is OnRampProvider.Backpack -> "Backpack"
     is OnRampProvider.Coinbase -> "Coinbase"
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 6b09cef7a..79839fd28 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -89,6 +89,7 @@ bugsnag-gradle-plugin = "1.1.0"
 rinku = "1.6.0"
 haze = "1.7.2"
 cloudy = "0.5.0"
+phantom-connect-kmp = "2.0.2"
 vico = "2.4.1"
 
 androidxTestRules = "1.7.0"
@@ -267,6 +268,8 @@ cloudy = { module = "com.github.skydoves:cloudy", version.ref = "cloudy" }
 fingerprint-pro = { module = "com.fingerprint.android:pro", version = "2.4.0" }
 haze = { module = "dev.chrisbanes.haze:haze", version.ref = "haze" }
 haze-materials = { module = "dev.chrisbanes.haze:haze-materials", version.ref = "haze" }
+phantom-connect = { module = "dev.bmcreations:phantom-connect", version.ref = "phantom-connect-kmp" }
+phantom-connect-wallet = { module = "dev.bmcreations:phantom-connect-wallet", version.ref = "phantom-connect-kmp" }
 rinku = { module = "dev.theolm:rinku", version.ref = "rinku" }
 rinku-compose = { module = "dev.theolm:rinku-compose-ext", version.ref = "rinku" }
 event-bus = { module = "io.github.hoc081098:channel-event-bus", version.ref = "event-bus" }
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/UserFlagsMapper.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/UserFlagsMapper.kt
index ff70ff84f..3d8591e80 100644
--- a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/UserFlagsMapper.kt
+++ b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/UserFlagsMapper.kt
@@ -37,9 +37,8 @@ private fun FlipcashAccountService.UserFlags.OnRampProvider.toDomain(): OnRampPr
         FlipcashAccountService.UserFlags.OnRampProvider.COINBASE_PHYSICAL_CREDIT -> OnRampProvider.Coinbase(OnRampType.PhysicalCredit)
         FlipcashAccountService.UserFlags.OnRampProvider.MANUAL_DEPOSIT -> OnRampProvider.ManualDeposit
         FlipcashAccountService.UserFlags.OnRampProvider.PHANTOM -> OnRampProvider.Phantom
-        FlipcashAccountService.UserFlags.OnRampProvider.SOLFLARE -> OnRampProvider.Solflare
-        FlipcashAccountService.UserFlags.OnRampProvider.BACKPACK -> OnRampProvider.Backpack
-        // Unhandled for now
+        FlipcashAccountService.UserFlags.OnRampProvider.SOLFLARE,
+        FlipcashAccountService.UserFlags.OnRampProvider.BACKPACK,
         FlipcashAccountService.UserFlags.OnRampProvider.BASE,
         FlipcashAccountService.UserFlags.OnRampProvider.UNKNOWN_ON_RAMP_PROVIDER,
         FlipcashAccountService.UserFlags.OnRampProvider.UNRECOGNIZED -> OnRampProvider.Unknown
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/model/thirdparty/OnRampProvider.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/model/thirdparty/OnRampProvider.kt
index 4b98c4726..d80eec7f8 100644
--- a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/model/thirdparty/OnRampProvider.kt
+++ b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/model/thirdparty/OnRampProvider.kt
@@ -13,14 +13,10 @@ sealed interface OnRampProvider {
     data class Coinbase(val type: OnRampType) : OnRampProvider, ThirdParty
 
     data object Phantom: OnRampProvider, ThirdParty, UsesDeeplinks
-    data object Solflare: OnRampProvider, ThirdParty, UsesDeeplinks
-    data object Backpack: OnRampProvider, ThirdParty, UsesDeeplinks
 
     companion object {
         val types: List<OnRampProvider.Defined> = listOf(
             Phantom,
-            Solflare,
-            Backpack,
             ManualDeposit
         )
     }
diff --git a/services/flipcash/src/test/kotlin/com/flipcash/services/internal/domain/UserFlagsMapperTest.kt b/services/flipcash/src/test/kotlin/com/flipcash/services/internal/domain/UserFlagsMapperTest.kt
index 34fc8f1f1..7b76bafe3 100644
--- a/services/flipcash/src/test/kotlin/com/flipcash/services/internal/domain/UserFlagsMapperTest.kt
+++ b/services/flipcash/src/test/kotlin/com/flipcash/services/internal/domain/UserFlagsMapperTest.kt
@@ -85,8 +85,8 @@ class UserFlagsMapperTest {
         assertEquals(
             listOf(
                 OnRampProvider.Phantom,
-                OnRampProvider.Solflare,
-                OnRampProvider.Backpack,
+                OnRampProvider.Unknown,
+                OnRampProvider.Unknown,
                 OnRampProvider.ManualDeposit,
             ),
             result.supportedOnRampProviders,

From 39101f1cdbad40cff999b10b84597e81939d7f3c Mon Sep 17 00:00:00 2001
From: Brandon McAnsh <git@bmcreations.dev>
Date: Mon, 18 May 2026 16:50:47 -0400
Subject: [PATCH 2/2] feat(onramp): migrate Phantom wallet integration to
 SDK-based PhantomWalletController

Replace the old deeplink state machine (ExternalWalletOnRampController/Handler/State)
with PhantomWalletController backed by the phantom-connect-kmp SDK. Uses withCeremony
for multi-hop connect+sign flows, keeping the transparent overlay alive across round-trips.

Navigation callbacks fire before deeplink launch (matching old emitPendingNavigation pattern)
so the host activity renders the target screen before Phantom opens.
---
 .../flipcash/app/src/main/AndroidManifest.xml |   2 +-
 .../kotlin/com/flipcash/app/MainActivity.kt   |   6 -
 .../com/flipcash/app/internal/ui/App.kt       |   3 -
 .../ui/navigation/AppScreenContent.kt         |   2 +-
 .../kotlin/com/flipcash/app/core/AppRoute.kt  |   1 -
 .../com/flipcash/app/core/tokens/SwapStep.kt  |   1 -
 .../internal/CurrencyCreatorViewModel.kt      |  94 ++-
 .../internal/components/TokenMetricsRow.kt    |   2 +-
 .../app/tokens/PhantomWalletScreens.kt        |  68 +-
 .../flipcash/app/tokens/SwapEntryScreen.kt    |  31 +-
 .../com/flipcash/app/tokens/SwapFlowScreen.kt |   2 +-
 .../flipcash/app/tokens/TokenInfoScreen.kt    |   1 -
 .../app/tokens/TokenTxProcessingScreen.kt     |  84 +--
 .../shared/onramp/deeplinks/build.gradle.kts  |   3 +
 .../app/onramp/DeeplinkOnRampErrors.kt        |  38 ++
 .../app/onramp/ExternalWalletLocal.kt         |   6 -
 .../onramp/ExternalWalletOnRampController.kt  | 620 ------------------
 .../app/onramp/ExternalWalletOnRampHandler.kt | 322 ---------
 .../app/onramp/ExternalWalletOnRampState.kt   |  73 ---
 .../app/onramp/PhantomWalletController.kt     | 335 ++++++++++
 .../app/onramp/inject/PhantomWalletModule.kt  |  39 +-
 .../ExternalWalletBalanceCheckTest.kt         | 140 ++--
 .../ExternalWalletDeeplinkStateErrorTest.kt   |  58 +-
 .../flipcash/app/tokens/ui/SwapViewModel.kt   | 239 +++++--
 buildSrc/src/main/java/Android.kt             |   4 +-
 gradle/libs.versions.toml                     |   2 +-
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 27 files changed, 784 insertions(+), 1396 deletions(-)
 delete mode 100644 apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletLocal.kt
 delete mode 100644 apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampController.kt
 delete mode 100644 apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampHandler.kt
 delete mode 100644 apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampState.kt
 create mode 100644 apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/PhantomWalletController.kt

diff --git a/apps/flipcash/app/src/main/AndroidManifest.xml b/apps/flipcash/app/src/main/AndroidManifest.xml
index 6728d3b7b..361f0a0c3 100644
--- a/apps/flipcash/app/src/main/AndroidManifest.xml
+++ b/apps/flipcash/app/src/main/AndroidManifest.xml
@@ -206,7 +206,7 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="codewallet" android:host="phantom-wallet-callback" />
+                <data android:scheme="https" android:host="app.flipcash.com" android:path="/phantom-wallet-callback" />
             </intent-filter>
         </activity>
 
diff --git a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/MainActivity.kt b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/MainActivity.kt
index 4f65dec2c..4d4246556 100644
--- a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/MainActivity.kt
+++ b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/MainActivity.kt
@@ -19,8 +19,6 @@ import com.flipcash.app.billing.BillingClient
 import com.flipcash.app.core.LocalUserManager
 import com.flipcash.app.core.verification.email.EmailCodeChannel
 import com.flipcash.app.core.verification.email.LocalEmailCodeChannel
-import com.flipcash.app.onramp.ExternalWalletOnRampController
-import com.flipcash.app.onramp.LocalExternalWalletOnRampController
 import com.flipcash.app.onramp.LocalCoinbaseOnRampController
 import com.flipcash.app.onramp.CoinbaseOnRampController
 import com.flipcash.app.featureflags.FeatureFlagController
@@ -117,9 +115,6 @@ class MainActivity : FragmentActivity() {
     @Inject
     lateinit var emailCodeChannel: EmailCodeChannel
 
-    @Inject
-    lateinit var externalWalletOnRampController: ExternalWalletOnRampController
-
     @Inject
     lateinit var coinbaseOnRampController: CoinbaseOnRampController
 
@@ -146,7 +141,6 @@ class MainActivity : FragmentActivity() {
                 LocalBillPlaygroundController provides billPlaygroundController,
                 LocalAppUpdater provides appUpdater,
                 LocalEmailCodeChannel provides emailCodeChannel,
-                LocalExternalWalletOnRampController provides externalWalletOnRampController,
                 LocalCoinbaseOnRampController provides coinbaseOnRampController,
                 LocalUiTesting provides intent.getBooleanExtra(UI_TEST, false),
             ) {
diff --git a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/App.kt b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/App.kt
index 9337d9a63..2f2f111cd 100644
--- a/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/App.kt
+++ b/apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/App.kt
@@ -46,7 +46,6 @@ import com.flipcash.app.internal.ui.navigation.appEntryProvider
 import com.flipcash.app.internal.ui.navigation.decorators.rememberNavBlockingOverlayEntryDecorator
 import com.flipcash.app.internal.ui.navigation.decorators.rememberNavMessagingEntryDecorator
 import com.flipcash.app.onramp.CoinbaseOnRampHandler
-import com.flipcash.app.onramp.ExternalWalletOnRampHandler
 import com.flipcash.app.router.LocalRouter
 import com.flipcash.app.session.LocalSessionController
 import com.flipcash.app.theme.FlipcashTheme
@@ -148,7 +147,6 @@ internal fun App(
                                 LocalScrimController provides scrimController,
                                 LocalSharedTransitionScope provides this,
                             ) {
-                                ExternalWalletOnRampHandler(navigator = codeNavigator) {
                                     CoinbaseOnRampHandler {
                                         AppNavHost(
                                             navigator = codeNavigator,
@@ -234,7 +232,6 @@ internal fun App(
 
                                         ScrimOverlay(scrimController)
                                     }
-                                }
 
                                 val emailCodeChannel = LocalEmailCodeChannel.current
                                 LaunchedEffect(deepLink) {
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
index d59dba7a0..24f7bbe3f 100644
--- 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
@@ -111,7 +111,7 @@ fun appEntryProvider(
         SwapFlowScreen(route = key, resultStateRegistry = resultStateRegistry)
     }
     annotatedEntry<AppRoute.Token.TxProcessing> { key ->
-        TokenTxProcessingScreen(key.swapId, key.swapPurpose, key.amount, key.awaitExternalWallet, key.isFundingShortfall)
+        TokenTxProcessingScreen(key.swapId, key.swapPurpose, key.amount, key.isFundingShortfall)
     }
     annotatedEntry<AppRoute.Token.Discovery> { TokenDiscoveryScreen() }
     annotatedEntry<AppRoute.Token.CurrencyCreator> { key ->
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
index b683339f2..a95624d91 100644
--- 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
@@ -153,7 +153,6 @@ sealed interface AppRoute : NavKey, Parcelable {
             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/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
index 996baa66e..cd29dd2a5 100644
--- 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
@@ -30,6 +30,5 @@ sealed interface SwapStep : FlowStep, Parcelable {
     @Serializable
     data class Processing(
         val swapId: SwapId,
-        val awaitExternalWallet: Boolean = false,
     ) : SwapStep, NonDismissableRoute, NonDraggableRoute
 }
diff --git a/apps/flipcash/features/currency-creator/src/main/kotlin/com/flipcash/app/currencycreator/internal/CurrencyCreatorViewModel.kt b/apps/flipcash/features/currency-creator/src/main/kotlin/com/flipcash/app/currencycreator/internal/CurrencyCreatorViewModel.kt
index 01e73af71..615fd6452 100644
--- a/apps/flipcash/features/currency-creator/src/main/kotlin/com/flipcash/app/currencycreator/internal/CurrencyCreatorViewModel.kt
+++ b/apps/flipcash/features/currency-creator/src/main/kotlin/com/flipcash/app/currencycreator/internal/CurrencyCreatorViewModel.kt
@@ -4,7 +4,6 @@ import android.net.Uri
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.core.text.trimmedLength
 import androidx.lifecycle.viewModelScope
-import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.bill.Bill
 import com.flipcash.app.core.data.Loadable
 import com.flipcash.app.core.extensions.flatMapResult
@@ -13,8 +12,12 @@ import com.flipcash.app.core.tokens.CurrencyCreatorDraft
 import com.flipcash.app.core.tokens.CurrencyCreatorStep
 import com.flipcash.app.currencycreator.CurrencyCreatorCoordinator
 import com.flipcash.app.currencycreator.internal.components.CurrencyCreatorTopBarController
-import com.flipcash.app.onramp.ExternalWalletOnRampController
-import com.flipcash.app.onramp.ExternalWalletOnRampState
+import com.flipcash.app.onramp.DeeplinkError
+import com.flipcash.app.onramp.DeeplinkOnRampError
+import com.flipcash.app.onramp.PhantomWalletController
+import com.flipcash.app.onramp.isAlert
+import com.flipcash.app.onramp.isNetworkCause
+import com.flipcash.app.onramp.messaging
 import com.flipcash.app.payments.PaymentAction
 import com.flipcash.app.payments.PurchaseMethod
 import com.flipcash.app.payments.PurchaseMethodController
@@ -25,7 +28,9 @@ import com.flipcash.app.userflags.UserFlagsCoordinator
 import com.flipcash.features.currencycreator.R
 import com.flipcash.libs.coroutines.DispatcherProvider
 import com.flipcash.services.controllers.ModerationController
-import com.flipcash.services.internal.model.thirdparty.OnRampProvider
+import com.getcode.solana.keys.PublicKey
+import com.getcode.utils.TraceType
+import com.getcode.utils.trace
 import com.flipcash.services.models.ImageModerationError
 import com.flipcash.services.models.ModerationResult
 import com.flipcash.services.models.TextModerationError
@@ -91,10 +96,10 @@ internal class CurrencyCreatorViewModel @Inject constructor(
     currencyController: CurrencyController,
     transactionController: TransactionController,
     private val verifiedFiatCalculator: VerifiedFiatCalculator,
-    externalWalletController: ExternalWalletOnRampController,
+    private val phantomWalletController: PhantomWalletController,
     tokenCoordinator: TokenCoordinator,
     balancePoller: BalancePoller,
-    resources: ResourceHelper,
+    private val resources: ResourceHelper,
     val contentReader: ContentReader,
     val purchaseMethodController: PurchaseMethodController,
     private val currencyCreatorCoordinator: CurrencyCreatorCoordinator,
@@ -515,11 +520,6 @@ internal class CurrencyCreatorViewModel @Inject constructor(
         eventFlow
             .filterIsInstance<Event.PurchaseWithPhantom>()
             .onEach { event ->
-                // start() must come first — it calls reset() which clears amount/token.
-                externalWalletController.start(
-                    AppRoute.Token.CurrencyCreator,
-                    OnRampProvider.Phantom
-                )
                 val totalAmount = verifiedFiatCalculator.compute(
                     amount = event.context.amount,
                     token = Token.usdf,
@@ -533,8 +533,20 @@ internal class CurrencyCreatorViewModel @Inject constructor(
                 }
 
                 val feeAmount = event.context.feeAmount?.let { LocalFiat.fromUsd(usdf = it) }
-                externalWalletController.setAmount(amount = totalAmount, feeAmount = feeAmount)
-                externalWalletController.setTokenToPurchase(event.context.token)
+                    ?: LocalFiat.Zero
+                val token = event.context.token
+
+                viewModelScope.launch {
+                    phantomWalletController.connectAndSwap(
+                        amount = totalAmount,
+                        fee = feeAmount,
+                        token = token,
+                    ).onSuccess { swapId ->
+                        dispatchEvent(Event.PurchaseSubmitted(swapId, token.address))
+                    }.onFailure { error ->
+                        handlePhantomError(error)
+                    }
+                }
             }
             .launchIn(viewModelScope)
 
@@ -583,26 +595,6 @@ internal class CurrencyCreatorViewModel @Inject constructor(
             )
             .launchIn(viewModelScope)
 
-        externalWalletController.state
-            .filterIsInstance<ExternalWalletOnRampState.Transacted>()
-            .filter { it.origin is AppRoute.Token.CurrencyCreator }
-            .mapNotNull { state ->
-                val swapId = state.swapId ?: return@mapNotNull null
-                val mint = state.token?.address ?: return@mapNotNull null
-                swapId to mint
-            }
-            .onEach { (swapId, mint) ->
-                externalWalletController.reset()
-                dispatchEvent(Event.PurchaseSubmitted(swapId, mint))
-            }
-            .launchIn(viewModelScope)
-
-        externalWalletController.state
-            .filterIsInstance<ExternalWalletOnRampState.Failed>()
-            .onEach {
-                dispatchEvent(Event.UpdateProcessingState())
-            }.launchIn(viewModelScope)
-
         eventFlow
             .filterIsInstance<Event.PurchaseSubmitted>()
             .map { event ->
@@ -641,6 +633,42 @@ internal class CurrencyCreatorViewModel @Inject constructor(
             .launchIn(viewModelScope)
     }
 
+    private fun handlePhantomError(error: Throwable) {
+        val deeplinkError = error as? DeeplinkOnRampError
+            ?: DeeplinkOnRampError.FailedToCreateTransaction(message = error.message, cause = error)
+
+        if (deeplinkError is DeeplinkOnRampError.WalletProvidedError && deeplinkError.code == DeeplinkError.UserRejectedRequest.code) {
+            // user cancelled — not an error worth reporting
+        } else {
+            trace(
+                tag = "onramp::deeplinks",
+                message = "Phantom error in currency creator",
+                type = TraceType.Error,
+                error = deeplinkError.takeUnless { it.isAlert }
+            )
+        }
+
+        val providerName = resources.getString(com.flipcash.shared.onramp.deeplinks.R.string.label_phantom)
+        val (title, message) = deeplinkError.messaging(resources::getString, providerName)
+
+        when {
+            deeplinkError.isNetworkCause -> {
+                BottomBarManager.showAlert(
+                    title = resources.getString(com.flipcash.shared.onramp.deeplinks.R.string.error_title_noInternet),
+                    message = resources.getString(com.flipcash.shared.onramp.deeplinks.R.string.error_description_noInternet),
+                )
+            }
+            deeplinkError.isAlert -> {
+                BottomBarManager.showAlert(title = title, message = message)
+            }
+            else -> {
+                BottomBarManager.showError(title = title, message = message)
+            }
+        }
+
+        dispatchEvent(Event.UpdateProcessingState())
+    }
+
     internal companion object {
         val updateStateForEvent: (Event) -> (State.() -> State) = { event ->
             when (event) {
diff --git a/apps/flipcash/features/discovery/src/main/kotlin/com/flipcash/app/discovery/internal/components/TokenMetricsRow.kt b/apps/flipcash/features/discovery/src/main/kotlin/com/flipcash/app/discovery/internal/components/TokenMetricsRow.kt
index c2e1e7060..43fc96723 100644
--- a/apps/flipcash/features/discovery/src/main/kotlin/com/flipcash/app/discovery/internal/components/TokenMetricsRow.kt
+++ b/apps/flipcash/features/discovery/src/main/kotlin/com/flipcash/app/discovery/internal/components/TokenMetricsRow.kt
@@ -43,7 +43,7 @@ internal fun RankedTokenMetricsRow(
     onClick: () -> Unit,
 ) {
     Row(
-        modifier = modifier.rememberedClickable(onClick = onClick),
+        modifier = Modifier.rememberedClickable(onClick = onClick).then(modifier),
         verticalAlignment = Alignment.CenterVertically
     ) {
         RankBadge(rank)
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
index b4759fae8..6e433dcef 100644
--- 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
@@ -18,24 +18,18 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.onramp.ui.buildPhantomButtonLabel
 import com.flipcash.app.core.tokens.SwapResult
 import com.flipcash.app.core.tokens.SwapStep
-import com.flipcash.app.onramp.LocalExternalWalletOnRampController
 import com.flipcash.app.tokens.ui.SwapViewModel
 import com.flipcash.core.R
-import com.flipcash.services.internal.model.thirdparty.OnRampProvider
 import com.getcode.navigation.flow.flowSharedViewModel
 import com.getcode.navigation.flow.rememberFlowNavigator
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.AppBarWithTitle
-import com.getcode.ui.core.rememberAnimationScale
-import com.getcode.ui.core.scaled
 import com.getcode.ui.theme.ButtonState
 import com.getcode.ui.theme.CodeButton
 import com.getcode.ui.theme.CodeScaffold
-import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
@@ -45,22 +39,19 @@ internal fun PhantomConnectConfirmationScreen() {
     val flowNavigator = rememberFlowNavigator<SwapStep, SwapResult>()
     val viewModel = flowSharedViewModel<SwapViewModel>()
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
-    val externalWalletOnRampController = LocalExternalWalletOnRampController.current
 
-    val animationScale by rememberAnimationScale()
-    LaunchedEffect(Unit) {
-        externalWalletOnRampController.pendingNavigation.collect { nav ->
-            if (nav is AppRoute.Token.Swap) {
-                delay(300.scaled(animationScale))
-                flowNavigator.navigateTo(SwapStep.PhantomConfirmTransaction)
-            }
-        }
+    LaunchedEffect(viewModel) {
+        viewModel.eventFlow
+            .filterIsInstance<SwapViewModel.Event.PhantomCeremonyFailed>()
+            .onEach { flowNavigator.exitCanceled() }
+            .launchIn(this)
     }
 
     LaunchedEffect(Unit) {
-        externalWalletOnRampController.flowExitRequests.collect {
-            flowNavigator.exitCanceled()
-        }
+        viewModel.eventFlow
+            .filterIsInstance<SwapViewModel.Event.PhantomConnected>()
+            .onEach { flowNavigator.navigateTo(SwapStep.PhantomConfirmTransaction) }
+            .launchIn(this)
     }
 
     CodeScaffold(
@@ -82,14 +73,10 @@ internal fun PhantomConnectConfirmationScreen() {
                     .navigationBarsPadding(),
                 buttonState = ButtonState.Filled,
                 text = stringResource(R.string.action_connectYourPhantomWallet),
+                isLoading = state.buyProgress.loading,
+                enabled = state.buyProgress.isIdle,
             ) {
-                val mint = state.purpose?.mint
-                mint?.let {
-                    externalWalletOnRampController.start(
-                        AppRoute.Token.Info(mint = it),
-                        OnRampProvider.Phantom,
-                    )
-                }
+                viewModel.dispatchEvent(SwapViewModel.Event.StartPhantomCeremony)
             }
         }
     ) { padding ->
@@ -141,31 +128,20 @@ internal fun PhantomTransactionConfirmationScreen() {
     val flowNavigator = rememberFlowNavigator<SwapStep, SwapResult>()
     val viewModel = flowSharedViewModel<SwapViewModel>()
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
-    val externalWalletOnRampController = LocalExternalWalletOnRampController.current
 
-    LaunchedEffect(Unit) {
-        externalWalletOnRampController.pendingNavigation.collect { nav ->
-            if (nav is AppRoute.Token.TxProcessing) {
-                flowNavigator.navigateTo(
-                    SwapStep.Processing(nav.swapId, nav.awaitExternalWallet)
-                )
-            }
-        }
-    }
-
-    LaunchedEffect(Unit) {
-        externalWalletOnRampController.flowExitRequests.collect {
-            flowNavigator.exitCanceled()
-        }
+    LaunchedEffect(viewModel) {
+        viewModel.eventFlow
+            .filterIsInstance<SwapViewModel.Event.PhantomNavigateToProcessing>()
+            .onEach { event ->
+                flowNavigator.navigateTo(SwapStep.Processing(event.swapId))
+            }.launchIn(this)
     }
 
     LaunchedEffect(viewModel) {
         viewModel.eventFlow
-            .filterIsInstance<SwapViewModel.Event.CreateAndSendTransactionToWallet>()
-            .onEach { (token, amount) ->
-                externalWalletOnRampController.setTokenToPurchase(token)
-                externalWalletOnRampController.setAmount(amount)
-            }.launchIn(this)
+            .filterIsInstance<SwapViewModel.Event.PhantomCeremonyFailed>()
+            .onEach { flowNavigator.exitCanceled() }
+            .launchIn(this)
     }
 
     CodeScaffold(
@@ -241,4 +217,4 @@ internal fun PhantomTransactionConfirmationScreen() {
             }
         }
     }
-}
\ No newline at end of file
+}
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
index 704a3b476..87265832f 100644
--- 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
@@ -14,7 +14,6 @@ import com.flipcash.app.core.tokens.SwapPurpose
 import com.flipcash.app.core.tokens.SwapResult
 import com.flipcash.app.core.tokens.SwapStep
 import com.flipcash.app.onramp.LocalCoinbaseOnRampController
-import com.flipcash.app.onramp.LocalExternalWalletOnRampController
 import com.flipcash.app.tokens.internal.SwapEntryScreenContent
 import com.flipcash.app.tokens.ui.SwapViewModel
 import com.flipcash.features.tokens.R
@@ -40,7 +39,6 @@ internal fun SwapEntryScreen(
     val viewModel = flowSharedViewModel<SwapViewModel>()
     val state by viewModel.stateFlow.collectAsStateWithLifecycle()
     val navigator = LocalCodeNavigator.current
-    val externalWalletOnRampController = LocalExternalWalletOnRampController.current
     val coinbaseOnRampController = LocalCoinbaseOnRampController.current
 
     Column(
@@ -82,15 +80,6 @@ internal fun SwapEntryScreen(
             }.launchIn(this)
     }
 
-    LaunchedEffect(viewModel) {
-        viewModel.eventFlow
-            .filterIsInstance<SwapViewModel.Event.CreateAndSendTransactionToWallet>()
-            .onEach { (token, amount) ->
-                externalWalletOnRampController.setTokenToPurchase(token)
-                externalWalletOnRampController.setAmount(amount)
-            }.launchIn(this)
-    }
-
     LaunchedEffect(viewModel) {
         viewModel.eventFlow
             .filterIsInstance<SwapViewModel.Event.Exit>()
@@ -108,23 +97,6 @@ internal fun SwapEntryScreen(
             }.launchIn(this)
     }
 
-    // Navigate to pending processing step from ExternalWalletOnRampHandler
-    LaunchedEffect(Unit) {
-        externalWalletOnRampController.pendingNavigation.collect { nav ->
-            if (nav is AppRoute.Token.TxProcessing) {
-                flowNavigator.navigateTo(
-                    SwapStep.Processing(nav.swapId, nav.awaitExternalWallet)
-                )
-            }
-        }
-    }
-
-    LaunchedEffect(Unit) {
-        externalWalletOnRampController.flowExitRequests.collect {
-            flowNavigator.exitCanceled()
-        }
-    }
-
     LaunchedEffect(viewModel) {
         viewModel.eventFlow
             .filterIsInstance<SwapViewModel.Event.OnVerificationNeeded>()
@@ -153,8 +125,9 @@ internal fun SwapEntryScreen(
     LaunchedEffect(Unit) {
         coinbaseOnRampController.pendingNavigation.collect { route ->
             if (route is AppRoute.Token.TxProcessing) {
+                viewModel.dispatchEvent(SwapViewModel.Event.OnSwapIdChanged(route.swapId))
                 flowNavigator.navigateTo(
-                    SwapStep.Processing(route.swapId, route.awaitExternalWallet)
+                    SwapStep.Processing(route.swapId)
                 )
             }
         }
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
index 7c2a0eb57..471a81ca6 100644
--- 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
@@ -62,6 +62,6 @@ private fun swapEntryProvider(): (NavKey) -> NavEntry<NavKey> = entryProvider {
         PhantomTransactionConfirmationScreen()
     }
     annotatedEntry<SwapStep.Processing> { step ->
-        SwapProcessingScreen(step.swapId, step.awaitExternalWallet)
+        SwapProcessingScreen(step.swapId)
     }
 }
diff --git a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenInfoScreen.kt b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenInfoScreen.kt
index 830961ce2..02e5d2e01 100644
--- a/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenInfoScreen.kt
+++ b/apps/flipcash/features/tokens/src/main/kotlin/com/flipcash/app/tokens/TokenInfoScreen.kt
@@ -15,7 +15,6 @@ import com.flipcash.app.analytics.Button
 import com.flipcash.app.analytics.rememberAnalytics
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.ui.TokenIconWithName
-import com.flipcash.app.onramp.LocalExternalWalletOnRampController
 import com.flipcash.app.tokens.internal.TokenInfoScreen
 import com.flipcash.app.tokens.ui.TokenInfoViewModel
 import com.flipcash.features.tokens.R
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
index 4c8c597a5..1bc8fb219 100644
--- 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
@@ -3,18 +3,11 @@ package com.flipcash.app.tokens
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.runtime.snapshotFlow
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.tokens.SwapPurpose
 import com.flipcash.app.core.tokens.SwapResult
 import com.flipcash.app.core.tokens.SwapStep
-import com.flipcash.app.onramp.ExternalWalletOnRampState
-import com.flipcash.app.onramp.LocalExternalWalletOnRampController
 import com.flipcash.app.tokens.internal.TokenTxProcessingScreen
 import com.flipcash.app.tokens.ui.SwapViewModel
 import com.flipcash.app.tokens.ui.SwapViewModel.Event
@@ -23,10 +16,7 @@ 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
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 
@@ -36,41 +26,14 @@ import kotlinx.coroutines.flow.onEach
 @Composable
 internal fun SwapProcessingScreen(
     swapId: SwapId,
-    awaitExternalWallet: Boolean = false,
 ) {
     val flowNavigator = rememberFlowNavigator<SwapStep, SwapResult>()
     val viewModel = flowSharedViewModel<SwapViewModel>()
 
-    var awaitingWallet by remember { mutableStateOf(awaitExternalWallet) }
+    TokenTxProcessingScreen(viewModel = viewModel)
 
-    TokenTxProcessingScreen(
-        viewModel = viewModel,
-        processingProgressOverride = if (awaitingWallet) LoadingSuccessState(loading = true) else null,
-    )
-
-    if (awaitExternalWallet) {
-        val controller = LocalExternalWalletOnRampController.current
-        LaunchedEffect(viewModel, swapId) {
-            val terminalState = controller.state
-                .firstOrNull { it is ExternalWalletOnRampState.Transacted || it is ExternalWalletOnRampState.Idle }
-
-            if (terminalState !is ExternalWalletOnRampState.Transacted) {
-                flowNavigator.back()
-                return@LaunchedEffect
-            }
-
-            controller.reset()
-            viewModel.dispatchEvent(Event.OnSwapIdChanged(swapId))
-
-            snapshotFlow { viewModel.stateFlow.value.processingProgress }
-                .firstOrNull { it.loading }
-
-            awaitingWallet = false
-        }
-    } else {
-        LaunchedEffect(viewModel, swapId) {
-            viewModel.dispatchEvent(Event.OnSwapIdChanged(swapId))
-        }
+    LaunchedEffect(viewModel) {
+        viewModel.dispatchEvent(Event.UpdateProcessingState(loading = true))
     }
 
     LaunchedEffect(viewModel) {
@@ -101,47 +64,20 @@ fun TokenTxProcessingScreen(
     swapId: SwapId,
     swapPurpose: SwapPurpose?,
     swapAmount: VerifiedFiat?,
-    awaitExternalWallet: Boolean = false,
     isFundingShortfall: Boolean = false,
 ) {
     val navigator = LocalCodeNavigator.current
     val viewModel = hiltViewModel<SwapViewModel>()
 
-    var awaitingWallet by remember { mutableStateOf(awaitExternalWallet) }
-
-    TokenTxProcessingScreen(
-        viewModel = viewModel,
-        processingProgressOverride = if (awaitingWallet) LoadingSuccessState(loading = true) else null,
-    )
-
-    if (awaitExternalWallet) {
-        val controller = LocalExternalWalletOnRampController.current
-        LaunchedEffect(viewModel, swapId) {
-            val terminalState = controller.state
-                .firstOrNull { it is ExternalWalletOnRampState.Transacted || it is ExternalWalletOnRampState.Idle }
-
-            if (terminalState !is ExternalWalletOnRampState.Transacted) {
-                navigator.pop()
-                return@LaunchedEffect
-            }
-
-            controller.reset()
-            viewModel.dispatchEvent(Event.OnSwapIdChanged(swapId))
-
-            snapshotFlow { viewModel.stateFlow.value.processingProgress }
-                .firstOrNull { it.loading }
+    TokenTxProcessingScreen(viewModel = viewModel)
 
-            awaitingWallet = false
+    LaunchedEffect(viewModel, swapId) {
+        viewModel.dispatchEvent(Event.OnSwapIdChanged(swapId))
+        if (swapPurpose != null) {
+            viewModel.dispatchEvent(Event.OnPurposeChanged(swapPurpose))
         }
-    } else {
-        LaunchedEffect(viewModel, swapId) {
-            viewModel.dispatchEvent(Event.OnSwapIdChanged(swapId))
-            if (swapPurpose != null) {
-                viewModel.dispatchEvent(Event.OnPurposeChanged(swapPurpose))
-            }
-            if (swapAmount != null) {
-                viewModel.dispatchEvent(Event.OnAmountAccepted(swapAmount, swapAmount.localFiat.nativeAmount))
-            }
+        if (swapAmount != null) {
+            viewModel.dispatchEvent(Event.OnAmountAccepted(swapAmount, swapAmount.localFiat.nativeAmount))
         }
     }
 
diff --git a/apps/flipcash/shared/onramp/deeplinks/build.gradle.kts b/apps/flipcash/shared/onramp/deeplinks/build.gradle.kts
index f2fe590a1..27e9ed003 100644
--- a/apps/flipcash/shared/onramp/deeplinks/build.gradle.kts
+++ b/apps/flipcash/shared/onramp/deeplinks/build.gradle.kts
@@ -12,6 +12,9 @@ dependencies {
     testImplementation(project(":libs:test-utils"))
 
     implementation(libs.bundles.kotlinx.serialization)
+    implementation(libs.phantom.connect) {
+        exclude(group = "com.ionspin.kotlin", module = "multiplatform-crypto-libsodium-bindings-android-debug")
+    }
     implementation(libs.phantom.connect.wallet) {
         exclude(group = "com.ionspin.kotlin", module = "multiplatform-crypto-libsodium-bindings-android-debug")
     }
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
index ecb797a62..08dd68352 100644
--- 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
@@ -1,5 +1,8 @@
 package com.flipcash.app.onramp
 
+import com.flipcash.shared.onramp.deeplinks.R
+import com.getcode.utils.isNetworkError
+
 sealed class DeeplinkOnRampError(
     open val code: Long = -99,
     override val message: String?,
@@ -60,3 +63,38 @@ enum class DeeplinkError(val code: Long) {
         fun fromCode(code: String?) = fromCode(code?.toLongOrNull())
     }
 }
+
+val DeeplinkOnRampError.isAlert: Boolean
+    get() = this is DeeplinkOnRampError.WalletProvidedError && error in listOf(
+        DeeplinkError.UserRejectedRequest,
+        DeeplinkError.Disconnected,
+        DeeplinkError.TransactionRejected,
+    ) || this is DeeplinkOnRampError.FailedToSendTransaction
+        || this is DeeplinkOnRampError.InsufficientSol
+        || this is DeeplinkOnRampError.InsufficientUsdc
+        || (this is DeeplinkOnRampError.FailedToSimulateTransaction && cause?.isNetworkError() == true)
+        || (this is DeeplinkOnRampError.FailedToCreateTransaction && cause?.isNetworkError() == true)
+
+val DeeplinkOnRampError.isNetworkCause: Boolean
+    get() = (this is DeeplinkOnRampError.FailedToSimulateTransaction || this is DeeplinkOnRampError.FailedToCreateTransaction)
+        && cause?.isNetworkError() == true
+
+fun DeeplinkOnRampError.messaging(getString: (Int) -> String, provider: String): Pair<String, String> = when (this) {
+    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.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)
+    is DeeplinkOnRampError.WalletProvidedError -> when (this.error) {
+        DeeplinkError.Disconnected -> getString(R.string.error_title_deeplinkOnRampDisconnected) to getString(R.string.error_description_deeplinkOnRampDisconnected).format(provider)
+        DeeplinkError.Unauthorized -> getString(R.string.error_title_deeplinkOnRampUnauthorized) to getString(R.string.error_description_deeplinkOnRampUnauthorized)
+        DeeplinkError.UserRejectedRequest -> getString(R.string.error_title_deeplinkOnRampUserRejected).format(provider) to getString(R.string.error_description_deeplinkOnRampUserRejected).format(provider)
+        DeeplinkError.InvalidInput -> getString(R.string.error_title_deeplinkOnRampInvalidInput) to getString(R.string.error_description_deeplinkOnRampInvalidInput)
+        DeeplinkError.RequestedResourceNotAvailable -> getString(R.string.error_title_deeplinkOnRampRequestedResourceNotAvailable) to getString(R.string.error_description_deeplinkOnRampRequestedResourceNotAvailable).format(provider)
+        DeeplinkError.TransactionRejected -> getString(R.string.error_title_deeplinkOnRampTransactionRejected) to getString(R.string.error_description_deeplinkOnRampTransactionRejected).format(provider)
+        DeeplinkError.MethodNotFound -> getString(R.string.error_title_deeplinkOnRampMethodNotFound) to getString(R.string.error_description_deeplinkOnRampMethodNotFound).format(provider)
+        DeeplinkError.InternalError -> getString(R.string.error_title_deeplinkOnRampInternalError) to getString(R.string.error_description_deeplinkOnRampInternalError).format(provider)
+        DeeplinkError.Unknown -> getString(R.string.error_title_deeplinkOnRampUnknown) to getString(R.string.error_description_deeplinkOnRampUnknown)
+    }
+}
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletLocal.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletLocal.kt
deleted file mode 100644
index fd7e03c72..000000000
--- a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletLocal.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.flipcash.app.onramp
-
-import androidx.compose.runtime.compositionLocalOf
-
-val LocalExternalWalletOnRampController =
-    compositionLocalOf<ExternalWalletOnRampController> { throw IllegalStateException() }
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampController.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampController.kt
deleted file mode 100644
index 9a061d397..000000000
--- a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampController.kt
+++ /dev/null
@@ -1,620 +0,0 @@
-package com.flipcash.app.onramp
-
-import com.flipcash.app.core.AppRoute
-import com.flipcash.app.core.onramp.deeplinks.ExternalWalletConnection
-import com.flipcash.app.core.tokens.SwapPurpose
-import com.flipcash.app.userflags.UserFlagsCoordinator
-import com.flipcash.services.internal.model.thirdparty.OnRampProvider
-import com.flipcash.services.internal.model.thirdparty.UsdcLiquidtyPool
-import com.flipcash.services.user.UserManager
-import com.getcode.opencode.controllers.TransactionOperations
-import com.getcode.opencode.exchange.VerifiedFiat
-import com.getcode.opencode.internal.solana.extensions.deriveAssociatedAccount
-import com.getcode.opencode.internal.solana.model.SwapId
-import com.getcode.opencode.model.financial.LocalFiat
-import com.getcode.opencode.model.financial.Token
-import com.getcode.opencode.model.transactions.FundSwapPool
-import com.getcode.opencode.model.transactions.LiquidityPool
-import com.getcode.opencode.model.transactions.SwapFundingSource
-import com.getcode.opencode.solana.SolanaTransaction
-import com.getcode.opencode.solana.TransactionBuilder
-import com.getcode.solana.instructions.createAssociatedTokenAccountInstruction
-import com.getcode.solana.instructions.createSplTransfer
-import com.getcode.solana.keys.Hash
-import com.getcode.solana.keys.Mint
-import com.getcode.solana.keys.PublicKey
-import com.getcode.solana.keys.Signature
-import com.getcode.solana.keys.base58
-import com.getcode.solana.rpc.RpcConfig
-import com.getcode.solana.rpc.RpcException
-import com.getcode.solana.rpc.SolanaConnection
-import com.getcode.solana.rpc.doesAccountExist
-import com.getcode.solana.rpc.getBalance
-import com.getcode.solana.rpc.getAccountData
-import com.getcode.solana.rpc.getTokenAccountBalance
-import com.getcode.solana.rpc.sendTransaction
-import com.getcode.solana.rpc.simulateTransaction
-import com.getcode.solana.transactions.inspect
-import com.getcode.utils.ErrorUtils
-import com.getcode.utils.TraceType
-import com.getcode.utils.base64
-import com.getcode.utils.trace
-import com.getcode.vendor.Base58
-import com.solana.networking.Rpc20Driver
-import com.solana.transaction.Message
-import com.solana.transaction.toUnsignedTransaction
-import dagger.hilt.android.scopes.ActivityRetainedScoped
-import dev.bmcreations.phantom.connect.WalletConnectorResult
-import dev.bmcreations.phantom.connect.WalletSignResult
-import dev.bmcreations.phantom.connect.wallet.PhantomWalletConnector
-import dev.bmcreations.phantom.connect.wallet.PhantomWalletException
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.NonCancellable
-import kotlinx.coroutines.flow.MutableSharedFlow
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.SharedFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asSharedFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.withContext
-import javax.inject.Inject
-
-@ActivityRetainedScoped
-class ExternalWalletOnRampController @Inject constructor(
-    private val userManager: UserManager,
-    private val userFlags: UserFlagsCoordinator,
-    private val transactionController: TransactionOperations,
-    private val rpcConfig: RpcConfig,
-    private val phantomConnector: PhantomWalletConnector,
-) {
-    private val _state = MutableStateFlow<ExternalWalletOnRampState>(ExternalWalletOnRampState.Idle)
-    val state: StateFlow<ExternalWalletOnRampState> = _state.asStateFlow()
-
-    private val _pendingNavigation = MutableSharedFlow<AppRoute>(extraBufferCapacity = 1)
-    val pendingNavigation: SharedFlow<AppRoute> = _pendingNavigation.asSharedFlow()
-
-    private val _flowExitRequests = MutableSharedFlow<Unit>(extraBufferCapacity = 1)
-    val flowExitRequests: SharedFlow<Unit> = _flowExitRequests.asSharedFlow()
-
-    private val _amount = MutableStateFlow<VerifiedFiat?>(null)
-    val amount: StateFlow<VerifiedFiat?> = _amount.asStateFlow()
-
-    private val _feeAmount = MutableStateFlow<LocalFiat?>(null)
-    val feeAmount: StateFlow<LocalFiat?> = _feeAmount.asStateFlow()
-
-    private val _tokenToPurchase = MutableStateFlow<Token?>(null)
-    val tokenToPurchase: StateFlow<Token?> = _tokenToPurchase.asStateFlow()
-
-    private val connection by lazy { SolanaConnection(rpcConfig.rpcUrl) }
-    private val driver by lazy { Rpc20Driver(rpcConfig.rpcUrl, rpcConfig.networkDriver) }
-
-    fun start(origin: AppRoute, provider: OnRampProvider.UsesDeeplinks) {
-        reset()
-        _state.value = ExternalWalletOnRampState.Started(origin, provider)
-    }
-
-    fun setAmount(amount: VerifiedFiat?, feeAmount: LocalFiat? = null) {
-        _amount.value = amount
-        _feeAmount.value = feeAmount
-    }
-
-    fun setTokenToPurchase(token: Token?) {
-        _tokenToPurchase.value = token
-    }
-
-    fun emitPendingNavigation(route: AppRoute) {
-        _pendingNavigation.tryEmit(route)
-    }
-
-    fun requestFlowExit() {
-        _flowExitRequests.tryEmit(Unit)
-    }
-
-    fun reset() {
-        _state.value = ExternalWalletOnRampState.Idle
-        _amount.value = null
-        _feeAmount.value = null
-        _tokenToPurchase.value = null
-    }
-
-    fun transitionTo(state: ExternalWalletOnRampState) {
-        _state.value = state
-    }
-
-    suspend fun connectAndSign(origin: AppRoute) {
-        val currentState = _state.value
-        val provider = currentState.provider ?: return
-
-        phantomConnector.beginCeremony()
-        try {
-            // 1. Connect
-            transitionTo(
-                ExternalWalletOnRampState.Connecting(origin = origin, provider = provider)
-            )
-
-            when (val connectResult = phantomConnector.connect()) {
-                is WalletConnectorResult.Connected -> {
-                    val publicKey = PublicKey(Base58.decode(connectResult.publicKeyBase58).toList())
-                    val walletConnection = ExternalWalletConnection(
-                        publicKey = publicKey,
-                        session = connectResult.publicKeyBase58,
-                    )
-                    transitionTo(
-                        ExternalWalletOnRampState.Connected(
-                            origin = origin,
-                            provider = provider,
-                            connection = walletConnection,
-                        )
-                    )
-                }
-
-                is WalletConnectorResult.Cancelled -> {
-                    fail(
-                        DeeplinkOnRampError.WalletProvidedError(
-                            DeeplinkError.UserRejectedRequest,
-                            message = connectResult.reason ?: "User cancelled connection"
-                        ),
-                        currentState
-                    )
-                    return
-                }
-
-                is WalletConnectorResult.Error -> {
-                    fail(mapConnectorError(connectResult.cause), currentState)
-                    return
-                }
-            }
-
-            // 2. Build transaction (waits for amount if needed)
-            val amount = _amount.value
-            if (amount != null) {
-                when (origin) {
-                    is AppRoute.Token.Info,
-                    is AppRoute.Token.CurrencyCreator -> createAndValidateSwapTransaction()
-                    else -> createAndValidateDepositTransaction()
-                }
-            } else {
-                // Amount not yet set — handler will navigate to amount entry.
-                // connectAndSign returns here; the handler re-triggers tx building
-                // once amount is set via the Connected state observation.
-                return
-            }
-
-            // 3. Sign + Send
-            signAndSend()
-        } catch (e: Exception) {
-            fail(
-                DeeplinkOnRampError.FailedToCreateTransaction(message = e.message, cause = e),
-                _state.value
-            )
-        } finally {
-            phantomConnector.endCeremony()
-        }
-    }
-
-    suspend fun signAndSend() {
-        val signingState = _state.value
-        if (signingState !is ExternalWalletOnRampState.Signing) return
-
-        val txBase58 = Base58.encode(signingState.unsignedTransaction.toByteArray())
-
-        when (val signResult = phantomConnector.signTransaction(txBase58)) {
-            is WalletSignResult.Success -> {
-                val signedTxBase58 = signResult.signature
-                val signature = firstSignature(signedTxBase58)
-                    ?: error("Could not extract signature from signed transaction")
-
-                transitionTo(
-                    ExternalWalletOnRampState.Signed(
-                        origin = signingState.origin,
-                        provider = signingState.provider,
-                        connection = signingState.connection,
-                        signedTransaction = signedTxBase58,
-                        signature = signature,
-                        amount = signingState.amount,
-                        fee = signingState.fee,
-                        token = signingState.token,
-                        swapId = signingState.swapId,
-                    )
-                )
-            }
-
-            is WalletSignResult.Error -> {
-                fail(mapConnectorError(signResult.cause), signingState)
-                return
-            }
-        }
-
-        sendTransaction()
-    }
-
-    suspend fun createAndValidateSwapTransaction() {
-        val state = _state.value
-        if (state !is ExternalWalletOnRampState.Connected) return
-        val amount = _amount.value ?: return
-        val fee = _feeAmount.value ?: LocalFiat.Zero
-
-        val sender = PublicKey(state.connection.publicKey.bytes)
-        val balanceCheck = checkExternalWalletBalances(
-            sender = sender,
-            requiredUsdcQuarks = amount.localFiat.underlyingTokenAmount.quarks,
-        )
-        if (balanceCheck.isFailure) {
-            val throwable = balanceCheck.exceptionOrNull() ?: return
-            val error = throwable as? DeeplinkOnRampError
-                ?: DeeplinkOnRampError.FailedToCreateTransaction(message = throwable.message, cause = throwable)
-            fail(error, state)
-            return
-        }
-
-        createUsdcToUsdfSwapTransaction(state, amount.localFiat)
-            .onFailure { fail(DeeplinkOnRampError.FailedToCreateTransaction(message = it.message, cause = it), state) }
-            .fold(
-                onSuccess = { (transaction, swapId) ->
-                    withContext(Dispatchers.IO) {
-                        driver.simulateTransaction(transaction.encode().base64)
-                            .fold(
-                                onSuccess = { Result.success(transaction to swapId) },
-                                onFailure = { Result.failure(it) }
-                            )
-                    }
-                },
-                onFailure = { Result.failure(it) }
-            )
-            .onFailure { fail(DeeplinkOnRampError.FailedToSimulateTransaction(message = it.message, cause = it), state) }
-            .onSuccess { (transaction, swapId) ->
-                transitionTo(
-                    ExternalWalletOnRampState.Signing(
-                        origin = state.origin,
-                        provider = state.provider,
-                        connection = state.connection,
-                        unsignedTransaction = transaction.encode().toList(),
-                        amount = amount,
-                        fee = fee,
-                        token = _tokenToPurchase.value,
-                        swapId = swapId,
-                    )
-                )
-            }
-    }
-
-    suspend fun createAndValidateDepositTransaction() {
-        val state = _state.value
-        if (state !is ExternalWalletOnRampState.Connected) return
-        val amount = _amount.value ?: return
-        val fee = _feeAmount.value ?: LocalFiat.Zero
-
-        createDepositTransaction(state, amount.localFiat)
-            .onFailure { fail(DeeplinkOnRampError.FailedToCreateTransaction(message = it.message, cause = it), state) }
-            .fold(
-                onSuccess = { transaction ->
-                    withContext(Dispatchers.IO) {
-                        driver.simulateTransaction(transaction.serialize().base64)
-                            .fold(
-                                onSuccess = { Result.success(transaction) },
-                                onFailure = { Result.failure(it) }
-                            )
-                    }
-                },
-                onFailure = { Result.failure(it) }
-            )
-            .onFailure { fail(DeeplinkOnRampError.FailedToSimulateTransaction(message = it.message, cause = it), state) }
-            .onSuccess { transaction ->
-                transitionTo(
-                    ExternalWalletOnRampState.Signing(
-                        origin = state.origin,
-                        provider = state.provider,
-                        connection = state.connection,
-                        unsignedTransaction = transaction.serialize().toList(),
-                        amount = amount,
-                        fee = fee,
-                        token = _tokenToPurchase.value,
-                        swapId = null,
-                    )
-                )
-            }
-    }
-
-    suspend fun sendTransaction() {
-        val state = _state.value
-        if (state !is ExternalWalletOnRampState.Signed) return
-
-        transitionTo(
-            ExternalWalletOnRampState.Transacting(
-                origin = state.origin,
-                provider = state.provider,
-                token = state.token,
-                swapId = state.swapId,
-            )
-        )
-
-        withContext(Dispatchers.IO) {
-            val sendIt = suspend {
-                driver.sendTransaction(state.signedTransaction)
-                    .onSuccess {
-                        transitionTo(
-                            ExternalWalletOnRampState.Transacted(
-                                origin = state.origin,
-                                provider = state.provider,
-                                token = state.token,
-                                swapId = state.swapId,
-                            )
-                        )
-                    }.onFailure { error ->
-                        val code = (error as? RpcException)?.code?.toLong()
-                        val errorMessage = error.message.orEmpty()
-                        val programErrorMatch = PROGRAM_ERROR_REGEX.find(errorMessage)
-                        trace(
-                            message = "Unexpected error sending solana transaction",
-                            type = TraceType.Error,
-                            metadata = {
-                                if (error is RpcException) {
-                                    "code" to error.code
-                                }
-                                "message" to errorMessage
-                                if (programErrorMatch != null) {
-                                    "instructionIndex" to programErrorMatch.groupValues[1]
-                                    "programError" to "0x${programErrorMatch.groupValues[2]}"
-                                }
-                            }
-                        )
-                        ErrorUtils.handleError(error)
-                        fail(
-                            DeeplinkOnRampError.FailedToSendTransaction(
-                                code = code ?: -99L,
-                                message = error.message,
-                                cause = error
-                            ),
-                            state
-                        )
-                    }
-            }
-
-            if (state.origin is AppRoute.Token.Info || state.origin is AppRoute.Token.CurrencyCreator) {
-                initiateBuy(state)
-                    .fold(
-                        onSuccess = {
-                            sendIt()
-                            Result.success(Unit)
-                        },
-                        onFailure = {
-                            fail(DeeplinkOnRampError.FailedToSubmitBuyToServer(message = it.message), state)
-                            Result.failure(it)
-                        }
-                    )
-            } else {
-                sendIt()
-            }
-        }
-    }
-
-    private suspend fun checkExternalWalletBalances(
-        sender: PublicKey,
-        requiredUsdcQuarks: Long,
-    ): Result<Unit> {
-        return withContext(Dispatchers.IO) {
-            val solBalance = driver.getBalance(sender).getOrElse { return@withContext Result.failure(it) }
-            if (solBalance < MINIMUM_SOL_LAMPORTS) {
-                return@withContext Result.failure(
-                    DeeplinkOnRampError.InsufficientSol(
-                        requiredLamports = MINIMUM_SOL_LAMPORTS,
-                        actualLamports = solBalance,
-                    )
-                )
-            }
-
-            val usdcAta = PublicKey.deriveAssociatedAccount(
-                owner = PublicKey(sender.base58()),
-                mint = PublicKey(Mint.usdc.base58()),
-            )
-            val usdcBalance = driver.getTokenAccountBalance(usdcAta.publicKey).getOrElse { return@withContext Result.failure(it) }
-            if (usdcBalance < requiredUsdcQuarks) {
-                return@withContext Result.failure(
-                    DeeplinkOnRampError.InsufficientUsdc(
-                        requiredQuarks = requiredUsdcQuarks,
-                        actualQuarks = usdcBalance,
-                    )
-                )
-            }
-
-            Result.success(Unit)
-        }
-    }
-
-    private suspend fun createUsdcToUsdfSwapTransaction(
-        state: ExternalWalletOnRampState.Connected,
-        amount: LocalFiat,
-    ): Result<Pair<SolanaTransaction, SwapId>> {
-        return withContext(Dispatchers.IO) {
-            try {
-                val owner = requireNotNull(userManager.accountCluster) { "Owner is null" }
-                val externalWallet = requireNotNull(state.connection.publicKey) { "Wallet connection is null" }
-                val sender = PublicKey(externalWallet.bytes)
-
-                val swapId = SwapId.generate()
-                val recentBlockhash = connection.getLatestBlockhash()
-
-                val liquidityPool = userFlags.resolvedFlags.value.usdcOnRampLiquidityPool.effectiveValue
-                val swapPool = when (liquidityPool) {
-                    UsdcLiquidtyPool.CoinbaseStableSwapper -> {
-                        val poolAddress = FundSwapPool.CoinbaseStableSwapper.poolAddress
-                        val poolData = driver.getAccountData(poolAddress).getOrThrow()
-                        FundSwapPool.CoinbaseStableSwapper.fromAccountData(poolData)
-                    }
-                    UsdcLiquidtyPool.Unknown,
-                    UsdcLiquidtyPool.Flipcash -> FundSwapPool.Usdf(LiquidityPool.usdf)
-                }
-
-                trace("Building USDC -> USDF fund swap using $liquidityPool LP")
-
-                val transaction = TransactionBuilder.usdcFundSwap(
-                    owner = owner.authorityPublicKey,
-                    sender = sender,
-                    amount = amount.underlyingTokenAmount.quarks,
-                    pool = swapPool,
-                    blockhash = Hash(recentBlockhash),
-                    swapId = swapId,
-                )
-
-                Result.success(transaction to swapId)
-            } catch (e: Exception) {
-                trace("External swap failed", type = TraceType.Error, error = e)
-                Result.failure(e)
-            }
-        }
-    }
-
-    private suspend fun initiateBuy(state: ExternalWalletOnRampState.Signed): Result<SwapId> {
-        val owner = requireNotNull(userManager.accountCluster) { "Owner is null" }
-        val token = requireNotNull(state.token) { "Token is null" }
-
-        return withContext(NonCancellable) {
-            transactionController.buy(
-                owner = owner,
-                amount = state.amount,
-                feeAmount = state.fee,
-                of = token,
-                swapId = state.swapId,
-                source = SwapFundingSource.ExternalWallet(state.signature.bytes),
-                fund = { Result.success(Unit) }
-            )
-        }
-    }
-
-    private suspend fun createDepositTransaction(
-        state: ExternalWalletOnRampState.Connected,
-        amount: LocalFiat,
-    ): Result<com.solana.transaction.Transaction> {
-        return withContext(Dispatchers.IO) {
-            try {
-                val usdfMint = Mint.usdf
-                val quarks = amount.underlyingTokenAmount.quarks
-                val externalWallet = requireNotNull(state.connection.publicKey) { "Wallet connection is null" }
-                val owner = requireNotNull(userManager.accountCluster) { "Owner is null" }
-
-                val sender = PublicKey(externalWallet.bytes)
-                val senderTokenAccount = PublicKey.deriveAssociatedAccount(
-                    owner = PublicKey(sender.base58()),
-                    mint = PublicKey(usdfMint.base58())
-                )
-                val destinationTokenAccount = PublicKey.deriveAssociatedAccount(
-                    owner = PublicKey(owner.usdfDepositAddress.base58()),
-                    mint = PublicKey(usdfMint.base58())
-                )
-
-                val senderAtaExists = driver.doesAccountExist(senderTokenAccount.publicKey)
-                    .onFailure { e ->
-                        trace("Failed to check sender ATA", type = TraceType.Error, error = e)
-                        return@withContext Result.failure(e)
-                    }.map { true }.getOrElse { false }
-
-                val recipientAtaExists = driver.doesAccountExist(destinationTokenAccount.publicKey)
-                    .onFailure { e ->
-                        trace("Failed to check recipient ATA", type = TraceType.Error, error = e)
-                        return@withContext Result.failure(e)
-                    }.map { true }.getOrElse { false }
-
-                val instructions = buildList {
-                    if (!senderAtaExists) {
-                        add(
-                            createAssociatedTokenAccountInstruction(
-                                payer = sender,
-                                owner = sender,
-                                ata = senderTokenAccount.publicKey,
-                                mint = usdfMint
-                            )
-                        )
-                    }
-
-                    if (!recipientAtaExists) {
-                        add(
-                            createAssociatedTokenAccountInstruction(
-                                payer = sender,
-                                owner = owner.usdfDepositAddress,
-                                ata = destinationTokenAccount.publicKey,
-                                mint = usdfMint
-                            )
-                        )
-                    }
-
-                    add(
-                        createSplTransfer(
-                            sender = sender,
-                            sourceTokenAccount = senderTokenAccount.publicKey,
-                            destinationTokenAccount = destinationTokenAccount.publicKey,
-                            quarks = quarks
-                        )
-                    )
-                }
-
-                val message = Message.Builder()
-                    .setRecentBlockhash(connection.getLatestBlockhash())
-                    .apply { instructions.forEach { addInstruction(it) } }
-                    .build()
-
-                message.inspect()
-
-                val transaction = message.toUnsignedTransaction()
-
-                Result.success(transaction)
-            } catch (e: Exception) {
-                trace("Transaction creation failed", type = TraceType.Error, error = e)
-                Result.failure(e)
-            }
-        }
-    }
-
-    private fun fail(error: DeeplinkOnRampError, currentState: ExternalWalletOnRampState) {
-        transitionTo(
-            ExternalWalletOnRampState.Failed(
-                error = error,
-                origin = currentState.origin,
-                provider = currentState.provider,
-            )
-        )
-    }
-
-    private fun mapConnectorError(cause: Throwable): DeeplinkOnRampError {
-        if (cause is PhantomWalletException) {
-            val deeplinkError = DeeplinkError.fromCode(cause.code.toLong())
-            return DeeplinkOnRampError.WalletProvidedError(deeplinkError, message = cause.message)
-        }
-        return DeeplinkOnRampError.FailedToCreateTransaction(message = cause.message, cause = cause)
-    }
-}
-
-// ~0.0065 SOL: covers up to 3 ATA rent exemptions + priority fee + base fee
-private const val MINIMUM_SOL_LAMPORTS = 6_500_000L
-
-private val PROGRAM_ERROR_REGEX =
-    Regex("""Error processing Instruction (\d+): custom program error: 0x([0-9a-fA-F]+)""")
-
-private fun firstSignature(base58: String): Signature? {
-    return SolanaTransaction.fromList(Base58.decode(base58).toList())?.identifier
-}
-
-private val ExternalWalletOnRampState.origin: AppRoute?
-    get() = when (this) {
-        is ExternalWalletOnRampState.Idle -> null
-        is ExternalWalletOnRampState.Started -> origin
-        is ExternalWalletOnRampState.Connecting -> origin
-        is ExternalWalletOnRampState.Connected -> origin
-        is ExternalWalletOnRampState.Signing -> origin
-        is ExternalWalletOnRampState.Signed -> origin
-        is ExternalWalletOnRampState.Transacting -> origin
-        is ExternalWalletOnRampState.Transacted -> origin
-        is ExternalWalletOnRampState.Failed -> origin
-    }
-
-private val ExternalWalletOnRampState.provider: OnRampProvider.UsesDeeplinks?
-    get() = when (this) {
-        is ExternalWalletOnRampState.Idle -> null
-        is ExternalWalletOnRampState.Started -> provider
-        is ExternalWalletOnRampState.Connecting -> provider
-        is ExternalWalletOnRampState.Connected -> provider
-        is ExternalWalletOnRampState.Signing -> provider
-        is ExternalWalletOnRampState.Signed -> provider
-        is ExternalWalletOnRampState.Transacting -> provider
-        is ExternalWalletOnRampState.Transacted -> provider
-        is ExternalWalletOnRampState.Failed -> provider
-    }
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampHandler.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampHandler.kt
deleted file mode 100644
index 9c6c29a1e..000000000
--- a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampHandler.kt
+++ /dev/null
@@ -1,322 +0,0 @@
-package com.flipcash.app.onramp
-
-import android.content.res.Resources
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.platform.LocalResources
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.flipcash.app.analytics.rememberAnalytics
-import com.flipcash.app.core.AppRoute
-import com.flipcash.app.core.tokens.FundingSource
-import com.flipcash.app.core.tokens.SwapPurpose
-import com.flipcash.services.internal.model.thirdparty.OnRampProvider
-import com.flipcash.shared.onramp.deeplinks.R
-import com.getcode.manager.BottomBarAction
-import com.getcode.manager.BottomBarManager
-import com.getcode.navigation.core.CodeNavigator
-import com.getcode.util.permissions.rememberNotificationPermission
-import com.getcode.utils.TraceType
-import com.getcode.utils.isNetworkError
-import com.getcode.utils.trace
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-
-@Composable
-fun ExternalWalletOnRampHandler(
-    controller: ExternalWalletOnRampController = LocalExternalWalletOnRampController.current,
-    navigator: CodeNavigator,
-    content: @Composable () -> Unit,
-) {
-    val composeScope = rememberCoroutineScope()
-    val analytics = rememberAnalytics()
-    val state by controller.state.collectAsStateWithLifecycle()
-    val amount by controller.amount.collectAsStateWithLifecycle()
-
-    val resources = LocalResources.current
-
-    fun close(exit: Boolean) {
-        val origin = (state as? ExternalWalletOnRampState.Transacted)?.origin
-            ?: (state as? ExternalWalletOnRampState.Failed)?.origin
-
-        if (origin is AppRoute.Token.Info || origin is AppRoute.Token.CurrencyCreator) {
-            controller.requestFlowExit()
-            controller.reset()
-            return
-        }
-
-        if (exit) {
-            composeScope.launch {
-                delay(300)
-                navigator.hide()
-            }
-            return
-        }
-
-        origin?.let { route ->
-            composeScope.launch {
-                delay(300)
-                navigator.popUntil { it::class == route::class }
-            }
-        } ?: run { navigator.popAll() }
-    }
-
-    val notifications = rememberNotificationPermission {
-        composeScope.launch { close(true) }
-    }
-
-    LaunchedEffect(state, amount) {
-        when (val current = state) {
-            is ExternalWalletOnRampState.Idle -> Unit
-
-            is ExternalWalletOnRampState.Started -> {
-                if (current.origin is AppRoute.Token.Info) {
-                    controller.emitPendingNavigation(
-                        AppRoute.Token.Swap(
-                            SwapPurpose.Buy(current.origin.mint, FundingSource.Phantom),
-                            shortfall = current.origin.shortfall
-                        )
-                    )
-                }
-
-                analytics.connectWallet(current.provider)
-                composeScope.launch { controller.connectAndSign(current.origin) }
-            }
-
-            is ExternalWalletOnRampState.Connecting -> Unit
-
-            is ExternalWalletOnRampState.Connected -> {
-                trace(
-                    tag = TAG,
-                    message = "wallet connected",
-                    type = TraceType.Process
-                )
-                if (amount != null) {
-                    when (current.origin) {
-                        is AppRoute.Token.Info,
-                        is AppRoute.Token.CurrencyCreator -> controller.createAndValidateSwapTransaction()
-                        else -> controller.createAndValidateDepositTransaction()
-                    }
-                } else {
-                    when (current.origin) {
-                        is AppRoute.Token.Info -> {
-                            // Swap already navigated via pendingNavigation at Started
-                        }
-                        is AppRoute.Token.CurrencyCreator -> {
-                            // Amount is always pre-set from CurrencyCreator; no-op for safety
-                        }
-                        else -> {
-                            navigator.push(
-                                AppRoute.Token.Swap(
-                                    SwapPurpose.Buy(controller.tokenToPurchase.value!!.address, FundingSource.Phantom)
-                                )
-                            )
-                        }
-                    }
-                }
-            }
-
-            is ExternalWalletOnRampState.Signing -> {
-                val swapId = current.swapId
-                if (current.origin is AppRoute.Token.Info && swapId != null) {
-                    controller.emitPendingNavigation(
-                        AppRoute.Token.TxProcessing(
-                            swapId, awaitExternalWallet = true
-                        )
-                    )
-                }
-
-                analytics.amountSelectedForWalletTransfer(current.provider, current.amount.localFiat.underlyingTokenAmount)
-
-                // When amount was deferred (Token.Info / CurrencyCreator), connectAndSign()
-                // returned early after connect. Drive the sign + send steps now.
-                if (current.origin is AppRoute.Token.Info || current.origin is AppRoute.Token.CurrencyCreator) {
-                    composeScope.launch { controller.signAndSend() }
-                }
-            }
-
-            is ExternalWalletOnRampState.Signed -> {
-                trace(
-                    tag = TAG,
-                    message = "wallet transaction signed!",
-                    type = TraceType.Process
-                )
-                controller.sendTransaction()
-            }
-
-            is ExternalWalletOnRampState.Transacting -> {
-                trace(
-                    tag = TAG,
-                    message = "transaction in progress",
-                    type = TraceType.Process
-                )
-            }
-
-            is ExternalWalletOnRampState.Transacted -> {
-                trace(
-                    tag = TAG,
-                    message = "transaction complete",
-                    type = TraceType.Process
-                )
-                analytics.transactionSubmittedToWallet(current.provider)
-
-                if (current.origin is AppRoute.Token.Info) {
-                    // TxProcessingScreen observes Transacted, calls reset() and dispatches OnSwapIdChanged
-                    return@LaunchedEffect
-                }
-
-                if (current.origin is AppRoute.Token.CurrencyCreator) {
-                    // CurrencyCreatorViewModel observes Transacted, handles reset and completion
-                    return@LaunchedEffect
-                }
-
-                val swapId = current.swapId
-                val token = current.token
-                controller.reset()
-
-                if (swapId != null) {
-                    navigator.push(AppRoute.Token.TxProcessing(swapId))
-                } else {
-                    val title = token?.let {
-                        resources.getString(R.string.prompt_title_tokenPurchaseOnTheWay, it.name)
-                    } ?: resources.getString(R.string.prompt_title_cashOnTheWay)
-                    BottomBarManager.showSuccess(
-                        title = title,
-                        message = resources.getString(R.string.prompt_description_cashOnTheWay),
-                        showScrim = true,
-                        actions = buildList {
-                            if (notifications.isGranted) {
-                                add(
-                                    BottomBarAction(
-                                        text = resources.getString(R.string.action_ok),
-                                    ) {
-                                        close(true)
-                                    }
-                                )
-                            } else {
-                                add(
-                                    BottomBarAction(
-                                        text = resources.getString(R.string.action_notifyMe)
-                                    ) {
-                                        notifications.launch()
-                                    }
-                                )
-
-                                add(
-                                    BottomBarAction(
-                                        text = resources.getString(R.string.action_dismiss),
-                                        style = BottomBarManager.BottomBarButtonStyle.Text
-                                    ) {
-                                        close(true)
-                                    }
-                                )
-                            }
-                        },
-                    )
-                }
-            }
-
-            is ExternalWalletOnRampState.Failed -> {
-                val error = current.error
-                val (title, message) = error.messaging(
-                    resources = resources,
-                    provider = when (current.provider) {
-                        OnRampProvider.Phantom -> resources.getString(R.string.label_phantom)
-                        null -> ""
-                    }
-                )
-
-                if (error is DeeplinkOnRampError.WalletProvidedError && error.code == DeeplinkError.UserRejectedRequest.code) {
-                    analytics.walletTransactionCancelled(current.provider!!)
-                } else if (error is DeeplinkOnRampError.FailedToSendTransaction) {
-                    analytics.walletTransactionFailed(current.provider!!)
-                }
-
-                trace(
-                    tag = TAG,
-                    message = "Something went wrong during deeplink onramp",
-                    type = TraceType.Error,
-                    metadata = {
-                        "errorMessage" to error.message
-                        "userMessage" to message
-                        "code" to error.code
-                    },
-                    error = error.takeUnless { it.isAlert }
-                )
-
-                val onDismiss = {
-                    close(false)
-                    controller.reset()
-                }
-
-                when {
-                    error.isNetworkCause -> {
-                        BottomBarManager.showAlert(
-                            title = resources.getString(R.string.error_title_noInternet),
-                            message = resources.getString(R.string.error_description_noInternet),
-                            onDismiss = { onDismiss() },
-                        )
-                    }
-                    error.isAlert -> {
-                        BottomBarManager.showAlert(
-                            title = title,
-                            message = message,
-                            onDismiss = { onDismiss() },
-                        )
-                    }
-                    else -> {
-                        BottomBarManager.showError(
-                            title = title,
-                            message = message,
-                            onDismiss = { onDismiss() },
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    content()
-}
-
-
-private const val TAG = "onramp::deeplinks"
-
-private val DeeplinkOnRampError.isAlert: Boolean
-    get() = this is DeeplinkOnRampError.WalletProvidedError && error in listOf(
-        DeeplinkError.UserRejectedRequest,
-        DeeplinkError.Disconnected,
-        DeeplinkError.TransactionRejected,
-    ) || this is DeeplinkOnRampError.FailedToSendTransaction
-        || this is DeeplinkOnRampError.InsufficientSol
-        || this is DeeplinkOnRampError.InsufficientUsdc
-        || (this is DeeplinkOnRampError.FailedToSimulateTransaction && cause?.isNetworkError() == true)
-        || (this is DeeplinkOnRampError.FailedToCreateTransaction && cause?.isNetworkError() == true)
-
-private val DeeplinkOnRampError.isNetworkCause: Boolean
-    get() = (this is DeeplinkOnRampError.FailedToSimulateTransaction || this is DeeplinkOnRampError.FailedToCreateTransaction)
-        && cause?.isNetworkError() == true
-
-private typealias Title = String
-private typealias Message = String
-
-private fun DeeplinkOnRampError.messaging(resources: Resources, provider: String): Pair<Title, Message> = when (this) {
-    is DeeplinkOnRampError.FailedToCreateTransaction -> resources.getString(R.string.error_title_deeplinkOnRampFailedToCreateTransaction) to resources.getString(R.string.error_description_deeplinkOnRampFailedToCreateTransaction)
-    is DeeplinkOnRampError.FailedToSimulateTransaction -> resources.getString(R.string.error_title_deeplinkOnRampFailedToSimulateTransaction) to resources.getString(R.string.error_description_deeplinkOnRampFailedToSimulateTransaction)
-    is DeeplinkOnRampError.FailedToSendTransaction -> resources.getString(R.string.error_title_deeplinkOnRampFailedToSendTransaction) to resources.getString(R.string.error_description_deeplinkOnRampFailedToSendTransaction).format(provider)
-    is DeeplinkOnRampError.FailedToSubmitBuyToServer -> resources.getString(R.string.error_title_deeplinkOnRampExternalFundBuy) to resources.getString(R.string.error_description_deeplinkOnRampExternalFundBuy).format(provider)
-    is DeeplinkOnRampError.InsufficientSol -> resources.getString(R.string.error_title_deeplinkOnRampInsufficientSol) to resources.getString(R.string.error_description_deeplinkOnRampInsufficientSol, provider)
-    is DeeplinkOnRampError.InsufficientUsdc -> resources.getString(R.string.error_title_deeplinkOnRampInsufficientUsdc) to resources.getString(R.string.error_description_deeplinkOnRampInsufficientUsdc, provider)
-    is DeeplinkOnRampError.WalletProvidedError -> when (this.error) {
-        DeeplinkError.Disconnected -> resources.getString(R.string.error_title_deeplinkOnRampDisconnected) to resources.getString(R.string.error_description_deeplinkOnRampDisconnected).format(provider)
-        DeeplinkError.Unauthorized -> resources.getString(R.string.error_title_deeplinkOnRampUnauthorized) to resources.getString(R.string.error_description_deeplinkOnRampUnauthorized)
-        DeeplinkError.UserRejectedRequest -> resources.getString(R.string.error_title_deeplinkOnRampUserRejected).format(provider) to resources.getString(R.string.error_description_deeplinkOnRampUserRejected).format(provider)
-        DeeplinkError.InvalidInput -> resources.getString(R.string.error_title_deeplinkOnRampInvalidInput) to resources.getString(R.string.error_description_deeplinkOnRampInvalidInput)
-        DeeplinkError.RequestedResourceNotAvailable -> resources.getString(R.string.error_title_deeplinkOnRampRequestedResourceNotAvailable) to resources.getString(R.string.error_description_deeplinkOnRampRequestedResourceNotAvailable).format(provider)
-        DeeplinkError.TransactionRejected -> resources.getString(R.string.error_title_deeplinkOnRampTransactionRejected) to resources.getString(R.string.error_description_deeplinkOnRampTransactionRejected).format(provider)
-        DeeplinkError.MethodNotFound -> resources.getString(R.string.error_title_deeplinkOnRampMethodNotFound) to resources.getString(R.string.error_description_deeplinkOnRampMethodNotFound).format(provider)
-        DeeplinkError.InternalError -> resources.getString(R.string.error_title_deeplinkOnRampInternalError) to resources.getString(R.string.error_description_deeplinkOnRampInternalError).format(provider)
-        DeeplinkError.Unknown -> resources.getString(R.string.error_title_deeplinkOnRampUnknown) to resources.getString(R.string.error_description_deeplinkOnRampUnknown)
-    }
-}
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampState.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampState.kt
deleted file mode 100644
index a797bc382..000000000
--- a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/ExternalWalletOnRampState.kt
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.flipcash.app.onramp
-
-import com.flipcash.app.core.AppRoute
-import com.flipcash.app.core.onramp.deeplinks.ExternalWalletConnection
-import com.flipcash.services.internal.model.thirdparty.OnRampProvider
-import com.getcode.opencode.exchange.VerifiedFiat
-import com.getcode.opencode.internal.solana.model.SwapId
-import com.getcode.opencode.model.financial.LocalFiat
-import com.getcode.opencode.model.financial.Token
-import com.getcode.solana.keys.Signature
-
-sealed interface ExternalWalletOnRampState {
-    data object Idle : ExternalWalletOnRampState
-
-    data class Started(
-        val origin: AppRoute,
-        val provider: OnRampProvider.UsesDeeplinks,
-    ) : ExternalWalletOnRampState
-
-    data class Connecting(
-        val origin: AppRoute,
-        val provider: OnRampProvider.UsesDeeplinks,
-    ) : ExternalWalletOnRampState
-
-    data class Connected(
-        val origin: AppRoute,
-        val provider: OnRampProvider.UsesDeeplinks,
-        val connection: ExternalWalletConnection,
-    ) : ExternalWalletOnRampState
-
-    data class Signing(
-        val origin: AppRoute,
-        val provider: OnRampProvider.UsesDeeplinks,
-        val connection: ExternalWalletConnection,
-        val unsignedTransaction: List<Byte>,
-        val amount: VerifiedFiat,
-        val fee: LocalFiat,
-        val token: Token?,
-        val swapId: SwapId?,
-    ) : ExternalWalletOnRampState
-
-    data class Signed(
-        val origin: AppRoute,
-        val provider: OnRampProvider.UsesDeeplinks,
-        val connection: ExternalWalletConnection,
-        val signedTransaction: String,
-        val signature: Signature,
-        val amount: VerifiedFiat,
-        val fee: LocalFiat,
-        val token: Token?,
-        val swapId: SwapId?,
-    ) : ExternalWalletOnRampState
-
-    data class Transacting(
-        val origin: AppRoute,
-        val provider: OnRampProvider.UsesDeeplinks,
-        val token: Token?,
-        val swapId: SwapId?,
-    ) : ExternalWalletOnRampState
-
-    data class Transacted(
-        val origin: AppRoute,
-        val provider: OnRampProvider.UsesDeeplinks,
-        val token: Token?,
-        val swapId: SwapId?,
-    ) : ExternalWalletOnRampState
-
-    data class Failed(
-        val error: DeeplinkOnRampError,
-        val origin: AppRoute?,
-        val provider: OnRampProvider.UsesDeeplinks?,
-    ) : ExternalWalletOnRampState
-}
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
new file mode 100644
index 000000000..f26e93053
--- /dev/null
+++ b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/PhantomWalletController.kt
@@ -0,0 +1,335 @@
+package com.flipcash.app.onramp
+
+import com.flipcash.app.userflags.UserFlagsCoordinator
+import com.flipcash.services.internal.model.thirdparty.UsdcLiquidtyPool
+import com.flipcash.services.user.UserManager
+import com.getcode.opencode.controllers.TransactionOperations
+import com.getcode.opencode.exchange.VerifiedFiat
+import com.getcode.opencode.internal.solana.extensions.deriveAssociatedAccount
+import com.getcode.opencode.internal.solana.model.SwapId
+import com.getcode.opencode.model.financial.LocalFiat
+import com.getcode.opencode.model.financial.Token
+import com.getcode.opencode.model.transactions.FundSwapPool
+import com.getcode.opencode.model.transactions.LiquidityPool
+import com.getcode.opencode.model.transactions.SwapFundingSource
+import com.getcode.opencode.solana.SolanaTransaction
+import com.getcode.opencode.solana.TransactionBuilder
+import com.getcode.solana.keys.Hash
+import com.getcode.solana.keys.Mint
+import com.getcode.solana.keys.PublicKey
+import com.getcode.solana.keys.Signature
+import com.getcode.solana.keys.base58
+import com.getcode.solana.rpc.RpcConfig
+import com.getcode.solana.rpc.RpcException
+import com.getcode.solana.rpc.SolanaConnection
+import com.getcode.solana.rpc.getBalance
+import com.getcode.solana.rpc.getAccountData
+import com.getcode.solana.rpc.getTokenAccountBalance
+import com.getcode.solana.rpc.sendTransaction
+import com.getcode.solana.rpc.simulateTransaction
+import com.getcode.utils.ErrorUtils
+import com.getcode.utils.TraceType
+import com.getcode.utils.base64
+import com.getcode.utils.trace
+import com.getcode.vendor.Base58
+import com.solana.networking.Rpc20Driver
+import dev.bmcreations.phantom.connect.ConnectResult
+import dev.bmcreations.phantom.connect.PhantomSdk
+import dev.bmcreations.phantom.connect.wallet.PhantomWalletConnector
+import dev.bmcreations.phantom.connect.wallet.PhantomWalletException
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.withContext
+import javax.inject.Inject
+
+class PhantomWalletController @Inject constructor(
+    private val userManager: UserManager,
+    private val userFlags: UserFlagsCoordinator,
+    private val transactionController: TransactionOperations,
+    private val rpcConfig: RpcConfig,
+    private val phantomSdk: PhantomSdk,
+    private val phantomConnector: PhantomWalletConnector,
+) {
+    private val connection by lazy { SolanaConnection(rpcConfig.rpcUrl) }
+    private val driver by lazy { Rpc20Driver(rpcConfig.rpcUrl, rpcConfig.networkDriver) }
+
+    suspend fun connectWallet(
+    ): Result<Unit> {
+        return doConnect()
+    }
+
+    /**
+     * Connect and swap in a single ceremony. The transparent overlay stays alive
+     * across both the connect and sign deeplink round-trips so the app never
+     * flashes between hops.
+     */
+    suspend fun connectAndSwap(
+        amount: VerifiedFiat,
+        fee: LocalFiat,
+        token: Token,
+        onConnectLaunching: () -> Unit = {},
+        onSignLaunching: (SwapId) -> Unit = {},
+    ): Result<SwapId> {
+        return phantomConnector.withCeremony {
+            onConnectLaunching()
+            doConnect().getOrElse { return@withCeremony Result.failure(it) }
+
+            executeSwap(
+                amount = amount,
+                fee = fee,
+                token = token,
+                onBeforeSign = { swapId ->
+                    onSignLaunching(swapId)
+                },
+            )
+        }
+    }
+
+    private suspend fun doConnect(): Result<Unit> {
+        return when (val result = phantomSdk.connect(phantomConnector)) {
+            is ConnectResult.Success -> Result.success(Unit)
+            is ConnectResult.Cancelled -> Result.failure(
+                DeeplinkOnRampError.WalletProvidedError(
+                    DeeplinkError.UserRejectedRequest,
+                    message = result.reason ?: "User cancelled connection"
+                )
+            )
+            is ConnectResult.Error -> Result.failure(mapConnectorError(result.cause))
+        }
+    }
+
+    suspend fun disconnect() {
+        try { phantomSdk.logout() } catch (_: Exception) { }
+    }
+
+    private suspend fun getSolanaAddress(): PublicKey {
+        val address = phantomSdk.solana.getAddress()
+            ?: error("Phantom wallet not connected")
+        return PublicKey(Base58.decode(address).toList())
+    }
+
+    suspend fun executeSwap(
+        amount: VerifiedFiat,
+        fee: LocalFiat,
+        token: Token,
+        onBeforeSign: (suspend (SwapId) -> Unit)? = null,
+        onSignLaunched: ((SwapId) -> Unit)? = null,
+    ): Result<SwapId> {
+        val sender = getSolanaAddress()
+
+        checkBalances(sender, amount.localFiat.underlyingTokenAmount.quarks)
+            .getOrElse { return Result.failure(it) }
+
+        val (tx, swapId) = buildSwapTransaction(sender, amount)
+            .getOrElse { return Result.failure(it) }
+
+        onBeforeSign?.invoke(swapId)
+        onSignLaunched?.let { cb ->
+            phantomConnector.setNextCallbacks(onLaunched = { cb(swapId) })
+        }
+
+        val signedTxBase58 = try {
+            phantomSdk.solana.signTransaction(tx.encode().base64)
+        } catch (e: Exception) {
+            return Result.failure(mapConnectorError(e))
+        }
+
+        val signature = firstSignature(signedTxBase58)
+            ?: return Result.failure(
+                DeeplinkOnRampError.FailedToCreateTransaction(
+                    message = "Could not extract signature from signed transaction"
+                )
+            )
+
+        sendSwapTransaction(signedTxBase58, signature, amount, fee, token, swapId)
+            .getOrElse { return Result.failure(it) }
+
+        return Result.success(swapId)
+    }
+
+    internal suspend fun checkBalances(
+        sender: PublicKey,
+        requiredUsdcQuarks: Long,
+    ): Result<Unit> {
+        return withContext(Dispatchers.IO) {
+            val solBalance = driver.getBalance(sender)
+                .getOrElse { return@withContext Result.failure(it) }
+            if (solBalance < MINIMUM_SOL_LAMPORTS) {
+                return@withContext Result.failure(
+                    DeeplinkOnRampError.InsufficientSol(
+                        requiredLamports = MINIMUM_SOL_LAMPORTS,
+                        actualLamports = solBalance,
+                    )
+                )
+            }
+
+            val usdcAta = PublicKey.deriveAssociatedAccount(
+                owner = PublicKey(sender.base58()),
+                mint = PublicKey(Mint.usdc.base58()),
+            )
+            val usdcBalance = driver.getTokenAccountBalance(usdcAta.publicKey)
+                .getOrElse { return@withContext Result.failure(it) }
+            if (usdcBalance < requiredUsdcQuarks) {
+                return@withContext Result.failure(
+                    DeeplinkOnRampError.InsufficientUsdc(
+                        requiredQuarks = requiredUsdcQuarks,
+                        actualQuarks = usdcBalance,
+                    )
+                )
+            }
+
+            Result.success(Unit)
+        }
+    }
+
+    private suspend fun buildSwapTransaction(
+        sender: PublicKey,
+        amount: VerifiedFiat,
+    ): Result<Pair<SolanaTransaction, SwapId>> {
+        return withContext(Dispatchers.IO) {
+            try {
+                val owner = requireNotNull(userManager.accountCluster) { "Owner is null" }
+
+                val swapId = SwapId.generate()
+                val recentBlockhash = connection.getLatestBlockhash()
+
+                val liquidityPool = userFlags.resolvedFlags.value.usdcOnRampLiquidityPool.effectiveValue
+                val swapPool = when (liquidityPool) {
+                    UsdcLiquidtyPool.CoinbaseStableSwapper -> {
+                        val poolAddress = FundSwapPool.CoinbaseStableSwapper.poolAddress
+                        val poolData = driver.getAccountData(poolAddress).getOrThrow()
+                        FundSwapPool.CoinbaseStableSwapper.fromAccountData(poolData)
+                    }
+                    UsdcLiquidtyPool.Unknown,
+                    UsdcLiquidtyPool.Flipcash -> FundSwapPool.Usdf(LiquidityPool.usdf)
+                }
+
+                trace("Building USDC -> USDF fund swap using $liquidityPool LP")
+
+                val transaction = TransactionBuilder.usdcFundSwap(
+                    owner = owner.authorityPublicKey,
+                    sender = sender,
+                    amount = amount.localFiat.underlyingTokenAmount.quarks,
+                    pool = swapPool,
+                    blockhash = Hash(recentBlockhash),
+                    swapId = swapId,
+                )
+
+                // Simulate
+                driver.simulateTransaction(transaction.encode().base64)
+                    .getOrElse { cause ->
+                        return@withContext Result.failure(
+                            DeeplinkOnRampError.FailedToSimulateTransaction(
+                                message = cause.message, cause = cause
+                            )
+                        )
+                    }
+
+                Result.success(transaction to swapId)
+            } catch (e: Exception) {
+                trace("External swap failed", type = TraceType.Error, error = e)
+                Result.failure(
+                    DeeplinkOnRampError.FailedToCreateTransaction(message = e.message, cause = e)
+                )
+            }
+        }
+    }
+
+    private suspend fun sendSwapTransaction(
+        signedTxBase58: String,
+        signature: Signature,
+        amount: VerifiedFiat,
+        fee: LocalFiat,
+        token: Token,
+        swapId: SwapId,
+    ): Result<Unit> {
+        return withContext(Dispatchers.IO) {
+            // 1. Server-side buy intent
+            initiateBuy(
+                amount = amount,
+                fee = fee,
+                token = token,
+                swapId = swapId,
+                signature = signature,
+            ).getOrElse { cause ->
+                return@withContext Result.failure(
+                    DeeplinkOnRampError.FailedToSubmitBuyToServer(message = cause.message)
+                )
+            }
+
+            // 2. Submit to Solana
+            driver.sendTransaction(signedTxBase58)
+                .map { }
+                .onFailure { error ->
+                    val code = (error as? RpcException)?.code?.toLong()
+                    val errorMessage = error.message.orEmpty()
+                    val programErrorMatch = PROGRAM_ERROR_REGEX.find(errorMessage)
+                    trace(
+                        message = "Unexpected error sending solana transaction",
+                        type = TraceType.Error,
+                        metadata = {
+                            if (error is RpcException) {
+                                "code" to error.code
+                            }
+                            "message" to errorMessage
+                            if (programErrorMatch != null) {
+                                "instructionIndex" to programErrorMatch.groupValues[1]
+                                "programError" to "0x${programErrorMatch.groupValues[2]}"
+                            }
+                        }
+                    )
+                    ErrorUtils.handleError(error)
+                    return@withContext Result.failure(
+                        DeeplinkOnRampError.FailedToSendTransaction(
+                            code = code ?: -99L,
+                            message = error.message,
+                            cause = error,
+                        )
+                    )
+                }
+
+            Result.success(Unit)
+        }
+    }
+
+    private suspend fun initiateBuy(
+        amount: VerifiedFiat,
+        fee: LocalFiat,
+        token: Token,
+        swapId: SwapId?,
+        signature: Signature,
+    ): Result<SwapId> {
+        val owner = requireNotNull(userManager.accountCluster) { "Owner is null" }
+        return withContext(NonCancellable) {
+            transactionController.buy(
+                owner = owner,
+                amount = amount,
+                feeAmount = fee,
+                of = token,
+                swapId = swapId,
+                source = SwapFundingSource.ExternalWallet(signature.bytes),
+                fund = { Result.success(Unit) }
+            )
+        }
+    }
+
+    companion object {
+        // ~0.0065 SOL: covers up to 3 ATA rent exemptions + priority fee + base fee
+        internal const val MINIMUM_SOL_LAMPORTS = 6_500_000L
+    }
+}
+
+private val PROGRAM_ERROR_REGEX =
+    Regex("""Error processing Instruction (\d+): custom program error: 0x([0-9a-fA-F]+)""")
+
+private fun firstSignature(base58: String): Signature? {
+    return SolanaTransaction.fromList(Base58.decode(base58).toList())?.identifier
+}
+
+private fun mapConnectorError(cause: Throwable): DeeplinkOnRampError {
+    if (cause is PhantomWalletException) {
+        val deeplinkError = DeeplinkError.fromCode(cause.code.toLong())
+        return DeeplinkOnRampError.WalletProvidedError(deeplinkError, message = cause.message)
+    }
+    return DeeplinkOnRampError.FailedToCreateTransaction(message = cause.message, cause = cause)
+}
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/inject/PhantomWalletModule.kt b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/inject/PhantomWalletModule.kt
index 8ef4457ab..0719aec3b 100644
--- a/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/inject/PhantomWalletModule.kt
+++ b/apps/flipcash/shared/onramp/deeplinks/src/main/kotlin/com/flipcash/app/onramp/inject/PhantomWalletModule.kt
@@ -7,12 +7,19 @@ import dagger.hilt.InstallIn
 import dagger.hilt.android.components.ActivityRetainedComponent
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.scopes.ActivityRetainedScoped
+import dev.bmcreations.phantom.connect.Chain
+import dev.bmcreations.phantom.connect.Network
+import dev.bmcreations.phantom.connect.OAuthLauncher
+import dev.bmcreations.phantom.connect.OAuthResult
+import dev.bmcreations.phantom.connect.PhantomSdk
+import dev.bmcreations.phantom.connect.PhantomSdkConfig
 import dev.bmcreations.phantom.connect.wallet.PhantomWalletConnector
 import dev.bmcreations.phantom.connect.wallet.createDeeplinkLauncher
 
 @Module
 @InstallIn(ActivityRetainedComponent::class)
 object PhantomWalletModule {
+
     @Provides
     @ActivityRetainedScoped
     fun providePhantomWalletConnector(
@@ -21,7 +28,37 @@ object PhantomWalletModule {
         return PhantomWalletConnector(
             deeplinkLauncher = createDeeplinkLauncher(context),
             appUrl = "https://app.flipcash.com",
-            callbackScheme = "codewallet",
+            redirectUrl = "https://app.flipcash.com/phantom-wallet-callback",
+        )
+    }
+
+    @Provides
+    @ActivityRetainedScoped
+    fun providesPhantomSdkConfig(): PhantomSdkConfig = PhantomSdkConfig(
+        appId = "", // TODO: if/when we support connect
+        redirectUri = "https://app.flipcash.com/phantom-auth-callback",
+        providers = emptyList(), // disable social logins for now
+        chains = listOf(Chain.Solana),
+        network = Network.Mainnet,
+        persistSession = false, // explicity don't persist
+    )
+
+    @Provides
+    @ActivityRetainedScoped
+    fun providePhantomSdk(
+        config: PhantomSdkConfig,
+        connector: PhantomWalletConnector,
+    ): PhantomSdk {
+        return PhantomSdk.create(
+            config = config,
+            oauthLauncher = NoOpOAuthLauncher,
+            connectors = listOf(connector),
         )
     }
 }
+
+private object NoOpOAuthLauncher : OAuthLauncher {
+    override suspend fun launch(url: String, callbackScheme: String): OAuthResult {
+        return OAuthResult.Error(UnsupportedOperationException("OAuth not supported"))
+    }
+}
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletBalanceCheckTest.kt b/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletBalanceCheckTest.kt
index 4dd11a3ec..c3fb8f1c2 100644
--- a/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletBalanceCheckTest.kt
+++ b/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletBalanceCheckTest.kt
@@ -1,21 +1,15 @@
 package com.flipcash.app.onramp.internal
 
-import com.flipcash.app.core.AppRoute
-import com.flipcash.app.core.onramp.deeplinks.ExternalWalletConnection
 import com.flipcash.app.onramp.DeeplinkOnRampError
-import com.flipcash.app.onramp.ExternalWalletOnRampController
-import com.flipcash.app.onramp.ExternalWalletOnRampState
+import com.flipcash.app.onramp.PhantomWalletController
 import com.flipcash.app.userflags.UserFlagsCoordinator
-import com.flipcash.services.internal.model.thirdparty.OnRampProvider
 import com.flipcash.services.user.UserManager
 import com.getcode.opencode.controllers.TransactionOperations
-import com.getcode.opencode.exchange.VerifiedFiat
-import com.getcode.opencode.model.financial.Fiat
-import com.getcode.opencode.model.financial.LocalFiat
 import com.getcode.solana.keys.PublicKey
 import com.getcode.solana.rpc.RpcConfig
 import com.solana.networking.HttpNetworkDriver
 import com.solana.networking.HttpRequest
+import dev.bmcreations.phantom.connect.PhantomSdk
 import dev.bmcreations.phantom.connect.wallet.PhantomWalletConnector
 import io.mockk.coEvery
 import io.mockk.mockk
@@ -31,44 +25,25 @@ class ExternalWalletBalanceCheckTest {
     private val transactionController = mockk<TransactionOperations>(relaxed = true)
     private val networkDriver = mockk<HttpNetworkDriver>()
     private val rpcConfig = RpcConfig(networkDriver = networkDriver, rpcUrl = "https://localhost")
+    private val phantomSdk = mockk<PhantomSdk>(relaxed = true)
     private val phantomConnector = mockk<PhantomWalletConnector>(relaxed = true)
 
-    private lateinit var controller: ExternalWalletOnRampController
+    private lateinit var controller: PhantomWalletController
 
     private val testPublicKey = PublicKey("11111111111111111111111111111111")
 
     @Before
     fun setUp() {
-        controller = ExternalWalletOnRampController(
+        controller = PhantomWalletController(
             userManager = userManager,
             userFlags = userFlags,
             transactionController = transactionController,
             rpcConfig = rpcConfig,
+            phantomSdk = phantomSdk,
             phantomConnector = phantomConnector,
         )
     }
 
-    private fun putControllerInConnectedState(requiredQuarks: Long = 10_000_000L) {
-        controller.transitionTo(
-            ExternalWalletOnRampState.Connected(
-                origin = AppRoute.Token.CurrencyCreator,
-                provider = OnRampProvider.Phantom,
-                connection = ExternalWalletConnection(
-                    publicKey = testPublicKey,
-                    session = "test-session",
-                ),
-            )
-        )
-        controller.setAmount(
-            VerifiedFiat(
-                localFiat = LocalFiat(
-                    usdf = Fiat(quarks = requiredQuarks),
-                    nativeAmount = Fiat(quarks = requiredQuarks),
-                )
-            )
-        )
-    }
-
     private fun mockRpcResponses(solLamports: Long, usdcQuarks: Long) {
         coEvery { networkDriver.makeHttpRequest(any()) } answers {
             val body = firstArg<HttpRequest>().body.orEmpty()
@@ -83,131 +58,96 @@ class ExternalWalletBalanceCheckTest {
     // ── Insufficient SOL ──
 
     @Test
-    fun `insufficient SOL transitions to Failed with InsufficientSol`() = runTest {
-        putControllerInConnectedState()
+    fun `insufficient SOL returns failure with InsufficientSol`() = runTest {
         mockRpcResponses(solLamports = 1_000L, usdcQuarks = 100_000_000L)
 
-        controller.createAndValidateSwapTransaction()
+        val result = controller.checkBalances(testPublicKey, requiredUsdcQuarks = 10_000_000L)
 
-        val state = controller.state.value
-        assertTrue(state is ExternalWalletOnRampState.Failed, "Expected Failed, got $state")
-        assertTrue(state.error is DeeplinkOnRampError.InsufficientSol, "Expected InsufficientSol, got ${state.error}")
+        assertTrue(result.isFailure, "Expected failure")
+        assertTrue(result.exceptionOrNull() is DeeplinkOnRampError.InsufficientSol, "Expected InsufficientSol")
     }
 
     @Test
-    fun `zero SOL transitions to Failed with InsufficientSol`() = runTest {
-        putControllerInConnectedState()
+    fun `zero SOL returns failure with InsufficientSol`() = runTest {
         mockRpcResponses(solLamports = 0L, usdcQuarks = 100_000_000L)
 
-        controller.createAndValidateSwapTransaction()
+        val result = controller.checkBalances(testPublicKey, requiredUsdcQuarks = 10_000_000L)
 
-        val state = controller.state.value
-        assertTrue(state is ExternalWalletOnRampState.Failed)
-        assertTrue(state.error is DeeplinkOnRampError.InsufficientSol)
+        assertTrue(result.isFailure)
+        assertTrue(result.exceptionOrNull() is DeeplinkOnRampError.InsufficientSol)
     }
 
     // ── Insufficient USDC ──
 
     @Test
-    fun `insufficient USDC transitions to Failed with InsufficientUsdc`() = runTest {
-        putControllerInConnectedState(requiredQuarks = 10_000_000L)
+    fun `insufficient USDC returns failure with InsufficientUsdc`() = runTest {
         mockRpcResponses(solLamports = 10_000_000L, usdcQuarks = 1_000L)
 
-        controller.createAndValidateSwapTransaction()
+        val result = controller.checkBalances(testPublicKey, requiredUsdcQuarks = 10_000_000L)
 
-        val state = controller.state.value
-        assertTrue(state is ExternalWalletOnRampState.Failed, "Expected Failed, got $state")
-        assertTrue(state.error is DeeplinkOnRampError.InsufficientUsdc, "Expected InsufficientUsdc, got ${state.error}")
+        assertTrue(result.isFailure, "Expected failure")
+        assertTrue(result.exceptionOrNull() is DeeplinkOnRampError.InsufficientUsdc, "Expected InsufficientUsdc")
     }
 
     @Test
-    fun `zero USDC transitions to Failed with InsufficientUsdc`() = runTest {
-        putControllerInConnectedState(requiredQuarks = 10_000_000L)
+    fun `zero USDC returns failure with InsufficientUsdc`() = runTest {
         mockRpcResponses(solLamports = 10_000_000L, usdcQuarks = 0L)
 
-        controller.createAndValidateSwapTransaction()
+        val result = controller.checkBalances(testPublicKey, requiredUsdcQuarks = 10_000_000L)
 
-        val state = controller.state.value
-        assertTrue(state is ExternalWalletOnRampState.Failed)
-        assertTrue(state.error is DeeplinkOnRampError.InsufficientUsdc)
+        assertTrue(result.isFailure)
+        assertTrue(result.exceptionOrNull() is DeeplinkOnRampError.InsufficientUsdc)
     }
 
-    // ── RPC errors wrap as FailedToCreateTransaction ──
+    // ── RPC errors ──
 
     @Test
-    fun `RPC error on getBalance transitions to Failed with FailedToCreateTransaction`() = runTest {
-        putControllerInConnectedState()
+    fun `RPC error on getBalance returns failure`() = runTest {
         coEvery { networkDriver.makeHttpRequest(any()) } returns errorJson(-1, "Internal error")
 
-        controller.createAndValidateSwapTransaction()
+        val result = controller.checkBalances(testPublicKey, requiredUsdcQuarks = 10_000_000L)
 
-        val state = controller.state.value
-        assertTrue(state is ExternalWalletOnRampState.Failed, "Expected Failed, got $state")
-        assertTrue(
-            state.error is DeeplinkOnRampError.FailedToCreateTransaction,
-            "Expected FailedToCreateTransaction, got ${state.error}"
-        )
+        assertTrue(result.isFailure, "Expected failure")
     }
 
     // ── Boundary: exact threshold passes ──
 
     @Test
     fun `exact SOL threshold passes balance check`() = runTest {
-        putControllerInConnectedState(requiredQuarks = 5_000_000L)
-        // 6_500_000 is MINIMUM_SOL_LAMPORTS, 5_000_000 quarks matched exactly
-        mockRpcResponses(solLamports = 6_500_000L, usdcQuarks = 5_000_000L)
-
-        controller.createAndValidateSwapTransaction()
-
-        val state = controller.state.value
-        if (state is ExternalWalletOnRampState.Failed) {
-            assertTrue(
-                state.error !is DeeplinkOnRampError.InsufficientSol &&
-                    state.error !is DeeplinkOnRampError.InsufficientUsdc,
-                "Should not fail with balance errors, got ${state.error}"
-            )
-        }
+        mockRpcResponses(solLamports = PhantomWalletController.MINIMUM_SOL_LAMPORTS, usdcQuarks = 5_000_000L)
+
+        val result = controller.checkBalances(testPublicKey, requiredUsdcQuarks = 5_000_000L)
+
+        assertTrue(result.isSuccess, "Expected success at exact SOL threshold")
     }
 
     @Test
     fun `SOL just below threshold fails with InsufficientSol`() = runTest {
-        putControllerInConnectedState()
-        mockRpcResponses(solLamports = 6_499_999L, usdcQuarks = 100_000_000L)
+        mockRpcResponses(solLamports = PhantomWalletController.MINIMUM_SOL_LAMPORTS - 1, usdcQuarks = 100_000_000L)
 
-        controller.createAndValidateSwapTransaction()
+        val result = controller.checkBalances(testPublicKey, requiredUsdcQuarks = 10_000_000L)
 
-        val state = controller.state.value
-        assertTrue(state is ExternalWalletOnRampState.Failed)
-        assertTrue(state.error is DeeplinkOnRampError.InsufficientSol)
+        assertTrue(result.isFailure)
+        assertTrue(result.exceptionOrNull() is DeeplinkOnRampError.InsufficientSol)
     }
 
     @Test
     fun `USDC exactly matching required amount passes balance check`() = runTest {
-        putControllerInConnectedState(requiredQuarks = 10_000_000L)
         mockRpcResponses(solLamports = 10_000_000L, usdcQuarks = 10_000_000L)
 
-        controller.createAndValidateSwapTransaction()
+        val result = controller.checkBalances(testPublicKey, requiredUsdcQuarks = 10_000_000L)
 
-        val state = controller.state.value
-        if (state is ExternalWalletOnRampState.Failed) {
-            assertTrue(
-                state.error !is DeeplinkOnRampError.InsufficientSol &&
-                    state.error !is DeeplinkOnRampError.InsufficientUsdc,
-                "Should not fail with balance errors, got ${state.error}"
-            )
-        }
+        assertTrue(result.isSuccess, "Expected success with exact USDC amount")
     }
 
     @Test
     fun `USDC one quark below required fails with InsufficientUsdc`() = runTest {
-        putControllerInConnectedState(requiredQuarks = 10_000_000L)
         mockRpcResponses(solLamports = 10_000_000L, usdcQuarks = 9_999_999L)
 
-        controller.createAndValidateSwapTransaction()
+        val result = controller.checkBalances(testPublicKey, requiredUsdcQuarks = 10_000_000L)
 
-        val state = controller.state.value
-        assertTrue(state is ExternalWalletOnRampState.Failed)
-        assertTrue(state.error is DeeplinkOnRampError.InsufficientUsdc)
+        assertTrue(result.isFailure)
+        assertTrue(result.exceptionOrNull() is DeeplinkOnRampError.InsufficientUsdc)
     }
 
     companion object {
diff --git a/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletDeeplinkStateErrorTest.kt b/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletDeeplinkStateErrorTest.kt
index 8cf336b83..c73345428 100644
--- a/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletDeeplinkStateErrorTest.kt
+++ b/apps/flipcash/shared/onramp/deeplinks/src/test/kotlin/com/flipcash/app/onramp/internal/ExternalWalletDeeplinkStateErrorTest.kt
@@ -1,22 +1,18 @@
 package com.flipcash.app.onramp.internal
 
-import com.flipcash.app.core.AppRoute
 import com.flipcash.app.onramp.DeeplinkError
 import com.flipcash.app.onramp.DeeplinkOnRampError
-import com.flipcash.app.onramp.ExternalWalletOnRampController
-import com.flipcash.app.onramp.ExternalWalletOnRampState
+import com.flipcash.app.onramp.PhantomWalletController
 import com.flipcash.app.userflags.UserFlagsCoordinator
-import com.flipcash.services.internal.model.thirdparty.OnRampProvider
 import com.flipcash.services.user.UserManager
 import com.getcode.opencode.controllers.TransactionOperations
 import com.getcode.solana.rpc.RpcConfig
 import com.solana.networking.HttpNetworkDriver
-import dev.bmcreations.phantom.connect.WalletConnectorResult
-import dev.bmcreations.phantom.connect.WalletSignResult
+import dev.bmcreations.phantom.connect.ConnectResult
+import dev.bmcreations.phantom.connect.PhantomSdk
 import dev.bmcreations.phantom.connect.wallet.PhantomWalletConnector
 import dev.bmcreations.phantom.connect.wallet.PhantomWalletException
 import io.mockk.coEvery
-import io.mockk.coVerify
 import io.mockk.mockk
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
@@ -31,73 +27,67 @@ class ExternalWalletDeeplinkStateErrorTest {
     private val networkDriver = mockk<HttpNetworkDriver>(relaxed = true)
     private val rpcConfig = RpcConfig(networkDriver = networkDriver, rpcUrl = "https://localhost")
     private val userFlags = mockk<UserFlagsCoordinator>(relaxed = true)
+    private val phantomSdk = mockk<PhantomSdk>(relaxed = true)
     private val phantomConnector = mockk<PhantomWalletConnector>(relaxed = true)
 
-    private lateinit var controller: ExternalWalletOnRampController
+    private lateinit var controller: PhantomWalletController
 
     @Before
     fun setUp() {
-        controller = ExternalWalletOnRampController(
+        controller = PhantomWalletController(
             userManager = userManager,
             userFlags = userFlags,
             transactionController = transactionController,
             rpcConfig = rpcConfig,
+            phantomSdk = phantomSdk,
             phantomConnector = phantomConnector,
         )
     }
 
     @Test
-    fun `user cancellation during connect transitions to Failed with UserRejectedRequest`() = runTest {
-        coEvery { phantomConnector.connect() } returns WalletConnectorResult.Cancelled("User rejected the request")
+    fun `user cancellation during connect returns WalletProvidedError with UserRejectedRequest`() = runTest {
+        coEvery { phantomSdk.connect(phantomConnector) } returns ConnectResult.Cancelled("User rejected the request")
 
-        controller.start(AppRoute.Sheets.Menu, OnRampProvider.Phantom)
-        controller.connectAndSign(AppRoute.Sheets.Menu)
+        val result = controller.connectWallet()
 
-        val state = controller.state.value
-        assertTrue(state is ExternalWalletOnRampState.Failed, "Expected Failed state, got $state")
-        val error = state.error
+        assertTrue(result.isFailure, "Expected failure")
+        val error = result.exceptionOrNull()
         assertTrue(error is DeeplinkOnRampError.WalletProvidedError, "Expected WalletProvidedError, got $error")
         assertEquals(DeeplinkError.UserRejectedRequest, error.error)
     }
 
     @Test
     fun `PhantomWalletException during connect maps to WalletProvidedError`() = runTest {
-        coEvery { phantomConnector.connect() } returns WalletConnectorResult.Error(
+        coEvery { phantomSdk.connect(phantomConnector) } returns ConnectResult.Error(
             PhantomWalletException(4001, "User rejected the request")
         )
 
-        controller.start(AppRoute.Sheets.Menu, OnRampProvider.Phantom)
-        controller.connectAndSign(AppRoute.Sheets.Menu)
+        val result = controller.connectWallet()
 
-        val state = controller.state.value
-        assertTrue(state is ExternalWalletOnRampState.Failed, "Expected Failed state")
-        val error = state.error
+        assertTrue(result.isFailure, "Expected failure")
+        val error = result.exceptionOrNull()
         assertTrue(error is DeeplinkOnRampError.WalletProvidedError, "Expected WalletProvidedError")
         assertEquals(DeeplinkError.UserRejectedRequest, error.error)
     }
 
     @Test
     fun `generic error during connect maps to FailedToCreateTransaction`() = runTest {
-        coEvery { phantomConnector.connect() } returns WalletConnectorResult.Error(
+        coEvery { phantomSdk.connect(phantomConnector) } returns ConnectResult.Error(
             RuntimeException("Something broke")
         )
 
-        controller.start(AppRoute.Sheets.Menu, OnRampProvider.Phantom)
-        controller.connectAndSign(AppRoute.Sheets.Menu)
+        val result = controller.connectWallet()
 
-        val state = controller.state.value
-        assertTrue(state is ExternalWalletOnRampState.Failed, "Expected Failed state")
-        assertTrue(state.error is DeeplinkOnRampError.FailedToCreateTransaction, "Expected FailedToCreateTransaction")
+        assertTrue(result.isFailure, "Expected failure")
+        assertTrue(result.exceptionOrNull() is DeeplinkOnRampError.FailedToCreateTransaction, "Expected FailedToCreateTransaction")
     }
 
     @Test
-    fun `endCeremony is always called even on connect failure`() = runTest {
-        coEvery { phantomConnector.connect() } returns WalletConnectorResult.Cancelled("cancelled")
+    fun `successful connect returns success`() = runTest {
+        coEvery { phantomSdk.connect(phantomConnector) } returns ConnectResult.Success(mockk(relaxed = true))
 
-        controller.start(AppRoute.Sheets.Menu, OnRampProvider.Phantom)
-        controller.connectAndSign(AppRoute.Sheets.Menu)
+        val result = controller.connectWallet()
 
-        coVerify(exactly = 1) { phantomConnector.beginCeremony() }
-        coVerify(exactly = 1) { phantomConnector.endCeremony() }
+        assertTrue(result.isSuccess, "Expected success")
     }
 }
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
index 4e2e5d76f..57da86cca 100644
--- 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
@@ -7,20 +7,26 @@ import com.flipcash.app.analytics.Button
 import com.flipcash.app.analytics.FlipcashAnalyticsService
 import com.flipcash.app.core.extensions.onResult
 import com.flipcash.app.core.extensions.to
-import com.flipcash.app.core.money.formatted
 import com.flipcash.app.core.tokens.FundingSource
 import com.flipcash.app.core.tokens.SwapPurpose
 import com.flipcash.app.core.ui.CurrencyHolder
 import com.flipcash.app.onramp.CoinbaseOnRampController
 import com.flipcash.app.onramp.CoinbaseOnRampState
+import com.flipcash.app.onramp.DeeplinkError
+import com.flipcash.app.onramp.DeeplinkOnRampError
 import com.flipcash.app.onramp.OnRampAuthError
+import com.flipcash.app.onramp.PhantomWalletController
 import com.flipcash.app.onramp.PurchaseGate
+import com.flipcash.app.onramp.isAlert
+import com.flipcash.app.onramp.isNetworkCause
+import com.flipcash.app.onramp.messaging
 import com.getcode.manager.BottomBarAction
 import com.flipcash.app.payments.PurchaseMethod
 import com.flipcash.app.payments.PurchaseMethodController
 import com.flipcash.app.payments.PurchaseMethodMetadata
 import com.flipcash.app.tokens.TokenCoordinator
 import com.flipcash.libs.coroutines.DispatcherProvider
+import com.flipcash.services.internal.model.thirdparty.OnRampProvider
 import com.flipcash.services.user.UserManager
 import com.flipcash.shared.tokens.R
 import com.getcode.manager.BottomBarManager
@@ -29,7 +35,6 @@ import com.getcode.opencode.exchange.Exchange
 import com.getcode.opencode.exchange.VerifiedFiat
 import com.getcode.opencode.exchange.VerifiedFiatCalculator
 import com.getcode.opencode.internal.solana.model.SwapId
-import com.getcode.opencode.model.core.errors.ComputeVerifiedFiatError
 import com.getcode.opencode.model.core.errors.SwapError
 import com.getcode.opencode.model.financial.Currency
 import com.getcode.opencode.model.financial.CurrencyCode
@@ -50,23 +55,23 @@ import com.getcode.solana.keys.base58
 import com.getcode.ui.components.text.AmountAnimatedInputUiModel
 import com.getcode.ui.components.text.NumberInputHelper
 import com.getcode.util.resources.ResourceHelper
+import com.getcode.utils.TraceType
 import com.getcode.utils.trace
 import com.getcode.view.BaseViewModel2
 import com.getcode.view.LoadingSuccessState
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.filter
 import kotlinx.coroutines.flow.filterIsInstance
 import kotlinx.coroutines.flow.filterNot
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.flatMapLatest
-import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
+import java.util.concurrent.CancellationException
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
@@ -90,6 +95,7 @@ class SwapViewModel @Inject constructor(
     private val analytics: FlipcashAnalyticsService,
     private val purchaseMethodController: PurchaseMethodController,
     private val coinbaseOnRampController: CoinbaseOnRampController,
+    private val phantomWalletController: PhantomWalletController,
     dispatchers: DispatcherProvider,
 ) : BaseViewModel2<SwapViewModel.State, SwapViewModel.Event>(
     initialState = State(),
@@ -130,6 +136,7 @@ class SwapViewModel @Inject constructor(
                 is SwapPurpose.Buy -> amountEntryState.maxToAdd?.let {
                     Fiat(it.first, it.second).formatted()
                 }.orEmpty()
+
                 is SwapPurpose.Sell -> tokenBalance.formatted()
                 null -> ""
             }
@@ -154,8 +161,11 @@ class SwapViewModel @Inject constructor(
 
         val netTransferAmount: Fiat
             get() = confirmedNetTransferAmount ?: when (purpose) {
-               is SwapPurpose.BalanceIncrease -> enteredAmount
-               else -> Fiat(fiat = enteredAmount.decimalValue - feeAmount.decimalValue, currencyCode = enteredAmount.currencyCode)
+                is SwapPurpose.BalanceIncrease -> enteredAmount
+                else -> Fiat(
+                    fiat = enteredAmount.decimalValue - feeAmount.decimalValue,
+                    currencyCode = enteredAmount.currencyCode
+                )
             }
 
         val transactionLimit: Fiat
@@ -167,6 +177,7 @@ class SwapViewModel @Inject constructor(
                         } ?: SendLimit.Zero
                         sendLimit.maxPerDay.toFiat(enteredAmount.currencyCode)
                     }
+
                     is SwapPurpose.Sell -> tokenBalance
                     null -> Fiat.Zero
                 }
@@ -207,8 +218,8 @@ class SwapViewModel @Inject constructor(
 
         data class OnCurrencyChanged(val currency: Currency) : Event
 
-        data object CoinbaseSelected: Event
-        data object PhantomSelected: Event
+        data object CoinbaseSelected : Event
+        data object PhantomSelected : Event
         data object ConfirmPhantomTransaction : Event
         data object OnAmountConfirmed : Event
 
@@ -226,7 +237,13 @@ class SwapViewModel @Inject constructor(
 
         data class OnSwapIdChanged(val swapId: SwapId) : Event
 
-        data class CreateAndSendTransactionToWallet(val token: Token, val amount: VerifiedFiat) : Event
+        data object StartPhantomCeremony : Event
+        data object PhantomConnected : Event
+        data class PhantomNavigateToProcessing(val swapId: SwapId) : Event
+        data object PhantomCeremonyFailed : Event
+
+        data class CreateAndSendTransactionToWallet(val token: Token, val amount: VerifiedFiat) :
+            Event
 
         data class OnAmountAccepted(val amount: VerifiedFiat, val netTransferAmount: Fiat) : Event
 
@@ -243,6 +260,7 @@ class SwapViewModel @Inject constructor(
             val success: Boolean = false,
             val error: Boolean = false,
         ) : Event
+
         data object OnTransactionSuccessful : Event
 
         data class OnInitialAmountProvided(val amount: Fiat) : Event
@@ -328,7 +346,10 @@ class SwapViewModel @Inject constructor(
                     }
 
                     if (token == null) {
-                        trace(tag = "BuySellSwap", message = "Unable to find token for mint ${mint.base58()}")
+                        trace(
+                            tag = "BuySellSwap",
+                            message = "Unable to find token for mint ${mint.base58()}"
+                        )
                         dispatchEvent(Event.Exit)
                         return@combine null
                     }
@@ -513,7 +534,12 @@ class SwapViewModel @Inject constructor(
                             val netAmount = amountFiat.localFiat.nativeAmount
 
                             dispatchEvent(Event.UpdateBuyState(loading = true))
-                            dispatchEvent(Event.OnAmountAccepted(amountFiat, netTransferAmount = netAmount))
+                            dispatchEvent(
+                                Event.OnAmountAccepted(
+                                    amountFiat,
+                                    netTransferAmount = netAmount
+                                )
+                            )
                             dispatchEvent(Event.ProceedWithPurchase(amountFiat))
                         } else {
                             // Insufficient reserves — check available purchase methods
@@ -549,7 +575,12 @@ class SwapViewModel @Inject constructor(
                         }
                         val netAmount = stateFlow.value.netTransferAmount
 
-                        dispatchEvent(Event.OnAmountAccepted(amountFiat, netTransferAmount = netAmount))
+                        dispatchEvent(
+                            Event.OnAmountAccepted(
+                                amountFiat,
+                                netTransferAmount = netAmount
+                            )
+                        )
                         dispatchEvent(Event.ShowSellReceipt)
                     }
                 }
@@ -558,29 +589,44 @@ class SwapViewModel @Inject constructor(
         eventFlow
             .filterIsInstance<Event.ConfirmPhantomTransaction>()
             .onEach {
-                val data = stateFlow.value.amountEntryState.amountAnimatedModel
-                val rate = exchange.rateForUsd()
-                val amountFiat = verifiedFiatCalculator.compute(
-                    amount = Fiat(data.amountData.amount, rate.currency),
-                    token = Token.usdf,
-                    rate = rate,
-                ).getOrElse {
-                    BottomBarManager.showAlert(
-                        title = resources.getString(R.string.error_title_staleRates),
-                        message = resources.getString(R.string.error_description_staleRates),
+                try {
+                    val data = stateFlow.value.amountEntryState.amountAnimatedModel
+                    val rate = exchange.rateForUsd()
+                    val amountFiat = verifiedFiatCalculator.compute(
+                        amount = Fiat(data.amountData.amount, rate.currency),
+                        token = Token.usdf,
+                        rate = rate,
+                    ).getOrElse {
+                        BottomBarManager.showAlert(
+                            title = resources.getString(R.string.error_title_staleRates),
+                            message = resources.getString(R.string.error_description_staleRates),
+                        )
+                        return@onEach
+                    }
+                    dispatchEvent(
+                        Event.OnAmountAccepted(
+                            amountFiat,
+                            netTransferAmount = amountFiat.localFiat.nativeAmount
+                        )
                     )
-                    return@onEach
+                    dispatchEvent(Event.UpdateBuyState(loading = true))
+                    val token = stateFlow.value.tokenWithBalance?.token ?: run {
+                        handlePhantomError(IllegalStateException("Token not available"))
+                        return@onEach
+                    }
+                    signAndSendPhantomTransaction(token, amountFiat)
+                } catch (e: CancellationException) {
+                    throw e
+                } catch (e: Exception) {
+                    handlePhantomError(e)
                 }
-                dispatchEvent(Event.OnAmountAccepted(amountFiat, netTransferAmount = amountFiat.localFiat.nativeAmount))
-                dispatchEvent(Event.UpdateBuyState(loading = true))
-                dispatchEvent(
-                    Event.CreateAndSendTransactionToWallet(
-                        token = stateFlow.value.tokenWithBalance!!.token,
-                        amount = amountFiat
-                    )
-                )
             }.launchIn(viewModelScope)
 
+        eventFlow
+            .filterIsInstance<Event.StartPhantomCeremony>()
+            .onEach { connectPhantomWallet() }
+            .launchIn(viewModelScope)
+
         eventFlow
             .filterIsInstance<Event.OnSellConfirmed>()
             .map { stateFlow.value.amountEntryState.selectedAmount }
@@ -606,6 +652,7 @@ class SwapViewModel @Inject constructor(
                     of = token,
                 ).onSuccess { swapId ->
                     trackTransaction(token)
+                    dispatchEvent(Event.OnSwapIdChanged(swapId))
                     dispatchEvent(Event.OnPurchaseSubmitted(token, swapId))
                     dispatchEvent(Event.UpdateBuyState(loading = false, success = true))
                     // buy submitted from reserves, drop reserves balance
@@ -647,7 +694,8 @@ class SwapViewModel @Inject constructor(
 
                 // underlyingTokenAmount.quarks are token quarks, not USD —
                 // convert back through the bonding curve for an apples-to-apples comparison.
-                val amountInUsd = Fiat.tokenBalance(amount.localFiat.underlyingTokenAmount.quarks, token)
+                val amountInUsd =
+                    Fiat.tokenBalance(amount.localFiat.underlyingTokenAmount.quarks, token)
                 val refreshedBalance = tokenCoordinator.balanceForToken(token)
                 if (amountInUsd > refreshedBalance) {
                     dispatchEvent(Event.UpdateSellState(loading = false))
@@ -664,6 +712,7 @@ class SwapViewModel @Inject constructor(
                     of = token,
                 ).onSuccess { swapId ->
                     trackTransaction(token)
+                    dispatchEvent(Event.OnSwapIdChanged(swapId))
                     dispatchEvent(Event.OnSellSubmitted(token, swapId))
                     dispatchEvent(Event.UpdateSellState(loading = false, success = true))
                     // sell submitted, drop from balance
@@ -687,12 +736,11 @@ class SwapViewModel @Inject constructor(
                 }
             }.launchIn(viewModelScope)
 
-        stateFlow
-            .mapNotNull { it.swapId }
-            .distinctUntilChanged()
-            .mapNotNull { swapId ->
+        eventFlow
+            .filterIsInstance<Event.OnSwapIdChanged>()
+            .mapNotNull { event ->
                 val owner = userManager.accountCluster ?: return@mapNotNull null
-                owner to swapId
+                owner to event.swapId
             }
             .map { (owner, swapId) ->
                 dispatchEvent(Event.UpdateProcessingState(loading = true))
@@ -717,7 +765,13 @@ class SwapViewModel @Inject constructor(
                     dispatchEvent(Event.UpdateProcessingState(loading = false, success = true))
                 },
                 onError = {
-                    dispatchEvent(Event.UpdateProcessingState(loading = false, success = false, error = true))
+                    dispatchEvent(
+                        Event.UpdateProcessingState(
+                            loading = false,
+                            success = false,
+                            error = true
+                        )
+                    )
                 }
             ).launchIn(viewModelScope)
 
@@ -728,6 +782,7 @@ class SwapViewModel @Inject constructor(
                 when (s) {
                     is CoinbaseOnRampState.Failed,
                     CoinbaseOnRampState.Idle -> dispatchEvent(Event.UpdateBuyState())
+
                     is CoinbaseOnRampState.Completed,
                     is CoinbaseOnRampState.Paying -> Unit
                 }
@@ -767,9 +822,11 @@ class SwapViewModel @Inject constructor(
 
                         executeCoinbasePurchase(amountFiat, token)
                     }
+
                     is PurchaseMethod.CashReserves -> {
                         dispatchEvent(Event.OnAmountConfirmed)
                     }
+
                     PurchaseMethod.PhantomWallet -> {
                         analytics.buttonTapped(Button.TokenBuyWithPhantom)
                         dispatchEvent(Event.PhantomSelected)
@@ -798,12 +855,14 @@ class SwapViewModel @Inject constructor(
                                 message = resources.getString(R.string.error_description_onrampGooglePayNotSupported),
                             )
                         }
+
                         is PurchaseGate.GooglePayNoPaymentMethod -> {
                             BottomBarManager.showAlert(
                                 title = resources.getString(R.string.error_title_onrampGooglePayNotReady),
                                 message = resources.getString(R.string.error_description_onrampGooglePayNotReady),
                             )
                         }
+
                         is PurchaseGate.WebViewWarning -> {
                             BottomBarManager.showAlert(
                                 title = resources.getString(R.string.error_title_onrampNonStableWebView),
@@ -869,6 +928,7 @@ class SwapViewModel @Inject constructor(
                 FundingSource.Coinbase -> Analytics.SwapMethod.Buy.Coinbase
                 else -> Analytics.SwapMethod.Buy.Reserves
             }
+
             else -> Analytics.SwapMethod.Sell
         }
 
@@ -881,6 +941,7 @@ class SwapViewModel @Inject constructor(
                     error = error
                 )
             }
+
             is Analytics.SwapMethod.Buy -> {
                 analytics.buy(
                     method = method.with,
@@ -892,6 +953,102 @@ class SwapViewModel @Inject constructor(
         }
     }
 
+    private fun connectPhantomWallet() {
+        viewModelScope.launch {
+            dispatchEvent(Event.UpdateBuyState(loading = true))
+            phantomWalletController
+                .connectWallet()
+                .onSuccess {
+                    dispatchEvent(Event.UpdateBuyState(success = true))
+                    dispatchEvent(Event.PhantomConnected)
+                    dispatchEvent(Event.UpdateBuyState())
+                    analytics.connectWallet(OnRampProvider.Phantom)
+                }.onFailure {
+                    dispatchEvent(Event.UpdateBuyState())
+                    handlePhantomError(it)
+                }
+        }
+    }
+
+    private fun signAndSendPhantomTransaction(
+        token: Token,
+        amount: VerifiedFiat,
+    ) {
+        viewModelScope.launch {
+            phantomWalletController.executeSwap(
+                amount = amount,
+                fee = LocalFiat.Zero,
+                token = token,
+                onBeforeSign = { swapId ->
+                    analytics.amountSelectedForWalletTransfer(
+                        OnRampProvider.Phantom,
+                        amount.localFiat.underlyingTokenAmount
+                    )
+                    dispatchEvent(Event.PhantomNavigateToProcessing(swapId))
+                },
+            ).onSuccess { swapId ->
+                dispatchEvent(Event.OnSwapIdChanged(swapId))
+            }.onFailure { error ->
+                handlePhantomError(error)
+            }
+        }
+    }
+
+    private fun handlePhantomError(error: Throwable) {
+        val deeplinkError = error as? DeeplinkOnRampError
+            ?: DeeplinkOnRampError.FailedToCreateTransaction(message = error.message, cause = error)
+
+        if (deeplinkError is DeeplinkOnRampError.WalletProvidedError && deeplinkError.code == DeeplinkError.UserRejectedRequest.code) {
+            analytics.walletTransactionCancelled(OnRampProvider.Phantom)
+        } else if (deeplinkError is DeeplinkOnRampError.FailedToSendTransaction) {
+            analytics.walletTransactionFailed(OnRampProvider.Phantom)
+        }
+
+        trace(
+            tag = "BuySellSwap",
+            message = "Something went wrong during phantom onramp",
+            type = TraceType.Error,
+            metadata = {
+                "errorMessage" to deeplinkError.message
+                "code" to deeplinkError.code
+            },
+            error = deeplinkError.takeUnless { it.isAlert }
+        )
+
+        val (title, message) = deeplinkError.messaging(
+            resources::getString,
+            resources.getString(R.string.label_phantom)
+        )
+
+        when {
+            deeplinkError.isNetworkCause -> {
+                BottomBarManager.showAlert(
+                    title = resources.getString(R.string.error_title_noInternet),
+                    message = resources.getString(R.string.error_description_noInternet),
+                    onDismiss = { dispatchEvent(Event.PhantomCeremonyFailed) }
+                )
+            }
+
+            deeplinkError.isAlert -> {
+                BottomBarManager.showAlert(
+                    title = title,
+                    message = message,
+                    onDismiss = { dispatchEvent(Event.PhantomCeremonyFailed) }
+                )
+            }
+
+            else -> {
+                BottomBarManager.showError(
+                    title = title,
+                    message = message,
+                    onDismiss = { dispatchEvent(Event.PhantomCeremonyFailed) }
+                )
+            }
+        }
+
+        dispatchEvent(Event.UpdateBuyState())
+    }
+
     override fun onCleared() {
         exchange.resetEntryToBalance()
     }
@@ -1010,6 +1167,10 @@ class SwapViewModel @Inject constructor(
                 }
 
                 Event.ConfirmPhantomTransaction,
+                Event.StartPhantomCeremony,
+                Event.PhantomConnected,
+                is Event.PhantomNavigateToProcessing,
+                Event.PhantomCeremonyFailed,
                 Event.OnAmountConfirmed,
                 Event.OnBackspace,
                 Event.OnDecimalPressed,
@@ -1060,9 +1221,11 @@ class SwapViewModel @Inject constructor(
                 is Event.OnInitialAmountProvided -> { state ->
                     state.copy(minimumBuyAmount = event.amount, pendingInitialAmount = event.amount)
                 }
+
                 Event.OnInitialAmountEntered -> { state ->
                     state.copy(pendingInitialAmount = null)
                 }
+
                 is Event.OnVerificationNeeded -> { state -> state }
                 Event.Exit -> { state -> state }
             }
diff --git a/buildSrc/src/main/java/Android.kt b/buildSrc/src/main/java/Android.kt
index 56c3ede4c..e9bc430a4 100644
--- a/buildSrc/src/main/java/Android.kt
+++ b/buildSrc/src/main/java/Android.kt
@@ -1,7 +1,7 @@
 object Android {
     const val javaVersion = "21"
-    const val compileSdkVersion = 36
+    const val compileSdkVersion = 37
     const val minSdkVersion = 29 // Android 10+
-    const val targetSdkVersion = 36
+    const val targetSdkVersion = 37
     const val testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 9e29e511f..edfe2fd10 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -89,7 +89,7 @@ bugsnag-gradle-plugin = "1.1.0"
 rinku = "1.6.0"
 haze = "1.7.2"
 cloudy = "0.5.0"
-phantom-connect-kmp = "2.0.2"
+phantom-connect-kmp = "2.0.2-1.0.0"
 vico = "2.4.1"
 
 androidxTestRules = "1.7.0"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e1f0f9aa7..f3672d5e2 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,8 @@
+#Fri May 15 15:35:47 EDT 2026
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.0-bin.zip
+distributionSha256Sum=2ab2958f2a1e51120c326cad6f385153bb11ee93b3c216c5fccebfdfbb7ec6cb
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists