diff --git a/domain/account/status/src/main/java/com/tangem/domain/account/status/usecase/IsAccountsModeEnabledUseCase.kt b/domain/account/status/src/main/java/com/tangem/domain/account/status/usecase/IsAccountsModeEnabledUseCase.kt
index ae529e245c..6667cb8e2a 100644
--- a/domain/account/status/src/main/java/com/tangem/domain/account/status/usecase/IsAccountsModeEnabledUseCase.kt
+++ b/domain/account/status/src/main/java/com/tangem/domain/account/status/usecase/IsAccountsModeEnabledUseCase.kt
@@ -54,7 +54,6 @@ class IsAccountsModeEnabledUseCase(
             is PaymentAccountStatusValue.IssuingCard,
             is PaymentAccountStatusValue.Loaded,
             is PaymentAccountStatusValue.Loading,
-            is PaymentAccountStatusValue.Locked,
             is PaymentAccountStatusValue.UnderReview,
             -> true
         }
diff --git a/features/approval/impl/src/test/kotlin/com/tangem/features/approval/impl/model/GiveApprovalModelTest.kt b/features/approval/impl/src/test/kotlin/com/tangem/features/approval/impl/model/GiveApprovalModelTest.kt
index fc097acb8c..cf09525c4c 100644
--- a/features/approval/impl/src/test/kotlin/com/tangem/features/approval/impl/model/GiveApprovalModelTest.kt
+++ b/features/approval/impl/src/test/kotlin/com/tangem/features/approval/impl/model/GiveApprovalModelTest.kt
@@ -41,7 +41,6 @@ class GiveApprovalModelTest {
     private val getFeeForGaslessUseCase: GetFeeForGaslessUseCase = mockk(relaxed = true)
     private val getFeeForTokenUseCase: GetFeeForTokenUseCase = mockk(relaxed = true)
     private val createAndSendGaslessTransactionUseCase: CreateAndSendGaslessTransactionUseCase = mockk(relaxed = true)
-    private val uiMessageSender: UiMessageSender = mockk(relaxed = true)
     private val urlOpener: UrlOpener = mockk(relaxed = true)
     private val analyticsEventHandler: AnalyticsEventHandler = mockk(relaxed = true)
     private val feeSelectorReloadTrigger: FeeSelectorReloadTrigger = mockk(relaxed = true)
@@ -81,7 +80,6 @@ class GiveApprovalModelTest {
         getFeeForGaslessUseCase = getFeeForGaslessUseCase,
         getFeeForTokenUseCase = getFeeForTokenUseCase,
         createAndSendGaslessTransactionUseCase = createAndSendGaslessTransactionUseCase,
-        uiMessageSender = uiMessageSender,
         urlOpener = urlOpener,
         getUserWalletUseCase = getUserWalletUseCase,
         analyticsEventHandler = analyticsEventHandler,
diff --git a/features/swap/impl/src/main/java/com/tangem/feature/swap/choosetoken/impl/converter/ChooseTokenListItemConverter.kt b/features/swap/impl/src/main/java/com/tangem/feature/swap/choosetoken/impl/converter/ChooseTokenListItemConverter.kt
index 3ad65aa9dd..277772d1df 100644
--- a/features/swap/impl/src/main/java/com/tangem/feature/swap/choosetoken/impl/converter/ChooseTokenListItemConverter.kt
+++ b/features/swap/impl/src/main/java/com/tangem/feature/swap/choosetoken/impl/converter/ChooseTokenListItemConverter.kt
@@ -186,6 +186,7 @@ internal class ChooseTokenListItemConverter(
             PaymentAccountStatusValue.NotCreated,
             is PaymentAccountStatusValue.UnderReview,
             PaymentAccountStatusValue.Loading,
+            PaymentAccountStatusValue.Empty,
             -> return null
             is PaymentAccountStatusValue.Loaded -> status.cryptoCurrencyStatus
         }
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetMultiWalletWarningsFactory.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetMultiWalletWarningsFactory.kt
index 5f27a893f7..193dfee657 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetMultiWalletWarningsFactory.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/GetMultiWalletWarningsFactory.kt
@@ -27,8 +27,6 @@ import com.tangem.domain.notifications.repository.NotificationsRepository
 import com.tangem.domain.promo.ShouldShowPromoWalletUseCase
 import com.tangem.domain.promo.models.PromoId
 import com.tangem.domain.settings.IsReadyToShowRateAppUseCase
-import com.tangem.domain.tokensync.model.TokenSyncProgress
-import com.tangem.domain.tokensync.usecase.ObserveTokenSyncUseCase
 import com.tangem.domain.assetsdiscovery.model.AssetsDiscoveryProgress
 import com.tangem.domain.assetsdiscovery.usecase.ObserveAssetsDiscoveryUseCase
 import com.tangem.domain.wallets.usecase.IsNeedToBackupUseCase