feat: add rich push support

bmc08gt · bmc08gt · commit 242fe9e68a5a · 2026-02-04T15:27:50.000-05:00
Signed-off-by: Brandon McAnsh &lt;git@bmcreations.dev&gt;
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/feed/ActivityFeedMessage.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/feed/ActivityFeedMessage.kt
@@ -73,6 +73,12 @@ sealed interface MessageMetadata {
     @Serializable
     data object DepositedCrypto : MessageMetadata
 
+    @Serializable
+    data object BoughtToken: MessageMetadata
+
+    @Serializable
+    data object SoldToken: MessageMetadata
+
     @Serializable
     data class PaidCrypto(
         val poolId: ID,
diff --git a/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/util/Linkify.kt b/apps/flipcash/core/src/main/kotlin/com/flipcash/app/core/util/Linkify.kt
@@ -1,12 +1,14 @@
 package com.flipcash.app.core.util
 
 import com.getcode.opencode.model.financial.Token
+import com.getcode.solana.keys.Mint
 import com.getcode.solana.keys.base58
 import com.getcode.utils.urlEncode
 
 object Linkify {
     fun cashLink(entropy: String): String = "https://send.flipcash.com/c/#/e=${entropy}"
     fun download(shareRef: String): String = "https://flipcash.com/download?r=${shareRef}"
     fun tweet(message: String): String = "https://www.twitter.com/intent/tweet?text=${message.urlEncode()}"
-    fun tokenInfo(token: Token): String = "https://app.flipcash.com/token/${token.address.base58()}"
+    fun tokenInfo(token: Token): String = tokenInfo(token.address)
+    fun tokenInfo(mint: Mint): String = "https://app.flipcash.com/token/${mint.base58()}"
 }
diff --git a/apps/flipcash/shared/notifications/src/main/kotlin/com/flipcash/app/notifications/NotificationService.kt b/apps/flipcash/shared/notifications/src/main/kotlin/com/flipcash/app/notifications/NotificationService.kt
@@ -14,8 +14,12 @@ import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationChannelCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import androidx.core.net.toUri
 import com.flipcash.app.auth.AuthManager
+import com.flipcash.app.core.util.Linkify
 import com.flipcash.services.controllers.PushController
+import com.flipcash.services.models.NavigationTrigger
+import com.flipcash.services.models.NotificationPayload
 import com.flipcash.services.user.UserManager
 import com.flipcash.shared.notifications.R
 import com.getcode.opencode.controllers.TokenController
@@ -31,7 +35,8 @@ import java.security.SecureRandom
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class NotificationService: FirebaseMessagingService(), CoroutineScope by CoroutineScope(Dispatchers.IO) {
+class NotificationService : FirebaseMessagingService(),
+    CoroutineScope by CoroutineScope(Dispatchers.IO) {
 
     @Inject
     lateinit var authManager: AuthManager
@@ -65,40 +70,57 @@ class NotificationService: FirebaseMessagingService(), CoroutineScope by Corouti
 
     override fun onMessageReceived(message: RemoteMessage) {
         super.onMessageReceived(message)
-        message.notification?.let { notification ->
-            // dump everything into FCM fallback channel for now
-            val channel = NotificationChannelCompat.Builder(
-                "fcm_fallback_notification_channel",
-                NotificationManagerCompat.IMPORTANCE_DEFAULT
-            ).setName("Misc.").build()
-
-            notificationManager.createNotificationChannel(channel)
-
-            val notificationBuilder: NotificationCompat.Builder =
-                NotificationCompat.Builder(this, channel.id)
-                    .setPriority(NotificationCompat.PRIORITY_HIGH)
-                    .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
-                    .setSmallIcon(R.drawable.flipcash_logo)
-                    .setColor(getColor(R.color.notification_color))
-                    .setAutoCancel(true)
-                    .setContentTitle(notification.title)
-                    .setContentText(notification.body)
-                    .setContentIntent(buildContentIntent())
-
-            val random = SecureRandom()
-            val notificationId = random.nextInt(256)
 
-            launch {
-                tokenController.update()
+        // dump everything into FCM fallback channel for now
+        val channel = NotificationChannelCompat.Builder(
+            "fcm_fallback_notification_channel",
+            NotificationManagerCompat.IMPORTANCE_DEFAULT
+        ).setName("Misc.").build()
+
+        val title = message.data["push_notification_title"]?.ifEmpty { message.notification?.title }
+        val body = message.data["push_notification_body"]?.ifEmpty { message.notification?.body }
+
+        trace(
+            message = "onMessageReceived",
+            type = TraceType.Process,
+            metadata = {
+                "title" to title
+                "body" to body
             }
+        )
 
-            if (ActivityCompat.checkSelfPermission(
-                    this,
-                    Manifest.permission.POST_NOTIFICATIONS
-                ) == PackageManager.PERMISSION_GRANTED
-            ) {
-                notificationManager.notify(notificationId, notificationBuilder.build())
+        if (title == null) {
+            return
+        }
+
+        val payload = message.data.getOrDefault("flipcash_payload", "")
+            .takeIf { it.isNotEmpty() }
+            ?.let { protoString ->
+                NotificationPayload.fromEncoded(protoString)
             }
+
+        notificationManager.createNotificationChannel(channel)
+
+        val notificationBuilder: NotificationCompat.Builder =
+            NotificationCompat.Builder(this, channel.id)
+                .setPriority(NotificationCompat.PRIORITY_HIGH)
+                .setSound(RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION))
+                .setSmallIcon(R.drawable.flipcash_logo)
+                .setColor(getColor(R.color.notification_color))
+                .setAutoCancel(true)
+                .setContentTitle(title)
+                .setContentText(body)
+                .setContentIntent(buildContentIntent(payload?.navigation))
+
+        val random = SecureRandom()
+        val notificationId = random.nextInt(256)
+
+        if (ActivityCompat.checkSelfPermission(
+                this,
+                Manifest.permission.POST_NOTIFICATIONS
+            ) == PackageManager.PERMISSION_GRANTED
+        ) {
+            notificationManager.notify(notificationId, notificationBuilder.build())
         }
     }
 
@@ -110,11 +132,19 @@ class NotificationService: FirebaseMessagingService(), CoroutineScope by Corouti
         }
     }
 
-    internal fun Context.buildContentIntent(): PendingIntent {
+    internal fun Context.buildContentIntent(navigation: NavigationTrigger?): PendingIntent {
+        val target = when (navigation) {
+            is NavigationTrigger.CurrencyInfo -> Intent(Intent.ACTION_VIEW).apply {
+                data = Linkify.tokenInfo(navigation.mint).toUri()
+            }
+
+            else -> packageManager.getLaunchIntentForPackage(packageName)
+        }
+
         return PendingIntent.getActivity(
             this,
             99,
-            packageManager.getLaunchIntentForPackage(packageName),
+            target,
             PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
         )
     }
diff --git a/apps/flipcash/shared/persistence/sources/src/main/kotlin/com/flipcash/app/persistence/sources/mapper/notifications/NotificationToEntityMapper.kt b/apps/flipcash/shared/persistence/sources/src/main/kotlin/com/flipcash/app/persistence/sources/mapper/notifications/NotificationToEntityMapper.kt
@@ -62,6 +62,8 @@ class MetadataMapper @Inject constructor(): Mapper<NotificationMetadata?, Messag
             NotificationMetadata.WelcomeBonus -> MessageMetadata.WelcomeBonus
             NotificationMetadata.WithdrewCrypto -> MessageMetadata.WithdrewCrypto
             NotificationMetadata.DepositedCrypto -> MessageMetadata.DepositedCrypto
+            NotificationMetadata.BoughtToken -> MessageMetadata.BoughtToken
+            NotificationMetadata.SoldToken -> MessageMetadata.SoldToken
         }
     }
 }
diff --git a/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt b/apps/flipcash/shared/session/src/main/kotlin/com/flipcash/app/session/internal/RealSessionController.kt
@@ -81,6 +81,29 @@ import kotlin.time.Clock
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
 
+/**
+ * This class is the central orchestrator for the application's session, managing the user's
+ * interaction flow, data synchronization, and state transitions. It integrates various
+ * controllers and services to provide a cohesive user experience.
+ *
+ * Key Responsibilities:
+ * - **State Management**: Maintains and exposes the overall session state ([SessionState]) and bill state
+ *   ([BillState]), reacting to changes in authentication, network connectivity, and app lifecycle.
+ * - **Lifecycle Events**: Handles `onAppInForeground` and `onAppInBackground` events to start/stop
+ *   data polling (balances, activity feed), connect/disconnect services, and manage UI state.
+ * - **Transaction Flow**:
+ *   - **Scanning**: Processes scanned QR codes ([onCodeScan]) to initiate cash grabs.
+ *   - **Cash Links**: Manages the creation ([shareGiftCard]) and claiming ([openCashLink]) of cash links.
+ *   - **Bill Presentation**: Coordinates with [BillController] to display bills for sending or
+ *     receiving cash ([showBill], [presentBillToUser]).
+ * - **Data Synchronization**: Uses updaters ([TokenUpdater], [ActivityFeedUpdater], [ProfileUpdater])
+ *   to keep local data fresh.
+ * - **User Interaction**: Manages UI feedback like toasts ([ToastController]), vibrations ([Vibrator]),
+ *   and bottom bar messages ([BottomBarManager]). It also handles interactions with the native
+ *   share sheet ([ShareSheetController]).
+ * - **Feature & Settings Integration**: Responds to changes in feature flags and app settings,
+ *   such as `VibrateOnScan` and `CameraStartByDefault`.
+ */
 class RealSessionController @Inject constructor(
     private val billController: BillController,
     private val userManager: UserManager,
diff --git a/definitions/flipcash/protos/src/main/proto/activity/v1/model.proto b/definitions/flipcash/protos/src/main/proto/activity/v1/model.proto
@@ -30,6 +30,8 @@ message Notification {
         WithdrewCryptoNotificationMetadata    withdrew_crypto    = 9;
         SentCryptoNotificationMetadata        sent_crypto        = 10;
         DepositedCryptoNotificationMetadata   deposited_crypto   = 11;
+        BoughtCryptoNotificationMetadata      bought_crypto      = 12;
+        SoldCryptoNotificationMetadata        sold_crypto        = 13;
     }
 }
 message WelcomeBonusNotificationMetadata {
@@ -48,6 +50,10 @@ message SentCryptoNotificationMetadata {
 }
 message DepositedCryptoNotificationMetadata {
 }
+message BoughtCryptoNotificationMetadata {
+}
+message SoldCryptoNotificationMetadata {
+}
 // ActivityFeedType enables multiple activity feeds, where notifications may be
 // split across different parts of the app
 enum ActivityFeedType {
diff --git a/definitions/flipcash/protos/src/main/proto/push/v1/model.proto b/definitions/flipcash/protos/src/main/proto/push/v1/model.proto
@@ -0,0 +1,26 @@
+syntax = "proto3";
+package flipcash.push.v1;
+option go_package = "github.com/code-payments/flipcash2-protobuf-api/generated/go/push/v1;pushpb";
+option java_package = "com.codeinc.flipcash.gen.push.v1";
+option objc_class_prefix = "FPBPushV1";
+import "common/v1/common.proto";
+
+enum TokenType {
+    UNKNOWN = 0;
+    // FCM registration token for an Android device
+    FCM_ANDROID = 1;
+    // FCM registration token or an iOS device
+    FCM_APNS = 2;
+}
+// Payload provided as extra data in a push
+message Payload {
+    // If present, where the app should navigate to after clicking the push
+    Navigation navigation = 1;
+}
+// Navigation within the app upon clicking the push
+message Navigation {
+    oneof type {
+        // Currency info page for the provided mint 
+        common.v1.PublicKey currency_info = 1;
+    }
+}
diff --git a/definitions/flipcash/protos/src/main/proto/push/v1/push_service.proto b/definitions/flipcash/protos/src/main/proto/push/v1/push_service.proto
@@ -4,20 +4,14 @@ option go_package = "github.com/code-payments/flipcash2-protobuf-api/generated/g
 option java_package = "com.codeinc.flipcash.gen.push.v1";
 option objc_class_prefix = "FPBPushV1";
 import "common/v1/common.proto";
+import "push/v1/model.proto";
 
 service Push {
     // AddToken adds a push token associated with a user.
     rpc AddToken(AddTokenRequest) returns (AddTokenResponse);
     // DeleteTokens removes all push tokens within an app install for a user
     rpc DeleteTokens(DeleteTokensRequest) returns (DeleteTokensResponse);
 }
-enum TokenType {
-    UNKNOWN = 0;
-    // FCM registration token for an Android device
-    FCM_ANDROID = 1;
-    // FCM registration token or an iOS device
-    FCM_APNS = 2;
-}
 message AddTokenRequest {
     TokenType token_type = 1;
     string push_token = 2 ;
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/ActivityFeedMessageMapper.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/domain/ActivityFeedMessageMapper.kt
@@ -69,6 +69,8 @@ internal class ActivityFeedMessageMapper @Inject constructor(
                     canCancel = from.sentCrypto.canInitiateCancelAction
                 )
                 Model.Notification.AdditionalMetadataCase.DEPOSITED_CRYPTO -> NotificationMetadata.DepositedCrypto
+                Model.Notification.AdditionalMetadataCase.BOUGHT_CRYPTO -> NotificationMetadata.BoughtToken
+                Model.Notification.AdditionalMetadataCase.SOLD_CRYPTO -> NotificationMetadata.SoldToken
                 Model.Notification.AdditionalMetadataCase.ADDITIONALMETADATA_NOT_SET,
                 null -> NotificationMetadata.Unknown
             }
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/api/PushApi.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/api/PushApi.kt
@@ -1,6 +1,7 @@
 package com.flipcash.services.internal.network.api
 
 import com.codeinc.flipcash.gen.common.v1.Common
+import com.codeinc.flipcash.gen.push.v1.Model
 import com.codeinc.flipcash.gen.push.v1.PushGrpcKt
 import com.codeinc.flipcash.gen.push.v1.PushService
 import com.flipcash.services.internal.annotations.FlipcashManagedChannel
@@ -34,7 +35,7 @@ internal class PushApi @Inject constructor(
             PushService.AddTokenRequest.newBuilder()
                 .setPushToken(token)
                 .setAppInstall(Common.AppInstallId.newBuilder().setValue(installationId))
-                .setTokenType(PushService.TokenType.FCM_ANDROID)
+                .setTokenType(Model.TokenType.FCM_ANDROID)
                 .apply { setAuth(authenticate(owner)) }
                 .build()
 
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/extensions/ProtobufToLocal.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/internal/network/extensions/ProtobufToLocal.kt
@@ -3,8 +3,12 @@ package com.flipcash.services.internal.network.extensions
 
 import com.codeinc.flipcash.gen.common.v1.Common
 import com.codeinc.flipcash.gen.common.v1.Common.UserId
+import com.codeinc.flipcash.gen.push.v1.navigationOrNull
+import com.codeinc.flipcash.gen.push.v1.Model as PushModels
 import com.flipcash.services.internal.extensions.toMint
 import com.flipcash.services.internal.extensions.toPublicKey
+import com.flipcash.services.models.NavigationTrigger
+import com.flipcash.services.models.NotificationPayload
 import com.getcode.opencode.model.core.ID
 import com.getcode.solana.keys.Mint
 import com.getcode.solana.keys.PublicKey
@@ -13,4 +17,20 @@ import com.codeinc.flipcash.gen.activity.v1.Model as ActivityModels
 internal fun ActivityModels.NotificationId.toId(): ID = value.toByteArray().toList()
 internal fun UserId.toId(): ID = value.toByteArray().toList()
 internal fun Common.PublicKey.toPublicKey(): PublicKey = value.toByteArray().toPublicKey()
-internal fun Common.PublicKey.toMint(): Mint = value.toByteArray().toMint()
+internal fun Common.PublicKey.toMint(): Mint = value.toByteArray().toMint()
+
+internal fun PushModels.Payload.asPayload(): NotificationPayload {
+    val navigationTrigger = navigationOrNull?.typeCase?.let { type ->
+        when (type) {
+            PushModels.Navigation.TypeCase.CURRENCY_INFO -> {
+                val mint = navigation.currencyInfo.toMint()
+                NavigationTrigger.CurrencyInfo(mint)
+            }
+            PushModels.Navigation.TypeCase.TYPE_NOT_SET -> null
+        }
+    }
+
+    return NotificationPayload(
+        navigation = navigationTrigger
+    )
+}
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/models/ActivityFeedNotification.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/models/ActivityFeedNotification.kt
@@ -77,4 +77,9 @@ sealed interface NotificationMetadata {
     @Serializable
     data object WithdrewCrypto : NotificationMetadata
 
+    @Serializable
+    data object BoughtToken: NotificationMetadata
+    @Serializable
+    data object SoldToken: NotificationMetadata
+
 }
diff --git a/services/flipcash/src/main/kotlin/com/flipcash/services/models/NotificationPayload.kt b/services/flipcash/src/main/kotlin/com/flipcash/services/models/NotificationPayload.kt
@@ -0,0 +1,26 @@
+package com.flipcash.services.models
+
+import com.codeinc.flipcash.gen.push.v1.Model
+import com.flipcash.services.internal.network.extensions.asPayload
+import com.getcode.solana.keys.Mint
+import com.getcode.utils.decodeBase64
+
+data class NotificationPayload(
+    val navigation: NavigationTrigger?
+) {
+    companion object {
+        fun fromEncoded(encoded: String): NotificationPayload? {
+            val proto = runCatching { Model.Payload.parseFrom(encoded.decodeBase64()) }.getOrNull()
+                ?: return null
+            return fromProto(proto)
+        }
+
+        fun fromProto(proto: Model.Payload): NotificationPayload {
+            return proto.asPayload()
+        }
+    }
+}
+
+sealed interface NavigationTrigger {
+    data class CurrencyInfo(val mint: Mint) : NavigationTrigger
+}
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/extensions/LocalToProtobuf.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/extensions/LocalToProtobuf.kt
@@ -146,7 +146,6 @@ internal fun TransactionMetadata.asProtobufMetadata(): TransactionService.Metada
                     .setSource(source.asSolanaAccountId())
                     .setMint(exchangeData.mint.asSolanaAccountId())
                     .apply {
-                        println("verifiedExchangeData: $verifiedExchangeData")
                         if (verifiedExchangeData != null) {
                             setClientExchangeData(verifiedExchangeData.asProtobufExchangeData())
                         }
diff --git a/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/extensions/ProtobufToLocal.kt b/services/opencode/src/main/kotlin/com/getcode/opencode/internal/network/extensions/ProtobufToLocal.kt
@@ -138,7 +138,7 @@ internal fun TransactionService.StatefulSwapRequest.Initiate.CurrencyCreator.toM
         id = id.toSwapId(),
         fromMint = fromMint.toPublicKey(),
         toMint = toMint.toPublicKey(),
-        amount = amount.toFiat(),
+        amount = Fiat(quarks = amount),
         fundingSource = when (fundingSource) {
             TransactionService.FundingSource.FUNDING_SOURCE_UNKNOWN -> SwapFundingSource.Unknown
             TransactionService.FundingSource.FUNDING_SOURCE_SUBMIT_INTENT -> SwapFundingSource.SubmitIntent(PublicKey(fundingId).bytes)

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,8 @@ class MetadataMapper @Inject constructor(): Mapper<NotificationMetadata?, Messag`
`62`	`62`	`NotificationMetadata.WelcomeBonus -> MessageMetadata.WelcomeBonus`
`63`	`63`	`NotificationMetadata.WithdrewCrypto -> MessageMetadata.WithdrewCrypto`
`64`	`64`	`NotificationMetadata.DepositedCrypto -> MessageMetadata.DepositedCrypto`
	`65`	`+ NotificationMetadata.BoughtToken -> MessageMetadata.BoughtToken`
	`66`	`+ NotificationMetadata.SoldToken -> MessageMetadata.SoldToken`
`65`	`67`	`}`
`66`	`68`	`}`
`67`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,8 @@ message Notification {`
`30`	`30`	`WithdrewCryptoNotificationMetadata withdrew_crypto = 9;`
`31`	`31`	`SentCryptoNotificationMetadata sent_crypto = 10;`
`32`	`32`	`DepositedCryptoNotificationMetadata deposited_crypto = 11;`
	`33`	`+ BoughtCryptoNotificationMetadata bought_crypto = 12;`
	`34`	`+ SoldCryptoNotificationMetadata sold_crypto = 13;`
`33`	`35`	`}`
`34`	`36`	`}`
`35`	`37`	`message WelcomeBonusNotificationMetadata {`
`@@ -48,6 +50,10 @@ message SentCryptoNotificationMetadata {`
`48`	`50`	`}`
`49`	`51`	`message DepositedCryptoNotificationMetadata {`
`50`	`52`	`}`
	`53`	`+message BoughtCryptoNotificationMetadata {`
	`54`	`+}`
	`55`	`+message SoldCryptoNotificationMetadata {`
	`56`	`+}`
`51`	`57`	`// ActivityFeedType enables multiple activity feeds, where notifications may be`
`52`	`58`	`// split across different parts of the app`
`53`	`59`	`enum ActivityFeedType {`
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,8 @@ internal class ActivityFeedMessageMapper @Inject constructor(`
`69`	`69`	`canCancel = from.sentCrypto.canInitiateCancelAction`
`70`	`70`	`)`
`71`	`71`	`Model.Notification.AdditionalMetadataCase.DEPOSITED_CRYPTO -> NotificationMetadata.DepositedCrypto`
	`72`	`+ Model.Notification.AdditionalMetadataCase.BOUGHT_CRYPTO -> NotificationMetadata.BoughtToken`
	`73`	`+ Model.Notification.AdditionalMetadataCase.SOLD_CRYPTO -> NotificationMetadata.SoldToken`
`72`	`74`	`Model.Notification.AdditionalMetadataCase.ADDITIONALMETADATA_NOT_SET,`
`73`	`75`	`null -> NotificationMetadata.Unknown`
`74`	`76`	`}`