diff --git a/app/src/main/java/com/tangem/tap/TapApplication.kt b/app/src/main/java/com/tangem/tap/TapApplication.kt
index 3ccb770ad4..d2b413e412 100644
--- a/app/src/main/java/com/tangem/tap/TapApplication.kt
+++ b/app/src/main/java/com/tangem/tap/TapApplication.kt
@@ -11,13 +11,13 @@ import com.tangem.blockchain.common.BlockchainSdkConfig
 import com.tangem.blockchain.common.WalletManagerFactory
 import com.tangem.blockchain.network.BlockchainSdkRetrofitBuilder
 import com.tangem.common.json.MoshiJsonConverter
+import com.tangem.core.analytics.Analytics
 import com.tangem.datasource.api.common.MoshiConverter
 import com.tangem.domain.DomainLayer
 import com.tangem.domain.common.LogConfig
 import com.tangem.tap.common.AndroidAssetReader
 import com.tangem.tap.common.AssetReader
 import com.tangem.tap.common.IntentHandler
-import com.tangem.core.analytics.Analytics
 import com.tangem.tap.common.analytics.AnalyticsFactory
 import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
 import com.tangem.tap.common.analytics.filters.BasicSignInFilter
@@ -170,17 +170,6 @@ class TapApplication : Application(), ImageLoaderFactory {
         )
     }
 
-    private fun initMoshiConverter() {
-        fun appAdapters(): List<Any> = listOf(
-            BigDecimalAdapter(),
-            CardBalanceStateAdapter(),
-        )
-        MoshiConverter.reInitInstance(
-            adapters = appAdapters() + MoshiJsonConverter.getTangemSdkAdapters(),
-            typedAdapters = MoshiJsonConverter.getTangemSdkTypedAdapters(),
-        )
-    }
-
     override fun newImageLoader(): ImageLoader {
         return createCoilImageLoader(
             context = this,
diff --git a/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt b/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt
index e9ece28a44..d1b3189ab1 100644
--- a/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt
+++ b/app/src/main/java/com/tangem/tap/common/analytics/handlers/appsFlyer/AppsFlyerAnalyticsHandler.kt
@@ -1,10 +1,9 @@
 package com.tangem.tap.common.analytics.handlers.appsFlyer
 
 import com.appsflyer.AFInAppEventType
+import com.tangem.core.analytics.AnalyticsEvent
 import com.tangem.core.analytics.api.AnalyticsHandler
-import com.tangem.tap.common.analytics.api.AnalyticsHandler
 import com.tangem.tap.common.analytics.api.AnalyticsHandlerBuilder
-import com.tangem.tap.common.analytics.events.AnalyticsEvent
 import com.tangem.tap.common.analytics.events.Shop
 
 class AppsFlyerAnalyticsHandler(
diff --git a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt
index 3ee976483c..b44db4004b 100644
--- a/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/feedback/FeedbackManager.kt
@@ -2,8 +2,8 @@ package com.tangem.tap.common.feedback
 
 import android.content.Context
 import android.os.Build
+import com.tangem.core.analytics.Analytics
 import com.tangem.domain.common.TapWorkarounds
-import com.tangem.tap.common.analytics.Analytics
 import com.tangem.tap.common.extensions.sendEmail
 import com.tangem.tap.common.log.TangemLogCollector
 import com.tangem.tap.common.zendesk.ZendeskConfig
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectFragment.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectFragment.kt
index 4b01e513a2..8b29784828 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectFragment.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectFragment.kt
@@ -9,8 +9,8 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.ui.platform.ComposeView
 import androidx.fragment.app.Fragment
 import androidx.transition.TransitionInflater
+import com.tangem.core.analytics.Analytics
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.tap.common.analytics.Analytics
 import com.tangem.tap.common.analytics.events.WalletConnect
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
diff --git a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt
index 7c816d9210..4af057eb58 100644
--- a/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt
+++ b/app/src/main/java/com/tangem/tap/features/onboarding/OnboardingMenuProvider.kt
@@ -4,7 +4,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.core.view.MenuProvider
-import com.tangem.tap.common.analytics.Analytics
+import com.tangem.core.analytics.Analytics
 import com.tangem.tap.common.analytics.events.Onboarding
 import com.tangem.tap.common.feedback.SupportInfo
 import com.tangem.tap.common.redux.global.GlobalAction
diff --git a/app/src/main/java/com/tangem/tap/features/shop/redux/ShopMiddleware.kt b/app/src/main/java/com/tangem/tap/features/shop/redux/ShopMiddleware.kt
index 5c5a9d72b9..62e21e95e1 100644
--- a/app/src/main/java/com/tangem/tap/features/shop/redux/ShopMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/shop/redux/ShopMiddleware.kt
@@ -1,6 +1,6 @@
 package com.tangem.tap.features.shop.redux
 
-import com.tangem.tap.common.analytics.Analytics
+import com.tangem.core.analytics.Analytics
 import com.tangem.tap.common.analytics.events.Shop
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchOpenUrl
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
index f26b34fa01..dc19d83445 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/WalletMiddleware.kt
@@ -276,7 +276,7 @@ class WalletMiddleware {
                 } else {
                     store.dispatch(newAction)
                     if (newAction is PrepareSendScreen) {
-                        store.state.walletState.getSelectedWalletData()?.currency?.let { currency ->
+                        store.state.walletState.selectedWalletData?.currency?.let { currency ->
                             Analytics.send(Token.ButtonSend(AnalyticsParam.CurrencyType.Currency(currency)))
                         }
                         store.dispatch(NavigationAction.NavigateTo(AppScreen.Send))
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt
index f1a7575391..fb16e8420c 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/models/WalletDialog.kt
@@ -16,7 +16,7 @@ sealed interface WalletDialog : StateDialog {
 
     data class RemoveWalletDialog(
         val currencyTitle: String,
-        val onOk: () -> Unit
+        val onOk: () -> Unit,
     ) : WalletDialog {
         val messageRes: Int = R.string.token_details_hide_alert_message
         val titleRes: Int = R.string.token_details_hide_alert_title
@@ -25,13 +25,13 @@ sealed interface WalletDialog : StateDialog {
 
     data class TokensAreLinkedDialog(
         val currencyTitle: String,
-        val currencySymbol: String
+        val currencySymbol: String,
     ) : WalletDialog {
         val messageRes: Int = R.string.token_details_unable_hide_alert_message
         val titleRes: Int = R.string.token_details_unable_hide_alert_title
     }
 
     data class RussianCardholdersWarningDialog(val data: Data?) : WalletDialog {
-        data class Data(val topUpUrl: String, val blockchain: Blockchain)
+        data class Data(val topUpUrl: String)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
index 0effd1a9ba..a3ffb44b3a 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/WalletWarningConverter.kt
@@ -24,17 +24,14 @@ class WalletWarningConverter(
             is WalletWarning.BalanceNotEnoughForFee -> {
                 context.getString(
                     R.string.token_details_send_blocked_fee_format,
-                    message.tokenName,
                     message.blockchainFullName,
-                    message.tokenName,
                     message.blockchainFullName,
-                    message.blockchainCurrencyName,
                 )
             }
             is WalletWarning.TransactionInProgress -> {
                 context.getString(
                     R.string.token_details_send_blocked_tx_format,
-                    message.currencyName
+                    message.currencyName,
                 )
             }
             is WalletWarning.Rent -> {