fix(tokens): track currency-info opens and shares from the card overlay

apps/flipcash/app/src/main/kotlin/com/flipcash/app/MainActivity.kt

@@ -12,7 +12,7 @@ import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import com.flipcash.app.analytics.FlipcashAnalyticsService
+import com.flipcash.app.analytics.FlipcashAnalytics
 import com.flipcash.app.android.BuildConfig
 import com.flipcash.app.appsettings.AppSettingsCoordinator
 import com.flipcash.app.appsettings.LocalAppSettings
@@ -49,7 +49,7 @@ import com.flipcash.app.updates.AppUpdateController
 import com.flipcash.app.updates.LocalAppUpdater
 import com.flipcash.services.user.UserManager
 import com.flipcash.shared.tipping.TippingCoordinator
-import com.getcode.libs.analytics.LocalAnalytics
+import com.flipcash.app.analytics.LocalAnalytics
 import com.getcode.opencode.compose.LocalExchange
 import com.getcode.opencode.exchange.Exchange
 import com.getcode.ui.testing.LocalUiTesting
@@ -118,7 +118,7 @@ class MainActivity : FragmentActivity() {
     lateinit var featureFlagController: FeatureFlagController
 
     @Inject
-    lateinit var analytics: FlipcashAnalyticsService
+    lateinit var analytics: FlipcashAnalytics
 
     @Inject
     lateinit var phoneUtils: PhoneUtils
@@ -241,4 +241,4 @@ private fun Activity.handleUncaughtException() {
         killProcess(myPid())
         exitProcess(2)
     }
-}
+}

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

@@ -37,7 +37,9 @@ import androidx.navigation3.runtime.NavBackStack
 import androidx.navigation3.runtime.NavKey
 import androidx.navigation3.scene.OverlayScene
 import androidx.navigation3.scene.SinglePaneSceneStrategy
+import com.flipcash.analytics.events.DeeplinkEvents
 import com.flipcash.app.analytics.rememberAnalytics
+import com.flipcash.app.analytics.withoutQueryOrFragment
 import com.flipcash.app.android.BuildConfig
 import com.flipcash.app.bill.customization.BillPlaygroundScaffold
 import com.flipcash.app.cardexpand.CardExpansionController
@@ -117,7 +119,7 @@ internal fun App(
     var deeplinkHandled by remember { mutableStateOf(false) }
     val userManager = LocalUserManager.current!!
     DeepLinkListener {
-        analytics.deeplinkOpened(it.data)
+        analytics.track(DeeplinkEvents.open(it.data.withoutQueryOrFragment()))
         deepLink = it
     }
 

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

@@ -6,6 +6,7 @@ import androidx.compose.runtime.remember
 import androidx.navigation3.runtime.NavBackStack
 import androidx.navigation3.runtime.NavEntryDecorator
 import androidx.navigation3.runtime.NavKey
+import com.flipcash.analytics.events.ErrorModalEvents
 import com.flipcash.app.analytics.rememberAnalytics
 import com.flipcash.app.core.AppRoute
 import com.getcode.manager.BottomBarManager
@@ -46,11 +47,13 @@ fun NavMessagingEntryDecorator(
                         BottomBarManager.BottomBarMessageType.DESTRUCTIVE -> Unit
                         BottomBarManager.BottomBarMessageType.ERROR -> {
                             val screen = backStack.lastOrNull()?.screenName()
-                            analytics.displayedErrorModal(
-                                title = message.title,
-                                message = message.subtitle,
-                                screen = screen,
-                                callSite = message.callSite,
+                            analytics.track(
+                                ErrorModalEvents.displayed(
+                                    title = message.title,
+                                    message = message.subtitle,
+                                    screen = screen,
+                                    callSite = message.callSite,
+                                )
                             )
                         }
                         BottomBarManager.BottomBarMessageType.WARNING -> Unit

apps/flipcash/features/balance/build.gradle.kts

@@ -15,6 +15,7 @@ dependencies {
 
     implementation(project(":apps:flipcash:shared:transaction-history"))
     implementation(project(":apps:flipcash:shared:analytics"))
+    testImplementation(testFixtures(project(":apps:flipcash:shared:analytics")))
     implementation(project(":apps:flipcash:shared:chat"))
     implementation(project(":apps:flipcash:shared:featureflags"))
     implementation(project(":apps:flipcash:shared:funding"))

apps/flipcash/features/balance/src/main/kotlin/com/flipcash/app/balance/internal/WalletViewModel.kt

@@ -1,8 +1,9 @@
 package com.flipcash.app.balance.internal
 
 import androidx.lifecycle.viewModelScope
-import com.flipcash.app.analytics.Analytics
-import com.flipcash.app.analytics.FlipcashAnalyticsService
+import com.flipcash.analytics.AddMoneySource
+import com.flipcash.analytics.events.AddMoneyEvents
+import com.flipcash.app.analytics.FlipcashAnalytics
 import com.flipcash.app.core.ui.onboarding.TutorialItem
 import com.flipcash.app.core.AppRoute
 import com.flipcash.shared.transactionhistory.ActivityFeedCoordinator
@@ -35,7 +36,7 @@ internal class WalletViewModel @Inject constructor(
     userFlags: UserFlagsCoordinator,
     dispatchers: DispatcherProvider,
     purchaseMethodController: PurchaseMethodController,
-    analytics: FlipcashAnalyticsService,
+    analytics: FlipcashAnalytics,
     chatCoordinator: ChatCoordinator,
     feedCoordinator: ActivityFeedCoordinator,
     tokenCoordinator: TokenCoordinator,
@@ -176,7 +177,7 @@ internal class WalletViewModel @Inject constructor(
         eventFlow
             .filterIsInstance<Event.PresentDepositOptions>()
             .mapNotNull {
-                analytics.addMoneyOpened(Analytics.AddMoneySource.Balance)
+                analytics.track(AddMoneyEvents.opened(AddMoneySource.BALANCE))
                 purchaseMethodController.presentDepositOptions(popToRoot = true) }
             .onEach { route -> dispatchEvent(Event.OpenScreen(route)) }
             .launchIn(viewModelScope)
@@ -243,4 +244,4 @@ internal class WalletViewModel @Inject constructor(
             }
         }
     }
-}
+}

apps/flipcash/features/balance/src/test/kotlin/com/flipcash/app/balance/internal/BalanceViewModelTest.kt

@@ -1,7 +1,9 @@
 package com.flipcash.app.balance.internal
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.flipcash.app.analytics.StubFlipcashAnalytics
+import com.flipcash.analytics.AddMoneySource
+import com.flipcash.analytics.events.AddMoneyEvents
+import com.flipcash.app.analytics.RecordingAnalytics
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.MainCoroutineRule
 import com.flipcash.app.core.dispatchers.TestDispatchers
@@ -55,14 +57,16 @@ class BalanceViewModelTest {
         every { pending } returns MutableStateFlow(null)
     }
 
+    private val analytics = RecordingAnalytics()
+
     private lateinit var dispatchers: TestDispatchers
 
     private fun createViewModel() = WalletViewModel(
         userManager = userManager,
         userFlags = userFlags,
         dispatchers = dispatchers,
         purchaseMethodController = purchaseMethodController,
-        analytics = StubFlipcashAnalytics(),
+        analytics = analytics,
         chatCoordinator = chatCoordinator,
         feedCoordinator = feedCoordinator,
         tokenCoordinator = tokenCoordinator,
@@ -83,6 +87,7 @@ class BalanceViewModelTest {
             // The removed AddMoneyUX flag used to short-circuit to a plain Deposit route;
             // the add-money sheet must now always be presented.
             coVerify(exactly = 1) { purchaseMethodController.presentDepositOptions(popToRoot = true) }
+            assertEquals(listOf(AddMoneyEvents.opened(AddMoneySource.BALANCE)), analytics.events)
         }
 
     @Test

apps/flipcash/features/balance/src/test/kotlin/com/flipcash/app/balance/internal/WalletMilestoneGatingTest.kt

@@ -1,7 +1,7 @@
 package com.flipcash.app.balance.internal
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.flipcash.app.analytics.StubFlipcashAnalytics
+import com.flipcash.app.analytics.FlipcashAnalytics
 import com.flipcash.app.core.ui.onboarding.TutorialItem
 import com.flipcash.app.core.MainCoroutineRule
 import com.flipcash.app.core.dispatchers.TestDispatchers
@@ -67,7 +67,7 @@ class WalletMilestoneGatingTest {
         userFlags = mockk<UserFlagsCoordinator>(relaxed = true),
         dispatchers = dispatchers,
         purchaseMethodController = mockk<PurchaseMethodController>(relaxed = true),
-        analytics = StubFlipcashAnalytics(),
+        analytics = FlipcashAnalytics.None,
         chatCoordinator = chatCoordinator,
         feedCoordinator = feedCoordinator,
         tokenCoordinator = tokenCoordinator,

apps/flipcash/features/cash/build.gradle.kts

@@ -16,6 +16,7 @@ dependencies {
     implementation(libs.kotlin.stdlib)
     implementation(project(":apps:flipcash:shared:amount-entry"))
     implementation(project(":apps:flipcash:shared:analytics"))
+    testImplementation(testFixtures(project(":apps:flipcash:shared:analytics")))
     implementation(project(":apps:flipcash:shared:featureflags"))
     implementation(project(":apps:flipcash:shared:session"))
     implementation(project(":apps:flipcash:shared:tokens"))

apps/flipcash/features/cash/src/main/kotlin/com/flipcash/app/cash/internal/CashScreenViewModel.kt

@@ -1,8 +1,9 @@
 package com.flipcash.app.cash.internal
 
 import androidx.lifecycle.viewModelScope
-import com.flipcash.app.analytics.Analytics
-import com.flipcash.app.analytics.FlipcashAnalyticsService
+import com.flipcash.analytics.AddMoneySource
+import com.flipcash.analytics.events.AddMoneyEvents
+import com.flipcash.app.analytics.FlipcashAnalytics
 import com.flipcash.app.core.AppRoute
 import com.flipcash.app.core.bill.Scannable
 import com.flipcash.app.core.tokens.SwapPurpose
@@ -58,7 +59,7 @@ internal class CashScreenViewModel @Inject constructor(
     private val verifiedFiatCalculator: VerifiedFiatCalculator,
     tokenCoordinator: TokenCoordinator,
     transactionController: TransactionOperations,
-    analytics: FlipcashAnalyticsService,
+    analytics: FlipcashAnalytics,
     dispatchers: DispatcherProvider,
 ) : BaseViewModel<CashScreenViewModel.State, CashScreenViewModel.Event>(
     initialState = State(),
@@ -289,7 +290,7 @@ internal class CashScreenViewModel @Inject constructor(
                 // route directly to the swap amount screen, skipping token info
                 val mint = stateFlow.value.selectedTokenAddress!!
                 if (mint == Mint.usdf) {
-                    analytics.addMoneyOpened(Analytics.AddMoneySource.GiveShortfall)
+                    analytics.track(AddMoneyEvents.opened(AddMoneySource.GIVE_SHORTFALL))
                 }
                 dispatchEvent(
                     Event.OpenScreen(
@@ -340,4 +341,4 @@ internal class CashScreenViewModel @Inject constructor(
             }
         }
     }
-}
+}

apps/flipcash/features/cash/src/test/kotlin/com/flipcash/app/cash/internal/CashScreenViewModelTest.kt

@@ -1,7 +1,9 @@
 package com.flipcash.app.cash.internal
 
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
-import com.flipcash.app.analytics.StubFlipcashAnalytics
+import com.flipcash.analytics.AddMoneySource
+import com.flipcash.analytics.events.AddMoneyEvents
+import com.flipcash.app.analytics.RecordingAnalytics
 import com.flipcash.app.core.MainCoroutineRule
 import com.flipcash.app.core.dispatchers.TestDispatchers
 import com.flipcash.app.tokens.TokenCoordinator
@@ -51,6 +53,8 @@ class CashScreenViewModelTest {
     private val tokenCoordinator: TokenCoordinator = mockk(relaxed = true)
     private val transactionController: TransactionOperations = mockk(relaxed = true)
 
+    private val analytics = RecordingAnalytics()
+
     private lateinit var dispatchers: TestDispatchers
 
     private val updateStateForEvent = CashScreenViewModel.updateStateForEvent
@@ -79,7 +83,7 @@ class CashScreenViewModelTest {
             verifiedFiatCalculator = verifiedFiatCalculator,
             tokenCoordinator = tokenCoordinator,
             transactionController = transactionController,
-            analytics = StubFlipcashAnalytics(),
+            analytics = analytics,
             dispatchers = dispatchers,
         )
     }
@@ -266,4 +270,26 @@ class CashScreenViewModelTest {
             val result = vm.checkSendLimit()
             assertFalse(result, "checkSendLimit should return false when amount is within limit")
         }
+
+    @Test
+    fun `a USDF shortfall tracks Add Money Opened from Give Shortfall`() = runTest(mainCoroutineRule.dispatcher) {
+        dispatchers = TestDispatchers(testScheduler)
+        val vm = createViewModel()
+        vm.dispatchEvent(CashScreenViewModel.Event.OnTokenSelected(Mint.usdf))
+        vm.dispatchEvent(CashScreenViewModel.Event.AddCashToWallet(Fiat(5.0)))
+        advanceUntilIdle()
+
+        assertEquals(listOf(AddMoneyEvents.opened(AddMoneySource.GIVE_SHORTFALL)), analytics.events)
+    }
+
+    @Test
+    fun `a shortfall in another token tracks nothing`() = runTest(mainCoroutineRule.dispatcher) {
+        dispatchers = TestDispatchers(testScheduler)
+        val vm = createViewModel()
+        vm.dispatchEvent(CashScreenViewModel.Event.OnTokenSelected(Mint("kinXdEcpDQeHPEuQnqmUgtYykqKGVFq6CeVX5iAHJq6")))
+        vm.dispatchEvent(CashScreenViewModel.Event.AddCashToWallet(Fiat(5.0)))
+        advanceUntilIdle()
+
+        assertTrue(analytics.events.isEmpty())
+    }
 }

apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/email/EmailMagicLinkScreen.kt

@@ -8,7 +8,8 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
-import com.flipcash.app.analytics.Analytics
+import com.flipcash.analytics.OnrampStep
+import com.flipcash.analytics.events.OnrampEvents
 import com.flipcash.app.analytics.rememberAnalytics
 import com.flipcash.app.contact.verification.internal.email.EmailMagicLinkScreen
 import com.flipcash.app.contact.verification.internal.email.EmailVerificationViewModel
@@ -43,7 +44,7 @@ fun EmailMagicLinkContent(
 
     val analytics = rememberAnalytics()
     LaunchedEffect(Unit) {
-        analytics.onrampVerification(Analytics.OnrampVerificationStep.ConfirmEmail)
+        analytics.track(OnrampEvents.step(OnrampStep.CONFIRM_EMAIL))
     }
 
     Column(

apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/email/EmailVerificationScreen.kt

@@ -8,7 +8,8 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
-import com.flipcash.app.analytics.Analytics
+import com.flipcash.analytics.OnrampStep
+import com.flipcash.analytics.events.OnrampEvents
 import com.flipcash.app.analytics.rememberAnalytics
 import com.flipcash.app.contact.verification.internal.email.EmailEntryScreen
 import com.flipcash.app.contact.verification.internal.email.EmailVerificationViewModel
@@ -56,7 +57,7 @@ fun EmailVerificationContent(
 
     val analytics = rememberAnalytics()
     LaunchedEffect(Unit) {
-        analytics.onrampVerification(Analytics.OnrampVerificationStep.EnterEmail)
+        analytics.track(OnrampEvents.step(OnrampStep.ENTER_EMAIL))
     }
 
     BackHandler {

apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/internal/VerificationIntroScreen.kt

@@ -24,7 +24,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewWrapper
-import com.flipcash.app.analytics.Analytics
+import com.flipcash.analytics.OnrampStep
+import com.flipcash.analytics.events.OnrampEvents
 import com.flipcash.app.analytics.rememberAnalytics
 import com.flipcash.app.core.verification.VerificationResult
 import com.flipcash.app.core.verification.VerificationStep
@@ -55,7 +56,7 @@ fun VerificationIntroScreen(
 
     val analytics = rememberAnalytics()
     LaunchedEffect(Unit) {
-        analytics.onrampVerification(Analytics.OnrampVerificationStep.ShowInfo)
+        analytics.track(OnrampEvents.step(OnrampStep.SHOW_INFO))
     }
 }
 

apps/flipcash/features/contact-verification/src/main/kotlin/com/flipcash/app/contact/verification/internal/phone/PhoneVerificationViewModel.kt

@@ -3,8 +3,8 @@ package com.flipcash.app.contact.verification.internal.phone
 import androidx.compose.foundation.text.input.TextFieldState
 import androidx.compose.runtime.snapshotFlow
 import androidx.lifecycle.viewModelScope
-import com.flipcash.app.analytics.Action
-import com.flipcash.app.analytics.FlipcashAnalyticsService
+import com.flipcash.analytics.events.AccountEvents
+import com.flipcash.app.analytics.FlipcashAnalytics
 import com.flipcash.app.core.extensions.onResult
 import com.flipcash.app.featureflags.FeatureFlagController
 import com.flipcash.app.phone.CountryLocale
@@ -52,7 +52,7 @@ internal class PhoneVerificationViewModel @Inject constructor(
     private val featureFlags: FeatureFlagController,
     private val resources: ResourceHelper,
     private val dispatchers: DispatcherProvider,
-    private val analytics: FlipcashAnalyticsService,
+    private val analytics: FlipcashAnalytics,
 ) : BaseViewModel<PhoneVerificationViewModel.State, PhoneVerificationViewModel.Event>(
     initialState = State(),
     updateStateForEvent = updateStateForEvent,
@@ -189,7 +189,7 @@ internal class PhoneVerificationViewModel @Inject constructor(
 
                     viewModelScope.launch {
                         delay(1.seconds)
-                        analytics.action(Action.VerifiedPhoneNumber)
+                        analytics.track(AccountEvents.verifiedPhoneNumber())
                         dispatchEvent(Event.OnCodeVerified)
                         dispatchEvent(Event.OnVerifyingCodeChanged())
                     }
@@ -239,7 +239,7 @@ internal class PhoneVerificationViewModel @Inject constructor(
             .onResult(
                 onSuccess = {
                     trace(tag = traceTag, message = "linkForPayment succeeded", type = TraceType.Process)
-                    analytics.action(Action.LinkedPhoneNumber)
+                    analytics.track(AccountEvents.linkedPhoneNumber())
                     dispatchEvent(Event.OnPhoneVerificationComplete)
                 },
                 onError = {
@@ -315,7 +315,7 @@ internal class PhoneVerificationViewModel @Inject constructor(
         }
 
         if (!isResend) {
-            analytics.action(Action.EnteredPhoneNumber)
+            analytics.track(AccountEvents.enteredPhoneNumber())
         }
 
         trace(tag = traceTag, message = if (isResend) "Resending verification code" else "Sending verification code", type = TraceType.Process)
@@ -432,4 +432,4 @@ internal class PhoneVerificationViewModel @Inject constructor(
             }
         }
     }
-}
+}