Updated on 2026-08-14

app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectAction.kt

@@ -9,9 +9,7 @@ import org.rekotlin.Action
 sealed class WalletConnectAction : Action {
     data class HandleDeepLink(val wcUri: String?) : WalletConnectAction()
 
-    data class StartWalletConnect(
-        val copiedUri: String?,
-    ) : WalletConnectAction()
+    data object StartWalletConnect : WalletConnectAction()
 
     data class OpenSession(
         val wcUri: String,
@@ -24,7 +22,6 @@ sealed class WalletConnectAction : Action {
 
     data class RejectRequest(val topic: String, val id: Long) : WalletConnectAction()
 
-    data class ShowClipboardOrScanQrDialog(val wcUri: String) : WalletConnectAction()
     //region WalletConnect 2.0
     data class ApproveProposal(val proposal: WalletConnectEvents.SessionProposal) : WalletConnectAction()
     data object RejectProposal : WalletConnectAction()

app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt

@@ -3,7 +3,6 @@ package com.tangem.tap.features.details.redux.walletconnect
 import com.tangem.blockchain.common.WalletManager
 import com.tangem.blockchainsdk.utils.toNetworkId
 import com.tangem.common.routing.AppRoute
-import com.tangem.domain.qrscanning.models.SourceType
 import com.tangem.tap.common.extensions.dispatchNavigationAction
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.inject
@@ -57,22 +56,10 @@ class WalletConnectMiddleware {
                 walletConnectInteractor.disconnectSession(action.topic)
             }
             is WalletConnectAction.StartWalletConnect -> {
-                val uri = action.copiedUri
-                if (uri != null && isWalletConnectUri(uri)) {
-                    store.dispatchOnMain(WalletConnectAction.ShowClipboardOrScanQrDialog(uri))
-                } else {
-                    store.dispatchNavigationAction { push(AppRoute.QrScanning(SourceType.WALLET_CONNECT)) }
+                store.dispatchNavigationAction {
+                    push(AppRoute.QrScanning(AppRoute.QrScanning.Source.WalletConnect))
                 }
             }
-            is WalletConnectAction.ShowClipboardOrScanQrDialog -> {
-                store.dispatchOnMain(
-                    GlobalAction.ShowDialog(
-                        WalletConnectDialog.ClipboardOrScanQr(
-                            action.wcUri,
-                        ),
-                    ),
-                )
-            }
             is WalletConnectAction.OpenSession -> {
                 val index = action.wcUri.indexOf("@")
                 when (action.wcUri[index + 1]) {
@@ -197,8 +184,4 @@ class WalletConnectMiddleware {
 
         return walletManagerFacade.getStoredWalletManagers(userWallet.walletId)
     }
-
-    private fun isWalletConnectUri(uri: String): Boolean {
-        return walletConnectInteractor.isWalletConnectUri(uri)
-    }
 }

app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectState.kt

@@ -83,7 +83,6 @@ data class WalletForSession(
 
 sealed class WalletConnectDialog : StateDialog {
     data object UnsupportedWcVersion : WalletConnectDialog()
-    data class ClipboardOrScanQr(val clipboardUri: String) : WalletConnectDialog()
     data object UnsupportedCard : WalletConnectDialog()
     data class UnsupportedNetwork(val networks: List<String>? = null) : WalletConnectDialog()
     data object UnsupportedDapp : WalletConnectDialog()

app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/model/CardSettingsModel.kt

@@ -20,6 +20,7 @@ import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.settings.repositories.SettingsRepository
 import com.tangem.domain.wallets.builder.UserWalletIdBuilder
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
+import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
 import com.tangem.sdk.api.TangemSdkManager
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Settings
@@ -55,6 +56,7 @@ internal class CardSettingsModel @Inject constructor(
     private val getUserWalletUseCase: GetUserWalletUseCase,
     private val cardSdkConfigRepository: CardSdkConfigRepository,
     private val settingsRepository: SettingsRepository,
+    private val onboardingV2FeatureToggles: OnboardingV2FeatureToggles,
 ) : Model() {
 
     private val params = paramsContainer.require<CardSettingsComponent.Params>()
@@ -198,13 +200,24 @@ internal class CardSettingsModel @Inject constructor(
         }
 
         if (scanResponse.cardTypesResolver.isTangemTwins()) {
-            // needs to prepare twin state if it's twin cards (depends on onboarding refactoring)
-            store.dispatch(TwinCardsAction.IfTwinsPrepareState(scanResponse))
-            store.dispatch(TwinCardsAction.SetMode(CreateTwinWalletMode.RecreateWallet(scanResponse)))
+            if (onboardingV2FeatureToggles.isTwinRefactoringEnabled) {
+                store.dispatchNavigationAction {
+                    push(
+                        AppRoute.Onboarding(
+                            scanResponse = scanResponse,
+                            mode = AppRoute.Onboarding.Mode.RecreateWalletTwin,
+                        ),
+                    )
+                }
+            } else {
+                // needs to prepare twin state if it's twin cards (depends on onboarding refactoring)
+                store.dispatch(TwinCardsAction.IfTwinsPrepareState(scanResponse))
+                store.dispatch(TwinCardsAction.SetMode(CreateTwinWalletMode.RecreateWallet(scanResponse)))
 
-            cardSettingsInteractor.clear()
+                cardSettingsInteractor.clear()
 
-            store.dispatchNavigationAction { push(AppRoute.OnboardingTwins) }
+                store.dispatchNavigationAction { push(AppRoute.OnboardingTwins) }
+            }
         } else {
             val card = scanResponse.card
 

app/src/main/java/com/tangem/tap/features/details/ui/resetcard/ResetCardScreen.kt

@@ -140,9 +140,9 @@ private fun ConditionCheckBox(checkedState: Boolean, onCheckedChange: (Boolean)
                 Icon(
                     painter = painterResource(
                         if (checked) {
-                            R.drawable.ic_accepted
+                            R.drawable.ic_accepted_20
                         } else {
-                            R.drawable.ic_unticked
+                            R.drawable.ic_unticked_20
                         },
                     ),
                     contentDescription = null,

app/src/main/java/com/tangem/tap/features/details/ui/securitymode/model/SecurityModeModel.kt

@@ -4,13 +4,15 @@ import androidx.compose.runtime.Stable
 import com.tangem.common.CompletionResult
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.routing.AppRouter
-import com.tangem.core.analytics.Analytics
+import com.tangem.core.analytics.api.AnalyticsErrorHandler
+import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.sdk.api.TangemSdkManager
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Settings
+import com.tangem.tap.common.analytics.events.TangemSdkErrorEvent
 import com.tangem.tap.common.extensions.dispatchNavigationAction
 import com.tangem.tap.features.details.redux.SecurityOption
 import com.tangem.tap.features.details.ui.cardsettings.domain.CardSettingsInteractor
@@ -30,6 +32,8 @@ internal class SecurityModeModel @Inject constructor(
     override val dispatchers: CoroutineDispatcherProvider,
     private val tangemSdkManager: TangemSdkManager,
     private val cardSettingsInteractor: CardSettingsInteractor,
+    private val analyticsEventHandler: AnalyticsEventHandler,
+    private val analyticsErrorHandler: AnalyticsErrorHandler,
 ) : Model() {
 
     private val scannedScanResponse = cardSettingsInteractor.scannedScanResponse.value
@@ -85,14 +89,14 @@ internal class SecurityModeModel @Inject constructor(
             val paramValue = AnalyticsParam.SecurityMode.from(selectedOption)
             when (result) {
                 is CompletionResult.Success -> {
-                    Analytics.send(Settings.CardSettings.SecurityModeChanged(paramValue))
+                    analyticsEventHandler.send(Settings.CardSettings.SecurityModeChanged(paramValue))
 
                     store.dispatchNavigationAction(AppRouter::pop)
                 }
                 is CompletionResult.Failure -> {
                     val error = result.error
                     if (error is TangemSdkError && error !is TangemSdkError.UserCancelled) {
-                        Analytics.send(Settings.CardSettings.SecurityModeChanged(paramValue, error))
+                        analyticsErrorHandler.sendErrorEvent(TangemSdkErrorEvent(error))
                     }
                 }
                 else -> Unit

app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectModel.kt

@@ -4,7 +4,6 @@ import androidx.compose.runtime.Stable
 import arrow.core.getOrElse
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.model.Model
-import com.tangem.core.ui.clipboard.ClipboardManager
 import com.tangem.domain.qrscanning.models.SourceType
 import com.tangem.domain.qrscanning.usecases.ListenToQrScanningUseCase
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
@@ -23,7 +22,6 @@ import javax.inject.Inject
 internal class WalletConnectModel @Inject constructor(
     override val dispatchers: CoroutineDispatcherProvider,
     private val listenToQrScanningUseCase: ListenToQrScanningUseCase,
-    private val clipboardManager: ClipboardManager,
 ) : Model() {
 
     init {
@@ -43,9 +41,7 @@ internal class WalletConnectModel @Inject constructor(
             isLoading = state.loading,
             onRemoveSession = { sessionUri -> onRemoveSession(sessionUri, sessions) },
             onAddSession = {
-                store.dispatch(
-                    WalletConnectAction.StartWalletConnect(copiedUri = clipboardManager.getText()),
-                )
+                store.dispatch(WalletConnectAction.StartWalletConnect)
             },
         )
     }

app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/dialogs/ClipboardOrScanQrDialog.kt

@@ -1,34 +0,0 @@
-package com.tangem.tap.features.details.ui.walletconnect.dialogs
-
-import android.content.Context
-import androidx.appcompat.app.AlertDialog
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.tangem.common.routing.AppRoute
-import com.tangem.domain.qrscanning.models.SourceType
-import com.tangem.tap.common.extensions.dispatchNavigationAction
-import com.tangem.tap.common.redux.global.GlobalAction
-import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
-import com.tangem.tap.store
-import com.tangem.wallet.R
-
-object ClipboardOrScanQrDialog {
-    fun create(wcUri: String, context: Context): AlertDialog {
-        return MaterialAlertDialogBuilder(context, R.style.CustomMaterialDialog).apply {
-            setTitle(context.getString(R.string.common_select_action))
-            setMessage(context.getText(R.string.wallet_connect_clipboard_alert))
-            setPositiveButton(context.getText(R.string.wallet_connect_paste_from_clipboard)) { _, _ ->
-                store.dispatch(
-                    WalletConnectAction.OpenSession(wcUri, WalletConnectAction.OpenSession.SourceType.CLIPBOARD),
-                )
-            }
-            setNegativeButton(context.getText(R.string.wallet_connect_scan_new_code)) { _, _ ->
-                store.dispatchNavigationAction {
-                    push(AppRoute.QrScanning(source = SourceType.WALLET_CONNECT))
-                }
-            }
-            setOnDismissListener {
-                store.dispatch(GlobalAction.HideDialog)
-            }
-        }.create()
-    }
-}