Updated on 2026-08-14

2023-03-30 10:15:48 +03:00 · 2023-03-30 10:15:48 +03:00 · 0625a92045
commit 0625a92045
parent 378e1165b7 d2baa177a4
199 changed files with 3829 additions and 2255 deletions
--- 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
@ -24,6 +24,8 @@ sealed class AnalyticsParam {
    sealed class CardBalanceState(val value: String) {
        object Empty : CardBalanceState("Empty")
        object Full : CardBalanceState("Full")
+        object CustomToken : CardBalanceState("Custom token")
+        object BlockchainError : CardBalanceState("Blockchain error")
        companion object
    }

@ -79,6 +81,7 @@ sealed class AnalyticsParam {

    companion object Key {
        const val Source = "Source"
+        const val Balance = "Balance"
        const val Batch = "Batch"
        const val ProductType = "Product Type"
        const val Firmware = "Firmware"
--- 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
@ -11,6 +11,13 @@ sealed class Basic(
    error: Throwable? = null,
 ) : AnalyticsEvent("Basic", event, params, error) {

+    class BalanceLoaded(balance: AnalyticsParam.CardBalanceState) : Basic(
+        event = "Balance Loaded",
+        params = mapOf(
+            AnalyticsParam.Balance to balance.value,
+        ),
+    )
+
    class CardWasScanned(
        source: AnalyticsParam.ScannedFrom,
    ) : Basic(
@ -51,4 +58,6 @@ sealed class Basic(
        event = "Scan",
        error = error,
    )
+
+    class WalletOpened : Basic(event = "Wallet Opened")
 }
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/MainScreen.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/MainScreen.kt
@ -11,7 +11,6 @@ sealed class MainScreen(
 ) : AnalyticsEvent("Main Screen", event, params) {

    class ScreenOpened : MainScreen("Screen opened")
-
    class ButtonScanCard : MainScreen("Button - Scan Card")
    class ButtonMyWallets : MainScreen("Button - My Wallets")
    class ButtonBuy : MainScreen("Button - Buy")
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Onboarding.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Onboarding.kt
@ -71,16 +71,16 @@ sealed class Onboarding(
    class ButtonSetPinCode : Onboarding("Onboarding", "Button - Set PIN Code")
    class CardConnectionScreenOpened : Onboarding("Onboarding", "Card Connection Screen Opened")
    class ButtonConnect : Onboarding("Onboarding", "Button - Connect")
-    class PinCodeSet : Onboarding("Onboarding", "PIN code set")
+    class PinCodeSet : Onboarding("Onboarding", "PIN Code Set")

    class KYCScreenOpened : Onboarding("Onboarding", "KYC screen opened")
-    class KYCStarted : Onboarding("Onboarding", "KYC started")
-    class KYCInProgress : Onboarding("Onboarding", "KYC in progress")
-    class KYCRejected : Onboarding("Onboarding", "KYC rejected")
+    class KYCStarted : Onboarding("Onboarding", "KYC Started")
+    class KYCInProgress : Onboarding("Onboarding", "KYC In Progress")
+    class KYCRejected : Onboarding("Onboarding", "KYC Rejected")

-    class ClaimScreenOpened : Onboarding("Onboarding", "Claim screen opened")
+    class ClaimScreenOpened : Onboarding("Onboarding", "Claim Screen Opened")
    class ButtonClaim : Onboarding("Onboarding", "Button - Claim")
-    class ClaimWasSuccessfully : Onboarding("Onboarding", "Claim was successfully")
+    class ClaimWasSuccessfully : Onboarding("Onboarding", "Claim Was Successfully")

    class ButtonChat : Onboarding("Onboarding", "Button - Chat")

--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Settings.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Settings.kt
@ -60,16 +60,16 @@ sealed class Settings(
        params: Map<String, String> = mapOf(),
    ) : Settings(category = "Settings / App Settings", event = event, params = params) {

-        class SaveWalletSwitcherChanged(state: AnalyticsParam.OnOffState) : CardSettings(
+        class SaveWalletSwitcherChanged(state: AnalyticsParam.OnOffState) : AppSettings(
            event = "Save Wallet Switcher Changed",
            params = mapOf("State" to state.value),
        )

-        class SaveAccessCodeSwitcherChanged(state: AnalyticsParam.OnOffState) : CardSettings(
+        class SaveAccessCodeSwitcherChanged(state: AnalyticsParam.OnOffState) : AppSettings(
            event = "Save Access Code Switcher Changed",
            params = mapOf("State" to state.value),
        )

-        object ButtonEnableBiometricAuthentication : AppSettings("Button - Enable Biometric Authentication")
+        object ButtonEnableBiometricAuthentication : AppSettings(event = "Button - Enable Biometric Authentication")
    }
 }
--- a/app/src/main/java/com/tangem/tap/common/analytics/events/Token.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/events/Token.kt
@ -48,7 +48,7 @@ sealed class Token(

    class Bought(type: CurrencyType) : Token(
        category = "Token",
-        event = "Token bought",
+        event = "Token Bought",
        params = mapOf("Token" to type.value),
    )

--- a/app/src/main/java/com/tangem/tap/common/compose/extensions/Painter.kt
+++ b/app/src/main/java/com/tangem/tap/common/compose/extensions/Painter.kt
@ -5,8 +5,8 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
-import com.tangem.tangem_sdk_new.extensions.dpToPx
-import com.tangem.tangem_sdk_new.extensions.pxToDp
+import com.tangem.sdk.extensions.dpToPx
+import com.tangem.sdk.extensions.pxToDp

 /**
 [REDACTED_AUTHOR]
--- a/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Blockchain.kt
@ -36,6 +36,7 @@ fun Blockchain.getGreyedOutIconRes(): Int {
        Blockchain.Kusama -> R.drawable.ic_kusama_no_color
        Blockchain.Optimism, Blockchain.OptimismTestnet -> R.drawable.ic_optimism_no_color
        Blockchain.Dash -> R.drawable.ic_dash_no_color
+        Blockchain.Kaspa -> R.drawable.ic_kaspa_no_color
        else -> R.drawable.ic_tangem_logo
    }
 }
--- a/app/src/main/java/com/tangem/tap/common/extensions/Store.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/Store.kt
@ -42,8 +42,12 @@ fun Store<*>.dispatchNotification(resId: Int) {
    dispatchOnMain(GlobalAction.ShowNotification(resId))
 }

-suspend fun Store<AppState>.onUserWalletSelected(userWallet: UserWallet, refresh: Boolean = false) {
-    state.globalState.tapWalletManager.onWalletSelected(userWallet, refresh)
+suspend fun Store<AppState>.onUserWalletSelected(
+    userWallet: UserWallet,
+    refresh: Boolean = false,
+    sendAnalyticsEvent: Boolean = false,
+) {
+    state.globalState.tapWalletManager.onWalletSelected(userWallet, refresh, sendAnalyticsEvent)
 }

 fun Store<*>.dispatchToastNotification(resId: Int) {
--- a/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/extensions/WalletManager.kt
@ -16,8 +16,8 @@ import com.tangem.tap.features.demo.isDemoCard
 import com.tangem.tap.features.wallet.models.Currency
 import com.tangem.tap.features.wallet.redux.AddressData
 import com.tangem.tap.features.wallet.redux.reducers.createAddressesData
-import com.tangem.tap.network.NetworkConnectivity
 import com.tangem.tap.network.exchangeServices.CurrencyExchangeManager
+import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.tap.store
 import kotlinx.coroutines.delay
 import timber.log.Timber
@ -47,7 +47,8 @@ suspend fun WalletManager.safeUpdate(): Result<Wallet> = try {
 } catch (exception: Exception) {
    Timber.e(exception)

-    if (!NetworkConnectivity.getInstance().isOnlineOrConnecting()) {
+    val networkConnectionManager = store.state.daggerGraphState.get(DaggerGraphState::networkConnectionManager)
+    if (!networkConnectionManager.isOnline) {
        Result.Failure(TapError.NoInternetConnection)
    } else {
        val blockchain = wallet.blockchain
@ -87,8 +88,6 @@ fun WalletManager?.getAddressData(): AddressData? {
    return if (addressDataList.isEmpty()) null else addressDataList[0]
 }

-fun WalletManager.getTxHistory(currency: Currency): List<TransactionData> = wallet.getTxHistory(currency)
-
 fun WalletManager.getBlockchainTxHistory(): List<TransactionData> = wallet.getBlockchainTxHistory()

 fun WalletManager.getTokenTxHistory(token: Token): List<TransactionData> = wallet.getTokenTxHistory(token)
--- a/app/src/main/java/com/tangem/tap/common/leapfrogWidget/TestLeapfrogFragment.kt
+++ b/app/src/main/java/com/tangem/tap/common/leapfrogWidget/TestLeapfrogFragment.kt
@ -6,8 +6,8 @@ import android.widget.FrameLayout
 import androidx.fragment.app.Fragment
 import androidx.transition.TransitionInflater
 import by.kirich1409.viewbindingdelegate.viewBinding
-import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidget
-import com.tangem.tangem_sdk_new.ui.widget.leapfrogWidget.LeapfrogWidgetState
+import com.tangem.sdk.ui.widget.leapfrogWidget.LeapfrogWidget
+import com.tangem.sdk.ui.widget.leapfrogWidget.LeapfrogWidgetState
 import com.tangem.tap.domain.twins.TwinsCardWidget
 import com.tangem.wallet.R
 import com.tangem.wallet.databinding.TestLeapfrogFragmentBinding
--- a/app/src/main/java/com/tangem/tap/common/recyclerView/SpaceItemDecoration.kt
+++ b/app/src/main/java/com/tangem/tap/common/recyclerView/SpaceItemDecoration.kt
@ -3,7 +3,7 @@ package com.tangem.tap.common.recyclerView
 import android.graphics.Rect
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
-import com.tangem.tangem_sdk_new.extensions.dpToPx
+import com.tangem.sdk.extensions.dpToPx

 class SpaceItemDecoration(
    private val horizontalSpaceDp: Float,
--- a/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt
@ -20,6 +20,7 @@ import com.tangem.tap.features.wallet.redux.reducers.WalletReducer
 import com.tangem.tap.features.walletSelector.redux.WalletSelectorReducer
 import com.tangem.tap.features.welcome.redux.WelcomeReducer
 import com.tangem.tap.proxy.AppStateHolder
+import com.tangem.tap.proxy.redux.DaggerGraphReducer
 import org.rekotlin.Action

 fun appReducer(action: Action, state: AppState?, appStateHolder: AppStateHolder): AppState {
@ -46,6 +47,7 @@ fun appReducer(action: Action, state: AppState?, appStateHolder: AppStateHolder)
        walletSelectorState = WalletSelectorReducer.reduce(action, state),
        sprinklrState = SprinklrReducer.reduce(action, state),
        signInState = SignInReducer.reduce(action, state),
+        daggerGraphState = DaggerGraphReducer.reduce(action, state),
    )
 }

--- a/app/src/main/java/com/tangem/tap/common/redux/AppState.kt
+++ b/app/src/main/java/com/tangem/tap/common/redux/AppState.kt
@ -43,6 +43,8 @@ import com.tangem.tap.features.walletSelector.redux.WalletSelectorMiddleware
 import com.tangem.tap.features.walletSelector.redux.WalletSelectorState
 import com.tangem.tap.features.welcome.redux.WelcomeMiddleware
 import com.tangem.tap.features.welcome.redux.WelcomeState
+import com.tangem.tap.proxy.redux.DaggerGraphMiddleware
+import com.tangem.tap.proxy.redux.DaggerGraphState
 import com.tangem.utils.coroutines.AppCoroutineDispatcherProvider
 import org.rekotlin.Middleware
 import org.rekotlin.StateType
@ -66,7 +68,8 @@ data class AppState(
    val saveWalletState: SaveWalletState = SaveWalletState(),
    val walletSelectorState: WalletSelectorState = WalletSelectorState(),
    val sprinklrState: SprinklrState = SprinklrState(),
-    val signInState: SignInState = SignInState()
+    val signInState: SignInState = SignInState(),
+    val daggerGraphState: DaggerGraphState = DaggerGraphState(),
 ) : StateType {

    val domainState: DomainState
@ -108,7 +111,8 @@ data class AppState(
                LockUserWalletsTimerMiddleware().middleware,
                AccessCodeRequestPolicyMiddleware().middleware,
                SprinklrMiddleware().middleware,
-                SignInMiddleware.middleware
+                SignInMiddleware.middleware,
+                DaggerGraphMiddleware.daggerGraphMiddleware,
            )
        }
    }