Updated on 2026-08-14

2024-01-18 16:31:08 +03:00 · 2024-01-18 16:31:08 +03:00 · a17f1290ed
commit a17f1290ed
parent ebbd1bf574
18 changed files with 102 additions and 164 deletions
--- a/app/src/main/java/com/tangem/tap/common/analytics/converters/ParamCardCurrencyConverter.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/converters/ParamCardCurrencyConverter.kt
@ -4,14 +4,15 @@ import com.tangem.blockchain.common.Blockchain
 import com.tangem.domain.common.CardTypesResolver
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.utils.converter.Converter
+import com.tangem.core.analytics.models.AnalyticsParam as CoreAnalyticsParam

 /**
 [REDACTED_AUTHOR]
 */
-class ParamCardCurrencyConverter : Converter<CardTypesResolver, AnalyticsParam.CardCurrency?> {
+class ParamCardCurrencyConverter : Converter<CardTypesResolver, CoreAnalyticsParam.WalletType?> {

-    override fun convert(value: CardTypesResolver): AnalyticsParam.CardCurrency? {
-        if (value.isMultiwalletAllowed()) return AnalyticsParam.CardCurrency.MultiCurrency
+    override fun convert(value: CardTypesResolver): CoreAnalyticsParam.WalletType? {
+        if (value.isMultiwalletAllowed()) return CoreAnalyticsParam.WalletType.MultiCurrency

        val type = when {
            value.isTangemNote() -> AnalyticsParam.CurrencyType.Blockchain(value.getBlockchain())
@ -21,6 +22,6 @@ class ParamCardCurrencyConverter : Converter<CardTypesResolver, AnalyticsParam.C
            else -> null
        } ?: return null

-        return AnalyticsParam.CardCurrency.SingleCurrency(type)
+        return CoreAnalyticsParam.WalletType.SingleCurrency(type.value)
    }
 }
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsParam.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/AnalyticsParam.kt
@ -12,12 +12,6 @@ sealed class AnalyticsParam {
        class Amount(amount: com.tangem.blockchain.common.Amount) : CurrencyType(amount.currencySymbol)
    }

-    // MultiCurrency or CurrencyType
-    sealed class CardCurrency(val value: String) {
-        object MultiCurrency : CardCurrency(value = "Multicurrency")
-        class SingleCurrency(type: CurrencyType) : CardCurrency(type.value)
-    }
-
    sealed class CardBalanceState(val value: String) {
        object Empty : CardBalanceState("Empty")
        object Full : CardBalanceState("Full")
@ -78,62 +72,6 @@ sealed class AnalyticsParam {
        object BlockchainSdk : Error("Blockchain Sdk Error")
    }

-    sealed class ScannedFrom(val value: String) {
-        object Introduction : ScannedFrom("Introduction")
-        object Main : ScannedFrom("Main")
-        object SignIn : ScannedFrom("Sign In")
-        object MyWallets : ScannedFrom("My Wallets")
-    }
-
-    sealed class TxSentFrom(val value: String) {
-        data class Send(
-            override val blockchain: String,
-            override val token: String,
-            override val feeType: FeeType,
-        ) : TxSentFrom("Send"), TxData
-
-        data class Swap(
-            override val blockchain: String,
-            override val token: String,
-            override val feeType: FeeType,
-        ) : TxSentFrom("Swap"), TxData
-
-        data class Approve(
-            override val blockchain: String,
-            override val token: String,
-            override val feeType: FeeType,
-            val permissionType: String,
-        ) : TxSentFrom("Approve"), TxData
-
-        object WalletConnect : TxSentFrom("WalletConnect")
-        object Sell : TxSentFrom("Sell")
-    }
-
-    sealed interface TxData {
-        val blockchain: String
-        val token: String
-        val feeType: FeeType
-    }
-
-    sealed class FeeType(val value: String) {
-        object Fixed : FeeType("Fixed")
-        object Min : FeeType("Min")
-        object Normal : FeeType("Normal")
-        object Max : FeeType("Max")
-
-        companion object {
-            fun fromString(feeType: String): FeeType {
-                return when (feeType) {
-                    Min.value -> Min
-                    Normal.value -> Normal
-                    Max.value -> Max
-                    Fixed.value -> Fixed
-                    else -> Fixed
-                }
-            }
-        }
-    }
-
    sealed class WalletCreationType(val value: String) {
        object PrivateKey : WalletCreationType(value = "Private Key")
        object NewSeed : WalletCreationType(value = "New Seed")
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Basic.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Basic.kt
@ -1,84 +0,0 @@
-package com.tangem.tap.common.analytics.events
-
-import com.tangem.core.analytics.models.AnalyticsEvent
-import com.tangem.core.analytics.models.OneTimeAnalyticsEvent
-import com.tangem.domain.wallets.models.UserWalletId
-
-/**
-[REDACTED_AUTHOR]
- */
-sealed class Basic(
-    event: String,
-    params: Map<String, String> = mapOf(),
-    error: Throwable? = null,
-) : AnalyticsEvent("Basic", event, params, error) {
-
-    class CardWasScanned(
-        source: AnalyticsParam.ScannedFrom,
-    ) : Basic(
-        event = "Card Was Scanned",
-        params = mapOf(
-            AnalyticsParam.SOURCE to source.value,
-        ),
-    )
-
-    class SignedIn(
-        currency: AnalyticsParam.CardCurrency,
-        batch: String,
-        signInType: SignInType,
-        walletsCount: String,
-        hasBackup: Boolean?,
-    ) : Basic(
-        event = "Signed in",
-        params = buildMap {
-            put(AnalyticsParam.CURRENCY, currency.value)
-            put(AnalyticsParam.BATCH, batch)
-            put("Sign in type", signInType.name)
-            put("Wallets Count", walletsCount)
-            if (hasBackup != null) {
-                put("Backuped", if (hasBackup) "Yes" else "No")
-            }
-        },
-    ) {
-        enum class SignInType {
-            Card, Biometric
-        }
-    }
-
-    class ToppedUp(userWalletId: UserWalletId, currency: AnalyticsParam.CardCurrency) :
-        Basic(
-            event = "Topped up",
-            params = mapOf(AnalyticsParam.CURRENCY to currency.value),
-        ),
-        OneTimeAnalyticsEvent {
-
-        override val oneTimeEventId: String = id + userWalletId.stringValue
-    }
-
-    class TransactionSent(sentFrom: AnalyticsParam.TxSentFrom, memoType: MemoType) : Basic(
-        event = "Transaction sent",
-        params = buildMap {
-            this[AnalyticsParam.SOURCE] = sentFrom.value
-            if (sentFrom is AnalyticsParam.TxData) {
-                this[AnalyticsParam.BLOCKCHAIN] = sentFrom.blockchain
-                this[AnalyticsParam.TOKEN] = sentFrom.token
-                this[AnalyticsParam.FEE_TYPE] = sentFrom.feeType.value
-            }
-            if (sentFrom is AnalyticsParam.TxSentFrom.Approve) {
-                this[AnalyticsParam.PERMISSION_TYPE] = sentFrom.permissionType
-            }
-            this["Memo"] = memoType.name
-        },
-    ) {
-        enum class MemoType {
-            Empty, Full, Null
-        }
-    }
-
-    class ScanError(error: Throwable) : Basic(
-        event = "Scan",
-        error = error,
-    )
-
-    class WalletOpened : Basic(event = "Wallet Opened")
-}
--- a/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/global/GlobalMiddleware.kt
@ -10,7 +10,7 @@ import com.tangem.domain.appcurrency.model.AppCurrency
 import com.tangem.domain.common.LogConfig
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.core.analytics.models.Basic
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchOnMain
--- a/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TangemSdkManager.kt
@ -25,7 +25,7 @@ import com.tangem.operations.derivation.DerivationTaskResponse
 import com.tangem.operations.derivation.DeriveMultipleWalletPublicKeysTask
 import com.tangem.operations.pins.SetUserCodeCommand
 import com.tangem.operations.usersetttings.SetUserCodeRecoveryAllowedTask
-import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.core.analytics.models.Basic
 import com.tangem.tap.derivationsFinder
 import com.tangem.tap.domain.tasks.product.CreateProductWalletTask
 import com.tangem.tap.domain.tasks.product.CreateProductWalletTaskResponse
--- a/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapWalletManager.kt
@ -11,7 +11,7 @@ import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.operations.attestation.Attestation
-import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.core.analytics.models.Basic
 import com.tangem.tap.common.extensions.setContext
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect/WalletConnectSdkHelper.kt
@ -16,11 +16,10 @@ import com.tangem.common.extensions.hexToBytes
 import com.tangem.common.extensions.toDecompressedPublicKey
 import com.tangem.common.extensions.toHexString
 import com.tangem.core.analytics.Analytics
+import com.tangem.core.analytics.models.Basic
+import com.tangem.core.analytics.models.Basic.TransactionSent.MemoType
 import com.tangem.domain.common.extensions.fromNetworkId
 import com.tangem.operations.sign.SignHashCommand
-import com.tangem.tap.common.analytics.events.AnalyticsParam
-import com.tangem.tap.common.analytics.events.Basic
-import com.tangem.tap.common.analytics.events.Basic.TransactionSent.MemoType
 import com.tangem.tap.common.extensions.safeUpdate
 import com.tangem.tap.common.extensions.toFormattedString
 import com.tangem.tap.domain.walletconnect.BnbHelper.toWCBinanceTradeOrder
@ -43,6 +42,7 @@ import com.tangem.tap.tangemSdkManager
 import com.tangem.tap.userWalletsListManager
 import timber.log.Timber
 import java.math.BigDecimal
+import com.tangem.core.analytics.models.AnalyticsParam as CoreAnalyticsParam

 class WalletConnectSdkHelper {

@ -178,7 +178,7 @@ class WalletConnectSdkHelper {
        )
        return when (result) {
            SimpleResult.Success -> {
-                val sentFrom = AnalyticsParam.TxSentFrom.WalletConnect
+                val sentFrom = CoreAnalyticsParam.TxSentFrom.WalletConnect
                Analytics.send(Basic.TransactionSent(sentFrom = sentFrom, memoType = MemoType.Null))
                val hash = data.walletManager.wallet.recentTransactions.last().hash
                if (hash?.startsWith(HEX_PREFIX) == true) {
--- a/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/redux/DetailsMiddleware.kt
@ -22,7 +22,8 @@ import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.legacy.isLockedSync
 import com.tangem.tap.*
 import com.tangem.tap.common.analytics.events.AnalyticsParam
-import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.core.analytics.models.AnalyticsParam as CoreAnalyticsParam
+import com.tangem.core.analytics.models.Basic
 import com.tangem.tap.common.analytics.events.Settings
 import com.tangem.tap.common.extensions.dispatchDialogShow
 import com.tangem.tap.common.extensions.dispatchOnMain
@ -517,7 +518,7 @@ class DetailsMiddleware {
        )

        store.state.daggerGraphState.get(DaggerGraphState::scanCardProcessor).scan(
-            analyticsEvent = Basic.CardWasScanned(AnalyticsParam.ScannedFrom.MyWallets),
+            analyticsEvent = Basic.CardWasScanned(CoreAnalyticsParam.ScannedFrom.MyWallets),
            onWalletNotCreated = {
                // No need to rollback policy, continue with the policy set before the card scan
                store.dispatchWithMain(DetailsAction.ScanAndSaveUserWallet.Success)
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt
@ -1,8 +1,8 @@
 package com.tangem.tap.features.home.redux

 import com.tangem.core.analytics.models.AnalyticsEvent
-import com.tangem.tap.common.analytics.events.AnalyticsParam
-import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.core.analytics.models.AnalyticsParam
+import com.tangem.core.analytics.models.Basic
 import com.tangem.tap.common.entities.IndeterminateProgressButton
 import kotlinx.coroutines.CoroutineScope
 import org.rekotlin.Action
--- a/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt
@ -10,7 +10,7 @@ import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.userwallets.UserWalletBuilder
-import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.core.analytics.models.Basic
 import com.tangem.tap.common.analytics.events.IntroductionProcess
 import com.tangem.tap.common.analytics.events.Shop
 import com.tangem.tap.common.entities.IndeterminateProgressButton
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt
@ -14,7 +14,7 @@ import com.tangem.domain.userwallets.UserWalletBuilder
 import com.tangem.domain.userwallets.UserWalletIdBuilder
 import com.tangem.tap.*
 import com.tangem.tap.common.analytics.converters.ParamCardCurrencyConverter
-import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.core.analytics.models.Basic
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.extensions.removeContext
@ -125,7 +125,7 @@ object OnboardingHelper {
        val currency = ParamCardCurrencyConverter().convert(scanResponse.cardTypesResolver)

        if (userWalletId != null && currency != null) {
-            Analytics.send(Basic.ToppedUp(userWalletId, currency))
+            Analytics.send(Basic.ToppedUp(userWalletId.stringValue, currency))
        }
    }

--- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
@ -12,15 +12,14 @@ import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.extensions.SimpleResult
 import com.tangem.common.core.TangemSdkError
 import com.tangem.core.analytics.Analytics
+import com.tangem.core.analytics.models.AnalyticsParam
+import com.tangem.core.analytics.models.Basic
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.domain.common.TapWorkarounds.isStart2Coin
 import com.tangem.domain.common.extensions.minimalAmount
 import com.tangem.domain.common.extensions.withMainContext
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.tokens.legacy.TradeCryptoAction
-import com.tangem.tap.common.analytics.events.AnalyticsParam
-import com.tangem.tap.common.analytics.events.Basic
-import com.tangem.tap.common.analytics.events.Basic.TransactionSent.MemoType
 import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.analytics.events.Token.Send.SelectedCurrency.CurrencyType
 import com.tangem.tap.common.extensions.dispatchDialogShow
@ -340,11 +339,11 @@ private fun sendTransaction(
    }
 }

-private fun getMemoType(transactionExtras: TransactionExtrasState): MemoType {
+private fun getMemoType(transactionExtras: TransactionExtrasState): Basic.TransactionSent.MemoType {
    return when {
-        transactionExtras.isEmpty() -> MemoType.Empty
-        transactionExtras.isNull() -> MemoType.Null
-        else -> MemoType.Full
+        transactionExtras.isEmpty() -> Basic.TransactionSent.MemoType.Empty
+        transactionExtras.isNull() -> Basic.TransactionSent.MemoType.Null
+        else -> Basic.TransactionSent.MemoType.Full
    }
 }

--- a/app/src/main/java/com/tangem/tap/features/send/redux/states/FeeState.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/states/FeeState.kt
@ -2,7 +2,7 @@ package com.tangem.tap.features.send.redux.states

 import com.tangem.blockchain.common.transaction.Fee
 import com.tangem.blockchain.common.transaction.TransactionFee
-import com.tangem.tap.common.analytics.events.AnalyticsParam
+import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.tap.common.entities.ProgressState
 import java.math.BigDecimal

--- a/app/src/main/java/com/tangem/tap/features/signin/redux/SignInAction.kt
+++ b/app/src/main/java/com/tangem/tap/features/signin/redux/SignInAction.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.features.signin.redux

-import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.core.analytics.models.Basic
 import org.rekotlin.Action

 /**
--- a/app/src/main/java/com/tangem/tap/features/signin/redux/SignInState.kt
+++ b/app/src/main/java/com/tangem/tap/features/signin/redux/SignInState.kt
@ -1,6 +1,6 @@
 package com.tangem.tap.features.signin.redux

-import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.core.analytics.models.Basic

 /**
 [REDACTED_AUTHOR]
--- a/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt
@ -7,6 +7,7 @@ import com.tangem.common.doOnResult
 import com.tangem.common.doOnSuccess
 import com.tangem.common.flatMap
 import com.tangem.core.analytics.Analytics
+import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.navigation.AppScreen
 import com.tangem.core.navigation.NavigationAction
 import com.tangem.domain.common.util.cardTypesResolver
@ -15,8 +16,7 @@ import com.tangem.domain.userwallets.UserWalletBuilder
 import com.tangem.domain.wallets.legacy.unlockIfLockable
 import com.tangem.tap.*
 import com.tangem.tap.common.analytics.converters.ParamCardCurrencyConverter
-import com.tangem.tap.common.analytics.events.AnalyticsParam
-import com.tangem.tap.common.analytics.events.Basic
+import com.tangem.core.analytics.models.Basic
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchWithMain
 import com.tangem.tap.common.extensions.onUserWalletSelected
--- a/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt
+++ b/app/src/main/java/com/tangem/tap/proxy/TransactionManagerImpl.kt
@ -27,9 +27,6 @@ import com.tangem.domain.walletmanager.WalletManagersFacade
 import com.tangem.lib.crypto.TransactionManager
 import com.tangem.lib.crypto.models.*
 import com.tangem.lib.crypto.models.transactions.SendTxResult
-import com.tangem.tap.common.analytics.events.AnalyticsParam
-import com.tangem.tap.common.analytics.events.Basic
-import com.tangem.tap.common.analytics.events.Basic.TransactionSent.MemoType
 import com.tangem.tap.common.redux.global.GlobalAction
 import com.tangem.tap.domain.TangemSigner
 import com.tangem.tap.userWalletsListManager
@ -63,12 +60,6 @@ class TransactionManagerImpl(
            gasLimit = txData.gasLimit,
            destinationAddress = txData.destinationAddress,
            dataToSign = txData.dataToSign,
-            successEvent = AnalyticsParam.TxSentFrom.Approve(
-                blockchain = blockchain.fullName,
-                token = analyticsData.tokenSymbol,
-                feeType = AnalyticsParam.FeeType.fromString(analyticsData.feeType),
-                permissionType = analyticsData.permissionType ?: "",
-            ),
        )
    }

@ -86,19 +77,6 @@ class TransactionManagerImpl(
        } else {
            createAmount(txData.amountToSend, txData.currencyToSend, blockchain)
        }
-        val successEvent = if (isSwap) {
-            AnalyticsParam.TxSentFrom.Swap(
-                blockchain = blockchain.fullName,
-                token = analyticsData.tokenSymbol,
-                feeType = AnalyticsParam.FeeType.fromString(analyticsData.feeType),
-            )
-        } else {
-            AnalyticsParam.TxSentFrom.Send(
-                blockchain = blockchain.fullName,
-                token = analyticsData.tokenSymbol,
-                feeType = AnalyticsParam.FeeType.fromString(analyticsData.feeType),
-            )
-        }
        return sendTransactionInternal(
            walletManager = walletManager,
            amount = amount,
@ -107,7 +85,6 @@ class TransactionManagerImpl(
            gasLimit = txData.gasLimit,
            destinationAddress = txData.destinationAddress,
            dataToSign = txData.dataToSign,
-            successEvent = successEvent,
        )
    }

@ -120,7 +97,6 @@ class TransactionManagerImpl(
        gasLimit: Int,
        destinationAddress: String,
        dataToSign: String,
-        successEvent: AnalyticsParam.TxSentFrom,
    ): SendTxResult {
        val txData = walletManager.createTransaction(
            amount = amount,
@ -136,10 +112,7 @@ class TransactionManagerImpl(
            FirebaseCrashlytics.getInstance().recordException(ex)
            return SendTxResult.UnknownError(ex)
        }
-        return handleSendResult(
-            result = sendResult,
-            successEvent = successEvent,
-        )
+        return handleSendResult(result = sendResult)
    }

    override fun getExplorerTransactionLink(networkId: String, txAddress: String): String {
@ -381,10 +354,9 @@ class TransactionManagerImpl(
        }
    }

-    private fun handleSendResult(result: SimpleResult, successEvent: AnalyticsParam.TxSentFrom): SendTxResult {
+    private fun handleSendResult(result: SimpleResult): SendTxResult {
        when (result) {
            is SimpleResult.Success -> {
-                analytics.send(Basic.TransactionSent(sentFrom = successEvent, memoType = MemoType.Null))
                return SendTxResult.Success
            }
            is SimpleResult.Failure -> {