Merge branch 'code/cash' into feat/buy-options-cache

Author: bmc08gt

.well-known/release-manifest.json

@@ -1,5 +1,5 @@
 {
-  "updated": "2026-06-12T16:11:14Z",
+  "updated": "2026-06-13T22:45:37Z",
   "tracks": {
     "production": {
       "versionCode": 3740,
@@ -8,7 +8,7 @@
     "beta": null,
     "alpha": null,
     "internal": {
-      "versionCode": 3861,
+      "versionCode": 3872,
       "versionName": "2026.6.1"
     }
   }

apps/flipcash/app/src/main/AndroidManifest.xml

@@ -162,6 +162,18 @@
                     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="/chat/.*"
+                    android:scheme="https" />
+            </intent-filter>
+
 
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />

apps/flipcash/app/src/main/kotlin/com/flipcash/app/internal/ui/navigation/AppScreenContent.kt

@@ -31,7 +31,7 @@ import com.flipcash.app.currency.RegionSelectionScreen
 import com.flipcash.app.deposit.DepositFlowScreen
 import com.flipcash.app.directsend.SendFlowScreen
 import com.flipcash.app.invite.InviteContactScreen
-import com.flipcash.app.messenger.MessengerScreen
+import com.flipcash.app.messenger.ChatFlowScreen
 import com.flipcash.app.messenger.ChatAmountEntryScreen
 import com.flipcash.app.discovery.TokenDiscoveryScreen
 import com.flipcash.app.internal.ui.navigation.decorators.rememberNavMessagingEntryDecorator
@@ -96,10 +96,10 @@ fun appEntryProvider(
 
     // Messaging
     annotatedEntry<AppRoute.Messaging.Chat> { key ->
-        MessengerScreen(key.e164, key.displayName)
+        ChatFlowScreen(route = key, resultStateRegistry = resultStateRegistry)
     }
     annotatedEntry<AppRoute.Messaging.AmountEntry> { key ->
-        ChatAmountEntryScreen(key.e164, key.displayName)
+        ChatAmountEntryScreen(key.identifier)
     }
 
     // Tokens

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/AppRoute.kt

@@ -2,6 +2,7 @@ package com.flipcash.app.core
 
 import android.os.Parcelable
 import androidx.navigation3.runtime.NavKey
+import com.flipcash.app.core.chat.ChatIdentifier
 import com.flipcash.app.core.deposit.DepositResult
 import com.flipcash.app.core.deposit.DepositStep
 import com.flipcash.app.core.tokens.CurrencyCreatorResult
@@ -14,6 +15,7 @@ import com.flipcash.app.core.verification.VerificationResult
 import com.flipcash.app.core.verification.VerificationStep
 import com.flipcash.app.core.withdrawal.WithdrawalResult
 import com.flipcash.app.core.withdrawal.WithdrawalStep
+import com.flipcash.app.core.chat.ChatStep
 import com.flipcash.app.core.onboarding.OnboardingStep
 import com.getcode.navigation.flow.FlowRoute
 import com.getcode.navigation.flow.FlowRouteWithResult
@@ -240,16 +242,13 @@ sealed interface AppRoute : NavKey, Parcelable {
     @Parcelize
     sealed interface Messaging : AppRoute {
         @Serializable
-        data class Chat(
-            val e164: String,
-            val displayName: String,
-        ) : Messaging
+        data class Chat(val identifier: ChatIdentifier) : Messaging, FlowRoute {
+            override val initialStack: List<NavKey>
+                get() = listOf(ChatStep.Conversation)
+        }
 
         @Serializable
-        data class AmountEntry(
-            val e164: String,
-            val displayName: String,
-        ) : Messaging
+        data class AmountEntry(val identifier: ChatIdentifier) : Messaging
     }
 
     @Serializable

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/chat/ChatIdentifier.kt

@@ -0,0 +1,24 @@
+package com.flipcash.app.core.chat
+
+import android.os.Parcelable
+import com.flipcash.services.models.chat.ChatId
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+
+@Serializable
+@Parcelize
+sealed interface ChatIdentifier : Parcelable {
+    val key: String
+
+    @Serializable
+    @Parcelize
+    data class ByChatId(val chatId: ChatId) : ChatIdentifier {
+        override val key: String get() = chatId.toString()
+    }
+
+    @Serializable
+    @Parcelize
+    data class ByContact(val e164: String, val displayName: String, val chatId: ChatId? = null) : ChatIdentifier {
+        override val key: String get() = e164
+    }
+}

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/chat/ChatStep.kt

@@ -0,0 +1,17 @@
+package com.flipcash.app.core.chat
+
+import android.os.Parcelable
+import com.getcode.navigation.flow.FlowStep
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+
+@Serializable
+sealed interface ChatStep : FlowStep, Parcelable {
+    @Parcelize
+    @Serializable
+    data object Conversation : ChatStep
+
+    @Parcelize
+    @Serializable
+    data object AmountEntry : ChatStep
+}

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/feed/ActivityFeedMessage.kt

@@ -28,7 +28,7 @@ data class ActivityFeedMessage(
         get() {
             metadata ?: return false
             val metadata =
-                (metadata as? MessageMetadata.SentCrypto) ?: return false
+                (metadata as? MessageMetadata.IndirectlySentCrypto) ?: return false
             return metadata.canCancel
         }
 }
@@ -53,16 +53,20 @@ sealed interface MessageMetadata {
     data object Unknown : MessageMetadata
 
     @Serializable
-    data object GaveCrypto : MessageMetadata
+    data class DirectlySentCrypto(
+        val phoneNumber: String? = null,
+    ) : MessageMetadata
 
     @Serializable
-    data class SentCrypto(
+    data class IndirectlySentCrypto(
         val creator: PublicKey,
         val canCancel: Boolean,
     ) : MessageMetadata
 
     @Serializable
-    data object ReceivedCrypto : MessageMetadata
+    data class ReceivedCrypto(
+        val phoneNumber: String? = null,
+    ) : MessageMetadata
 
     @Serializable
     data object WithdrewCrypto : MessageMetadata

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/navigation/DeeplinkType.kt

@@ -2,6 +2,7 @@ package com.flipcash.app.core.navigation
 
 import android.net.Uri
 import android.os.Parcelable
+import com.flipcash.services.models.chat.ChatId
 import com.getcode.solana.keys.Mint
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
@@ -15,6 +16,8 @@ sealed interface DeeplinkType: Parcelable {
 
     @Serializable data class TokenInfo(val mint: Mint): DeeplinkType, Navigatable
 
+    @Serializable data class Chat(val chatId: ChatId): DeeplinkType, Navigatable
+
     @Serializable
     data class EmailVerification(
         val email: String,

apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/util/Linkify.kt

@@ -1,8 +1,10 @@
 package com.flipcash.app.core.util
 
+import com.flipcash.services.models.chat.ChatId
 import com.getcode.opencode.model.financial.Token
 import com.getcode.solana.keys.Mint
 import com.getcode.solana.keys.base58
+import com.getcode.utils.encodeBase64
 import com.getcode.utils.urlEncode
 
 object Linkify {
@@ -13,4 +15,5 @@ object Linkify {
     fun tweet(message: String): String = "https://www.twitter.com/intent/tweet?text=${message.urlEncode()}"
     fun tokenInfo(token: Token): String = tokenInfo(token.address)
     fun tokenInfo(mint: Mint): String = "https://app.flipcash.com/token/${mint.base58()}"
+    fun chat(chatId: ChatId): String = "https://app.flipcash.com/chat/${chatId.bytes.encodeBase64(urlSafe = true)}"
 }

apps/flipcash/core/src/test/kotlin/com/flipcash/app/core/feed/ActivityFeedMessageTest.kt

@@ -58,17 +58,17 @@ class ActivityFeedMessageTest {
     }
 
     @Test
-    fun metadataFromGaveCrypto() {
-        val json = """{"type":"com.flipcash.app.core.feed.MessageMetadata.GaveCrypto"}"""
+    fun metadataFromDirectlySentCrypto() {
+        val json = """{"type":"com.flipcash.app.core.feed.MessageMetadata.DirectlySentCrypto"}"""
         val result = MessageMetadata.from(json)
-        assertEquals(MessageMetadata.GaveCrypto, result)
+        assertEquals(MessageMetadata.DirectlySentCrypto(), result)
     }
 
     @Test
     fun metadataFromReceivedCrypto() {
         val json = """{"type":"com.flipcash.app.core.feed.MessageMetadata.ReceivedCrypto"}"""
         val result = MessageMetadata.from(json)
-        assertEquals(MessageMetadata.ReceivedCrypto, result)
+        assertEquals(MessageMetadata.ReceivedCrypto(), result)
     }
 
     @Test