Merge branch 'develop'

Author: jeffyanta

api/build.gradle.kts

@@ -69,7 +69,7 @@ android {
 }
 
 dependencies {
-    implementation(project(":common"))
+    implementation(project(":common:resources"))
 
     implementation(Libs.rxjava)
     implementation(Libs.kotlinx_coroutines_core)

api/src/androidTest/java/com/getcode/solana/organizer/OrganizerTest.kt

@@ -141,7 +141,8 @@ class OrganizerTest {
                             claimState = AccountInfo.ClaimState.Unknown,
                             mustRotate = false,
                             originalKinAmount = null,
-                            relationship = null
+                            relationship = null,
+                            createdAt = System.currentTimeMillis(),
                         )
                 )
             )
@@ -153,4 +154,4 @@ class OrganizerTest {
             }
         }
     }
-}
+}

api/src/main/java/com/getcode/manager/SessionManager.kt

@@ -14,7 +14,6 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
-import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 

api/src/main/java/com/getcode/model/AccountInfo.kt

@@ -61,7 +61,12 @@ data class AccountInfo (
 
     /// The relationship with a third party that this account has established with.
     /// This only applies to relevant account types (eg. RELATIONSHIP).
-    var relationship: Relationship?
+    var relationship: Relationship?,
+
+    // Time the account was created, if available. For Code accounts, this is
+    // the time of intent submission. Otherwise, for external accounts, it is
+    // the time created on the blockchain.
+    var createdAt: Long?,
 
 ) {
     companion object {
@@ -105,9 +110,9 @@ data class AccountInfo (
                 claimState = claimState,
                 mustRotate = info.mustRotate,
                 originalKinAmount = originalKinAmount,
-                relationship = relationship
+                relationship = relationship,
+                createdAt = info.createdAt.seconds * 1000L
             )
-
         }
     }
 
@@ -259,4 +264,4 @@ val AccountInfo.unusable: Boolean
         false
     } else {
         managementState != AccountInfo.ManagementState.Locked
-    }
+    }

api/src/main/java/com/getcode/model/PrefInt.kt

@@ -7,4 +7,8 @@ import androidx.room.PrimaryKey
 data class PrefInt(
     @PrimaryKey val key: String,
     val value: Long
-)
+)
+
+sealed class PrefsInt(val value: String) {
+    data object AccountCreated: PrefsInt("account_created")
+}

api/src/main/java/com/getcode/network/BalanceController.kt

@@ -106,7 +106,10 @@ open class BalanceController @Inject constructor(
                     val organizer = SessionManager.getOrganizer()
                         ?: return@flatMapCompletable Completable.error(IllegalStateException("Missing Organizer"))
 
-                    scope.launch { organizer.setAccountInfo(infos) }
+                    scope.launch {
+                        organizer.setAccountInfo(infos)
+                        SessionManager.update { it.copy(organizer = organizer) }
+                    }
                     balanceRepository.setBalance(organizer.availableBalance.toKinValueDouble())
                     transactionReceiver.receiveFromIncomingCompletable(organizer)
                 }
@@ -164,6 +167,7 @@ open class BalanceController @Inject constructor(
                 SessionManager.getOrganizer() ?: throw IllegalStateException("Missing Organizer")
 
             organizer.setAccountInfo(accountInfo)
+            SessionManager.update { it.copy(organizer = organizer) }
             balanceRepository.setBalance(organizer.availableBalance.toKinValueDouble())
             transactionReceiver.receiveFromIncoming(organizer)
             transactionRepository.swapIfNeeded(organizer)
@@ -227,4 +231,4 @@ open class BalanceController @Inject constructor(
             String.format(Locale.getDefault(), "%,.2f", amount)
         }
     }
-}
+}

api/src/main/java/com/getcode/network/repository/BetaFlagsRepository.kt

@@ -96,4 +96,4 @@ class BetaFlagsRepository @Inject constructor(
             b.takeIf { a } ?: default
         }
     }
-}
+}

api/src/main/java/com/getcode/network/repository/IdentityRepository.kt

@@ -24,6 +24,7 @@ import io.reactivex.rxjava3.core.Single
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.map
 import timber.log.Timber
+import java.time.Instant
 import java.util.Locale
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
@@ -54,7 +55,7 @@ class IdentityRepository @Inject constructor(
                 enableDebugOptions = false,
                 eligibleAirdrops = setOf(),
                 isPhoneNumberLinked = true,
-                buyModuleAvailable = false
+                buyModuleAvailable = false,
             )
         )
 
@@ -400,4 +401,4 @@ sealed class TwitterUserFetchError : Exception() {
     class UnrecognizedRequest: TwitterUserFetchError()
     class NotFound: TwitterUserFetchError()
     class FailedToParse: TwitterUserFetchError()
-}
+}

api/src/main/java/com/getcode/network/repository/PrefRepository.kt

@@ -34,6 +34,10 @@ class PrefRepository @Inject constructor(): CoroutineScope by CoroutineScope(Dis
         return observeOrDefault(key, default).firstOrNull() ?: default
     }
 
+    suspend fun get(key: PrefsInt, default: Long): Long {
+        return observeOrDefault(key, default).firstOrNull() ?: default
+    }
+
 
     fun getFlowable(key: PrefsString): Flowable<String> {
         val db = Database.getInstance() ?: return Flowable.empty()
@@ -75,6 +79,18 @@ class PrefRepository @Inject constructor(): CoroutineScope by CoroutineScope(Dis
             .flowOn(Dispatchers.IO)
     }
 
+    fun observeOrDefault(key: PrefsInt, default: Long): Flow<Long> {
+        return Database.isInit
+            .asFlow()
+            .map { Database.getInstance() }
+            .flatMapLatest {
+                it ?: return@flatMapLatest flowOf(default).also { Timber.e("observe long ; DB not available") }
+                it.prefIntDao().observe(key.value)
+                    .map { it?.value ?: default }
+            }
+            .flowOn(Dispatchers.IO)
+    }
+
     fun getFlowable(key: String): Flowable<Long> {
         val db = Database.getInstance() ?: return Flowable.empty()
         return db.prefIntDao().get(key)
@@ -134,4 +150,4 @@ class PrefRepository @Inject constructor(): CoroutineScope by CoroutineScope(Dis
         }
     }
 
-}
+}

api/src/main/java/com/getcode/solana/organizer/Organizer.kt

@@ -1,8 +1,6 @@
 package com.getcode.solana.organizer
 
-import android.content.Context
 import com.getcode.crypt.DerivePath
-import com.getcode.crypt.DerivedKey
 import com.getcode.crypt.MnemonicPhrase
 import com.getcode.model.AccountInfo
 import com.getcode.model.Domain
@@ -11,7 +9,6 @@ import com.getcode.model.unusable
 import com.getcode.network.repository.getPublicKeyBase58
 import com.getcode.solana.keys.*
 import com.getcode.utils.timedTrace
-import com.getcode.utils.trace
 import timber.log.Timber
 
 class Organizer(
@@ -32,6 +29,8 @@ class Organizer(
 
     val isUnuseable: Boolean get() = accountInfos.any { it.value.unusable }
 
+    val createdAtMillis: Long? get() = accountInfos.mapNotNull { it.value.createdAt }.minOrNull()
+
     val isUnlocked: Boolean
         get() = accountInfos.values.any { info ->
             info.managementState != AccountInfo.ManagementState.Locked
@@ -151,4 +150,4 @@ enum class Denomination {
                 millions -> DerivePath.bucket1m
             }
         }
-}
+}

app/build.gradle.kts

@@ -1,10 +1,5 @@
-import com.android.SdkConstants.FN_LOCAL_PROPERTIES
-import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
 import com.google.firebase.crashlytics.buildtools.gradle.CrashlyticsExtension
 import org.jetbrains.kotlin.cli.common.toBooleanLenient
-import java.io.FileInputStream
-import java.io.InputStreamReader
-import java.util.Properties
 
 plugins {
     id(Plugins.android_application)
@@ -55,8 +50,6 @@ android {
 
     buildFeatures {
         buildConfig = true
-        viewBinding = true
-        dataBinding = true
         compose = true
     }
 
@@ -121,7 +114,9 @@ dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
 
     implementation(project(":api"))
-    implementation(project(":common"))
+    implementation(project(":common:resources"))
+    implementation(project(":common:theme"))
+    implementation(project(":vendor:tipkit-m2"))
 
     //standard libraries
     implementation(Libs.kotlinx_collections_immutable)
@@ -144,7 +139,7 @@ dependencies {
     testImplementation(Libs.hilt_android_test)
     kaptTest(Libs.hilt_android_compiler)
 
-    androidTestImplementation("io.mockk:mockk:1.13.5")
+    androidTestImplementation("io.mockk:mockk:1.13.11")
 
     //Jetpack compose
     implementation(platform(Libs.compose_bom))