From e52bb2777fe05ae061fa5a885ebffa5bf0046d89 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Fri, 26 Dec 2025 15:54:17 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../tangem/data/pay/repository/DefaultOnboardingRepository.kt | 4 ++--
 .../com/tangem/domain/pay/repository/OnboardingRepository.kt  | 2 +-
 .../child/wallet/model/intents/TangemPayClickIntents.kt       | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultOnboardingRepository.kt b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultOnboardingRepository.kt
index 9b12c88cb6..d877f0f1f3 100644
--- a/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultOnboardingRepository.kt
+++ b/data/visa/src/main/kotlin/com/tangem/data/pay/repository/DefaultOnboardingRepository.kt
@@ -224,13 +224,13 @@ internal class DefaultOnboardingRepository @Inject constructor(
         tangemPayStorage.storeHideOnboardingBanner(userWalletId, hide = true)
     }
 
-    override suspend fun disableTangemPay(userWalletId: UserWalletId): Either<VisaApiError, Any> {
+    override suspend fun disableTangemPay(userWalletId: UserWalletId): Either<VisaApiError, Unit> {
         return requestHelper.performRequest(userWalletId) { authHeader ->
             tangemPayApi.setTangemPayEnabledStatus(
                 authHeader = authHeader,
                 body = SetTangemPayEnabledRequest(isTangemPayEnabled = false),
             )
-        }.onRight {
+        }.map {
             val address = requestHelper.getCustomerWalletAddress(userWalletId)
             tangemPayStorage.clearAll(userWalletId = userWalletId, customerWalletAddress = address)
             setHideMainOnboardingBanner(userWalletId)
diff --git a/domain/visa/src/main/kotlin/com/tangem/domain/pay/repository/OnboardingRepository.kt b/domain/visa/src/main/kotlin/com/tangem/domain/pay/repository/OnboardingRepository.kt
index 1deca6b43a..568cf85006 100644
--- a/domain/visa/src/main/kotlin/com/tangem/domain/pay/repository/OnboardingRepository.kt
+++ b/domain/visa/src/main/kotlin/com/tangem/domain/pay/repository/OnboardingRepository.kt
@@ -34,5 +34,5 @@ interface OnboardingRepository {
 
     suspend fun setHideMainOnboardingBanner(userWalletId: UserWalletId)
 
-    suspend fun disableTangemPay(userWalletId: UserWalletId): Either<VisaApiError, Any>
+    suspend fun disableTangemPay(userWalletId: UserWalletId): Either<VisaApiError, Unit>
 }
\ No newline at end of file
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/TangemPayClickIntents.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/TangemPayClickIntents.kt
index 4664d50c5f..e7a6f9325e 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/TangemPayClickIntents.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/TangemPayClickIntents.kt
@@ -8,6 +8,7 @@ import com.tangem.core.ui.components.bottomsheets.message.*
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.message.DialogMessage
 import com.tangem.core.ui.message.EventMessageAction
+import com.tangem.core.ui.message.ToastMessage
 import com.tangem.core.ui.message.bottomSheetMessage
 import com.tangem.domain.feedback.GetWalletMetaInfoUseCase
 import com.tangem.domain.feedback.SendFeedbackEmailUseCase
@@ -213,6 +214,7 @@ internal class TangemPayClickIntentsImplementor @Inject constructor(
         modelScope.launch {
             tangemPayOnboardingRepository.disableTangemPay(userWalletId)
                 .onRight { tangemPayMainScreenCustomerInfoUseCase.fetch(userWalletId) }
+                .onLeft { uiMessageSender.send(ToastMessage(resourceReference(R.string.common_something_went_wrong))) }
         }
     }
 }
\ No newline at end of file