Merge branch 'develop'

Author: Jeff Yanta

api/src/main/java/com/getcode/analytics/AnalyticsManager.kt

@@ -17,6 +17,19 @@ import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
+enum class Action(val value: String) {
+    CreateAccount("Action: Create Account"),
+    EnterPhone("Action: Enter Phone"),
+    VerifyPhone("Action: Verify Phone"),
+    ConfirmAccessKey("Action: Confirm Access Key"),
+    CompletedOnboarding("Action: Completed Onboarding"),
+}
+
+enum class ActionSource(val value: String) {
+    AccessKeySaved("Saved to Photos"),
+    AccessKeyWroteDown("Wrote it Down")
+}
+
 @Singleton
 class AnalyticsManager @Inject constructor(
     private val mixpanelAPI: MixpanelAPI
@@ -40,10 +53,6 @@ class AnalyticsManager @Inject constructor(
         Timber.i("App init time: " + (System.currentTimeMillis() - (timeAppInit ?: 0)))
     }
 
-    override fun open(screen: Screen) {
-        track(Name.Open, Pair(Property.Screen, screen.value))
-    }
-
     override fun logout() {
         track(Name.Logout)
     }
@@ -265,23 +274,35 @@ class AnalyticsManager @Inject constructor(
         )
     }
 
+    override fun action(action: Action, source: ActionSource?) {
+        track(
+            action = action,
+            properties = source?.let { arrayOf(Property.Source to it.value) }.orEmpty()
+        )
+    }
+
     private fun track(event: Name, vararg properties: Pair<Property, String>) {
+        track(name = event.value, properties = properties)
+    }
+
+    private fun track(action: Action, vararg properties: Pair<Property, String>) {
+       track(name = action.value, properties = properties)
+    }
+
+    private fun track(name: String, vararg properties: Pair<Property, String>) {
         if (BuildConfig.DEBUG) {
-            Timber.d("debug track $event, ${properties.map { "${it.first.name}, ${it.second}" }}")
+            Timber.d("debug track $name, ${properties.map { "${it.first.name}, ${it.second}" }}")
             return
         } //no logging in debug
 
         val jsonObject = JSONObject()
         properties.forEach { property ->
             jsonObject.put(property.first.value, property.second)
         }
-        mixpanelAPI.track(event.value, jsonObject)
+        mixpanelAPI.track(name, jsonObject)
     }
 
     enum class Name(val value: String) {
-        //Open
-        Open("Open"),
-
         //Account
         Logout("Logout"),
         Login("Login"),
@@ -312,7 +333,7 @@ class AnalyticsManager @Inject constructor(
         Recompute("Recompute"),
 
         // App Settings
-        AutoStartCamera("Auto Start Camera"),
+        AutoStartCamera("Camera Auto Start"),
         RequireBiometrics("Require Biometrics")
     }
 
@@ -350,25 +371,8 @@ class AnalyticsManager @Inject constructor(
         VoidingSend("Voiding Send"),
 
         PercentDelta("Percent Delta"),
-    }
 
-    enum class Screen(val value: String) {
-        GetKin("Get Kin Screen"),
-        GiveKin("Give Kin Screen"),
-        RequestKin("Request Kin Screen"),
-        Balance("Balance Screen"),
-        Faq("FAQ Screen"),
-        Settings("Settings Screen"),
-        BuyAndSellKin("Buy and Sell Kin Screen"),
-        Deposit("Deposit Screen"),
-        Backup("Backup Screen"),
-        Withdraw("Withdraw Screen"),
-        Debug("Debug Screen"),
-        Share("Share Screen"),
-        AppSettings("App Settings"),
-        ForceUpgrade("Force Upgrade"),
-        BuyMoreKin("Buy More Kin Screen"),
-        SendKin("Send Kin Screen"),
+        Source("Source"),
     }
 
     enum class BillPresentationStyle(val value: String) {
@@ -385,5 +389,4 @@ class AnalyticsManager @Inject constructor(
         Hidden("Hidden"),
         TimedOut("Timed Out"),
     }
-
 }

api/src/main/java/com/getcode/analytics/AnalyticsService.kt

@@ -9,7 +9,6 @@ import com.getcode.solana.keys.PublicKey
 interface AnalyticsService {
     fun onAppStart()
     fun onAppStarted()
-    fun open(screen: AnalyticsManager.Screen)
     fun login(ownerPublicKey: String, autoCompleteCount: Int, inputChangeCount: Int)
     fun logout()
     fun createAccount(isSuccessful: Boolean, ownerPublicKey: String?)
@@ -50,12 +49,13 @@ interface AnalyticsService {
     fun unintentionalLogout()
 
     fun appSettingToggled(setting: AppSetting, value: Boolean)
+
+    fun action(action: Action, source: ActionSource? = null)
 }
 
 class AnalyticsServiceNull : AnalyticsService {
     override fun onAppStart() = Unit
     override fun onAppStarted() = Unit
-    override fun open(screen: AnalyticsManager.Screen) = Unit
     override fun login(ownerPublicKey: String, autoCompleteCount: Int, inputChangeCount: Int) = Unit
     override fun logout() = Unit
     override fun createAccount(isSuccessful: Boolean, ownerPublicKey: String?) = Unit
@@ -94,4 +94,5 @@ class AnalyticsServiceNull : AnalyticsService {
     override fun backgroundSwapInitiated() = Unit
     override fun unintentionalLogout() = Unit
     override fun appSettingToggled(setting: AppSetting, value: Boolean) = Unit
+    override fun action(action: Action, source: ActionSource?) = Unit
 }

app/src/main/java/com/getcode/analytics/AnalyticsScreenWatcher.kt

@@ -86,6 +86,36 @@ class AuthManager @Inject constructor(
         return login(entropyB64, isSoftLogin = true)
     }
 
+    fun createAccount(
+        entropyB64: String,
+        rollbackOnError: Boolean = false,
+    ): Completable {
+        if (entropyB64.isEmpty()) {
+            taggedTrace("provided entropy was empty", type = TraceType.Error)
+            sessionManager.clear()
+            return Completable.complete()
+        }
+
+        return Single.create {
+            softLoginDisabled = true
+
+            if (!Database.isOpen()) {
+                Database.init(context, entropyB64)
+            }
+
+            val originalSessionState = SessionManager.authState.value
+            sessionManager.set(entropyB64)
+
+            it.onSuccess(originalSessionState)
+        }.flatMapCompletable {
+            fetchAdditionalAccountData(context, entropyB64,
+                isSoftLogin = false,
+                rollbackOnError = rollbackOnError,
+                originalSessionState = it
+            )
+        }.doOnError { softLoginDisabled = false }
+    }
+
     fun login(
         entropyB64: String,
         isSoftLogin: Boolean = false,

app/src/main/java/com/getcode/manager/AuthManager.kt

@@ -34,10 +34,8 @@ import coil3.request.ImageRequest
 import coil3.request.error
 import com.getcode.R
 import com.getcode.analytics.AnalyticsManager
-import com.getcode.analytics.AnalyticsScreenWatcher
 import com.getcode.model.ID
 import com.getcode.navigation.core.LocalCodeNavigator
-import com.getcode.theme.BrandLight
 import com.getcode.theme.CodeTheme
 import com.getcode.ui.components.SheetTitleDefaults
 import com.getcode.ui.components.SheetTitleText
@@ -126,11 +124,6 @@ data object BalanceModal : ChatGraph, ModalRoot {
             BalanceScreen(state = state, dispatch = viewModel::dispatchEvent)
         }
 
-        AnalyticsScreenWatcher(
-            lifecycleOwner = LocalLifecycleOwner.current,
-            event = AnalyticsManager.Screen.Balance
-        )
-
         LifecycleEffect(
             onDisposed = {
                 val disposedScreen = navigator.lastItem

app/src/main/java/com/getcode/navigation/screens/ChatScreens.kt

@@ -7,7 +7,10 @@ import androidx.compose.ui.res.stringResource
 import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.hilt.getViewModel
+import com.getcode.LocalAnalytics
 import com.getcode.R
+import com.getcode.analytics.Action
+import com.getcode.analytics.AnalyticsManager
 import com.getcode.navigation.core.LocalCodeNavigator
 import com.getcode.ui.utils.getStackScopedViewModel
 import com.getcode.view.login.AccessKey
@@ -35,11 +38,14 @@ data class LoginScreen(val seed: String? = null) : LoginGraph {
     @Composable
     override fun Content() {
         val navigator = LocalCodeNavigator.current
+        val analytics = LocalAnalytics.current
+
         if (seed != null) {
             SeedDeepLink(getViewModel(), seed)
         } else {
             LoginHome(
                 createAccount = {
+                    analytics.action(Action.CreateAccount)
                     navigator.push(LoginPhoneVerificationScreen(isNewAccount = true))
                 },
                 login = {
@@ -165,7 +171,7 @@ sealed interface CodeLoginPermission: Parcelable {
 }
 
 @Parcelize
-data class PermissionRequestScreen(val permission: CodeLoginPermission) : LoginGraph {
+data class PermissionRequestScreen(val permission: CodeLoginPermission, val fromOnboarding: Boolean = false) : LoginGraph {
 
     @IgnoredOnParcel
     override val key: ScreenKey = uniqueScreenKey
@@ -174,11 +180,11 @@ data class PermissionRequestScreen(val permission: CodeLoginPermission) : LoginG
     override fun Content() {
         when (permission) {
             CodeLoginPermission.Camera -> {
-                CameraPermission()
+                CameraPermission(fromOnboarding = fromOnboarding)
             }
 
             CodeLoginPermission.Notifications -> {
-                NotificationPermission()
+                NotificationPermission(fromOnboarding = fromOnboarding)
             }
         }
 

app/src/main/java/com/getcode/navigation/screens/LoginScreens.kt

@@ -1,60 +1,18 @@
 package com.getcode.navigation.screens
 
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.navigationBars
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.geometry.Rect
-import androidx.compose.ui.layout.boundsInParent
-import androidx.compose.ui.layout.boundsInWindow
-import androidx.compose.ui.layout.onPlaced
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.compose.ui.platform.LocalTextToolbar
-import androidx.compose.ui.platform.TextToolbar
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.style.TextAlign
 import androidx.lifecycle.Lifecycle
 import cafe.adriel.voyager.core.screen.ScreenKey
 import cafe.adriel.voyager.core.screen.uniqueScreenKey
 import cafe.adriel.voyager.hilt.getViewModel
-import com.getcode.LocalDownloadQrCode
 import com.getcode.R
 import com.getcode.analytics.AnalyticsManager
-import com.getcode.analytics.AnalyticsScreenWatcher
 import com.getcode.model.KinAmount
 import com.getcode.navigation.core.LocalCodeNavigator
-import com.getcode.theme.CodeTheme
-import com.getcode.ui.components.ButtonState
-import com.getcode.ui.components.Cloudy
-import com.getcode.ui.components.CodeButton
-import com.getcode.ui.components.CodeCircularProgressIndicator
-import com.getcode.ui.components.Row
-import com.getcode.ui.components.SelectionContainer
-import com.getcode.ui.components.rememberSelectionState
 import com.getcode.ui.utils.RepeatOnLifecycle
 import com.getcode.ui.utils.getActivityScopedViewModel
-import com.getcode.ui.utils.rememberedLongClickable
-import com.getcode.ui.utils.swallowClicks
-import com.getcode.util.shareDownloadLink
-import com.getcode.util.vibration.LocalVibrator
 import com.getcode.utils.trace
 import com.getcode.view.download.ShareDownloadScreen
 import com.getcode.view.main.account.AccountHome
@@ -138,11 +96,6 @@ data object GiveKinModal : AppScreen(), MainGraph, ModalRoot {
         ) {
             GiveKinScreen(getViewModel())
         }
-
-        AnalyticsScreenWatcher(
-            lifecycleOwner = LocalLifecycleOwner.current,
-            event = AnalyticsManager.Screen.GiveKin
-        )
     }
 }
 
@@ -190,11 +143,6 @@ data class RequestKinModal(
                 content()
             }
         }
-
-        AnalyticsScreenWatcher(
-            lifecycleOwner = LocalLifecycleOwner.current,
-            event = AnalyticsManager.Screen.RequestKin
-        )
     }
 }
 
@@ -220,11 +168,6 @@ data object AccountModal : MainGraph, ModalRoot {
         ) {
             AccountHome(viewModel)
         }
-
-        AnalyticsScreenWatcher(
-            lifecycleOwner = LocalLifecycleOwner.current,
-            event = AnalyticsManager.Screen.Settings
-        )
     }
 }
 
@@ -240,11 +183,6 @@ data object ShareDownloadLinkModal : MainGraph, ModalRoot {
         ) {
             ShareDownloadScreen()
         }
-
-        AnalyticsScreenWatcher(
-            lifecycleOwner = LocalLifecycleOwner.current,
-            event = AnalyticsManager.Screen.Share
-        )
     }
 }