code-payments · jeffyanta · Aug 22, 2024 · Jul 18, 2024 · Aug 8, 2024 · Aug 8, 2024
@@ -21,6 +21,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@master
+        with:
+          fetch-depth: 0
 
       - name: Setup Java env
         uses: actions/setup-java@v3

@@ -17,6 +17,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@master
+        with:
+          fetch-depth: 0
 
       - name: Setup Java env
         uses: actions/setup-java@v3

diff --git a/api/build.gradle.kts b/api/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.google.protobuf.gradle.protobuf
+
 plugins {
     id(Plugins.android_library)
     id(Plugins.kotlin_android)
@@ -70,10 +72,14 @@ android {
 
 dependencies {
     implementation(project(":common:resources"))
+    api(project(":service:models"))
+    implementation(project(":crypto:ed25519"))
+    implementation(project(":crypto:kin"))
 
     implementation(Libs.rxjava)
     implementation(Libs.kotlinx_coroutines_core)
     implementation(Libs.kotlinx_serialization_json)
+    implementation(Libs.kotlinx_datetime)
     implementation(Libs.inject)
 
     implementation(Libs.grpc_okhttp)

diff --git a/api/src/main/java/com/getcode/analytics/AnalyticsManager.kt b/api/src/main/java/com/getcode/analytics/AnalyticsManager.kt
@@ -269,6 +269,10 @@ class AnalyticsManager @Inject constructor(
         )
     }
 
+    override fun tipCardLinked() {
+        track(Name.TipCardLinked)
+    }
+
     override fun backgroundSwapInitiated() {
         track(Name.BackgroundSwap)
     }
@@ -319,11 +323,12 @@ class AnalyticsManager @Inject constructor(
         Login("Login"),
         CreateAccount("Create Account"),
         UnintentionalLogout("Unintentional Logout"),
+        TipCardLinked("Tip Card Linked"),
 
         //Bill
         Bill("Bill"),
         Request("Request Card"),
-        TipCard("TIp Card"),
+        TipCard("Tip Card"),
 
         //Transfer
         Transfer("Transfer"),

diff --git a/api/src/main/java/com/getcode/analytics/AnalyticsService.kt b/api/src/main/java/com/getcode/analytics/AnalyticsService.kt
@@ -45,6 +45,7 @@ interface AnalyticsService {
     fun withdrawal(amount: KinAmount, successful: Boolean)
 
     fun tipCardShown(username: String)
+    fun tipCardLinked()
 
     fun backgroundSwapInitiated()
     fun unintentionalLogout()
@@ -93,6 +94,7 @@ class AnalyticsServiceNull : AnalyticsService {
     override fun upgradePrivacy(successful: Boolean, intentId: PublicKey, actionCount: Int) = Unit
     override fun onBillReceived() = Unit
     override fun tipCardShown(username: String) = Unit
+    override fun tipCardLinked() = Unit
     override fun backgroundSwapInitiated() = Unit
     override fun unintentionalLogout() = Unit
     override fun appSettingToggled(setting: AppSetting, value: Boolean) = Unit

diff --git a/api/src/main/java/com/getcode/db/ConversationDao.kt b/api/src/main/java/com/getcode/db/ConversationDao.kt
@@ -1,5 +1,7 @@
 package com.getcode.db
 
+import androidx.paging.PagingData
+import androidx.paging.PagingSource
 import androidx.room.Dao
 import androidx.room.Delete
 import androidx.room.Insert
@@ -19,6 +21,10 @@ interface ConversationDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun upsertConversations(vararg conversation: Conversation)
 
+    @RewriteQueriesToDropUnusedColumns
+    @Query("SELECT * FROM conversations")
+    fun observeConversations(): PagingSource<Int, Conversation>
+
     @RewriteQueriesToDropUnusedColumns
     @Query("SELECT * FROM conversations LEFT JOIN conversation_pointers ON conversations.idBase58 = conversation_pointers.conversationIdBase58 WHERE conversations.idBase58 = :id")
     fun observeConversation(id: String): Flow<ConversationWithLastPointers?>

diff --git a/api/src/main/java/com/getcode/mapper/ConversationMapper.kt b/api/src/main/java/com/getcode/mapper/ConversationMapper.kt
@@ -4,7 +4,6 @@ import com.getcode.model.Conversation
 import com.getcode.model.chat.Chat
 import com.getcode.model.chat.ChatType
 import com.getcode.model.chat.self
-import com.getcode.network.TipController
 import com.getcode.network.localized
 import com.getcode.network.repository.base58
 import com.getcode.util.resources.ResourceHelper

diff --git a/api/src/main/java/com/getcode/model/Feature.kt b/api/src/main/java/com/getcode/model/Feature.kt
@@ -17,13 +17,18 @@ data class TipCardFeature(
     override val available: Boolean = true, // always available
 ): Feature
 
-data class TipChatFeature(
-    override val enabled: Boolean = BetaOptions.Defaults.tipsChatEnabled,
+data class TipCardOnHomeScreenFeature(
+    override val enabled: Boolean = BetaOptions.Defaults.tipCardOnHomeScreen,
     override val available: Boolean = true, // always available
 ): Feature
 
-data class TipChatCashFeature(
-    override val enabled: Boolean = BetaOptions.Defaults.tipsChatCashEnabled,
+data class ConversationsFeature(
+    override val enabled: Boolean = BetaOptions.Defaults.conversationsEnabled,
+    override val available: Boolean = true, // always available
+): Feature
+
+data class ConversationCashFeature(
+    override val enabled: Boolean = BetaOptions.Defaults.conversationCashEnabled,
     override val available: Boolean = true, // always available
 ): Feature
 

diff --git a/api/src/main/java/com/getcode/model/Kin.kt b/api/src/main/java/com/getcode/model/Kin.kt
@@ -63,10 +63,13 @@ data class Kin(val quarks: Long): Value {
     }
 }
 
-fun min(a: Kin, b: Kin): Kin {
+private fun min(a: Kin, b: Kin): Kin {
     if (a.quarks > b.quarks) {
         return b
     }
 
     return a
-}
+}
+
+val Kin.description: String
+    get() = "K ${toKinTruncating().quarks} ${fractionalQuarks()}"
diff --git a/api/src/main/java/com/getcode/model/PrefBool.kt b/api/src/main/java/com/getcode/model/PrefBool.kt
@@ -25,6 +25,7 @@ sealed class PrefsBool(val value: String) {
     data object IS_ELIGIBLE_GIVE_FIRST_KIN_AIRDROP: PrefsBool("is_eligible_give_first_kin_airdrop"), InternalRouting
     data object HAS_REMOVED_LOCAL_CURRENCY: PrefsBool("removed_local_currency"), InternalRouting
     data object SEEN_TIP_CARD : PrefsBool("seen_tip_card"), InternalRouting
+    data object STARTED_TIP_CONNECT: PrefsBool("started_tip_connect"), InternalRouting
 
     data object BUY_MODULE_AVAILABLE : PrefsBool("buy_module_available"), InternalRouting
 
@@ -43,14 +44,14 @@ sealed class PrefsBool(val value: String) {
     data object SHOW_CONNECTIVITY_STATUS: PrefsBool("debug_no_network"), BetaFlag
     data object GIVE_REQUESTS_ENABLED: PrefsBool("give_requests_enabled"), BetaFlag
     data object BUY_MODULE_ENABLED : PrefsBool("buy_kin_enabled"), BetaFlag
-
-
     data object CHAT_UNSUB_ENABLED: PrefsBool("chat_unsub_enabled"), BetaFlag
     data object TIPS_ENABLED : PrefsBool("tips_enabled"), BetaFlag
-    data object TIPS_CHAT_ENABLED: PrefsBool("tips_chat_enabled"), BetaFlag
-    data object TIPS_CHAT_CASH_ENABLED: PrefsBool("tips_chat_cash_enabled"), BetaFlag
+    data object CONVERSATIONS_ENABLED: PrefsBool("conversations_enabled"), BetaFlag
+    data object CONVERSATION_CASH_ENABLED: PrefsBool("convo_cash_enabled"), BetaFlag
     data object BALANCE_CURRENCY_SELECTION_ENABLED: PrefsBool("balance_currency_enabled"), BetaFlag
     data object KADO_WEBVIEW_ENABLED : PrefsBool("kado_inapp_enabled"), BetaFlag
+    data object SHARE_TWEET_TO_TIP : PrefsBool("share_tweet_to_tip"), BetaFlag
+    data object TIP_CARD_ON_HOMESCREEN: PrefsBool("tip_card_on_home_screen"), BetaFlag
 }
 
 val APP_SETTINGS: List<AppSetting> = listOf(PrefsBool.CAMERA_START_BY_DEFAULT, PrefsBool.REQUIRE_BIOMETRICS)
diff --git a/api/src/main/java/com/getcode/model/chat/Chat.kt b/api/src/main/java/com/getcode/model/chat/Chat.kt
@@ -2,6 +2,7 @@ package com.getcode.model.chat
 
 import com.getcode.model.Cursor
 import com.getcode.model.ID
+import kotlinx.serialization.Serializable
 import java.util.UUID
 
 /**
@@ -18,6 +19,7 @@ import java.util.UUID
  * @param cursor [Cursor] value for this chat for reference in subsequent GetChatsRequest
  * @param messages List of messages within this chat
  */
+@Serializable
 data class Chat(
     val id: ID,
     val type: ChatType,
@@ -135,6 +137,9 @@ data class Chat(
 val Chat.isV2: Boolean
     get() = members.isNotEmpty()
 
+val Chat.isNotification: Boolean
+    get() = type == ChatType.Notification
+
 val Chat.isConversation: Boolean
     get() = type == ChatType.TwoWay
 

diff --git a/api/src/main/java/com/getcode/model/chat/ChatMessage.kt b/api/src/main/java/com/getcode/model/chat/ChatMessage.kt
@@ -4,6 +4,8 @@ import com.getcode.ed25519.Ed25519.KeyPair
 import com.getcode.model.Cursor
 import com.getcode.model.ID
 import com.getcode.model.MessageStatus
+import com.getcode.utils.serializer.UUIDSerializer
+import kotlinx.serialization.Serializable
 import java.util.UUID
 
 /**
@@ -18,8 +20,10 @@ import java.util.UUID
  * @param contents Ordered message content. A message may have more than one piece of content.
  * @param status Derived [MessageStatus] from [Pointer]'s in [ChatMember].
  */
+@Serializable
 data class ChatMessage(
     val id: ID, // time based UUID in v2
+    @Serializable(with = UUIDSerializer::class)
     val senderId: UUID?,
     val isFromSelf: Boolean,
     val cursor: Cursor,

diff --git a/api/src/main/java/com/getcode/network/BalanceController.kt b/api/src/main/java/com/getcode/network/BalanceController.kt
@@ -13,6 +13,7 @@ import com.getcode.solana.organizer.Organizer
 import com.getcode.solana.organizer.Tray
 import com.getcode.utils.FormatUtils
 import com.getcode.utils.network.NetworkConnectivityListener
+import com.getcode.utils.network.retryable
 import com.getcode.utils.trace
 import io.reactivex.rxjava3.core.Completable
 import kotlinx.coroutines.CoroutineScope
@@ -23,6 +24,7 @@ import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.map
@@ -38,8 +40,7 @@ data class BalanceDisplay(
     val marketValue: Double = 0.0,
     val formattedValue: String = "",
     val currency: Currency? = null,
-
-    )
+)
 
 open class BalanceController @Inject constructor(
     exchange: Exchange,
@@ -65,25 +66,34 @@ open class BalanceController @Inject constructor(
             .stateIn(scope, SharingStarted.Eagerly, BalanceDisplay())
 
     init {
-        combine(
-            exchange.observeLocalRate()
-                .flowOn(Dispatchers.IO)
-                .onEach {
-                    val display = _balanceDisplay.value ?: BalanceDisplay()
-                    _balanceDisplay.value = display.copy(currency = getCurrencyFromCode(it.currency))
+        networkObserver.state
+            .map { it.connected }
+            .onEach { connected ->
+                if (connected) {
+                    retryable({ fetchBalanceSuspend() })
+                }
+            }
+            .flatMapLatest {
+                combine(
+                    exchange.observeLocalRate()
+                        .flowOn(Dispatchers.IO)
+                        .onEach {
+                            val display = _balanceDisplay.value ?: BalanceDisplay()
+                            _balanceDisplay.value =
+                                display.copy(currency = getCurrencyFromCode(it.currency))
+                        }
+                        .onEach { exchange.fetchRatesIfNeeded() },
+                    balanceRepository.balanceFlow,
+                ) { rate, balance ->
+                    rate to balance.coerceAtLeast(0.0)
+                }.map { (rate, balance) ->
+                    refreshBalance(balance, rate)
                 }
-                .onEach { exchange.fetchRatesIfNeeded() },
-            balanceRepository.balanceFlow,
-            networkObserver.state
-        ) { rate, balance, _ ->
-            rate to balance.coerceAtLeast(0.0)
-        }.map { (rate, balance) ->
-            refreshBalance(balance, rate)
-        }.distinctUntilChanged().onEach { (marketValue, amountText) ->
-            val display = _balanceDisplay.value ?: BalanceDisplay()
-            _balanceDisplay.value =
-                display.copy(marketValue = marketValue, formattedValue = amountText)
-        }.launchIn(scope)
+            }.distinctUntilChanged().onEach { (marketValue, amountText) ->
+                val display = _balanceDisplay.value ?: BalanceDisplay()
+                _balanceDisplay.value =
+                    display.copy(marketValue = marketValue, formattedValue = amountText)
+            }.launchIn(scope)
     }
 
     fun setTray(organizer: Organizer, tray: Tray) {
@@ -155,6 +165,7 @@ open class BalanceController @Inject constructor(
 
 
     suspend fun fetchBalanceSuspend() {
+        Timber.d("fetching balance")
         if (SessionManager.isAuthenticated() != true) {
             Timber.d("FetchBalance - Not authenticated")
             return