From c9fee330ef024560d5ea6fd6f5ce488f432194f0 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 12 Dec 2023 11:56:07 +0200
Subject: [PATCH] Updated on 2026-08-14

---
 .../main/java/com/tangem/feature/swap/ui/StateBuilder.kt  | 8 ++++++--
 .../com/tangem/feature/swap/viewmodels/SwapViewModel.kt   | 4 +---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
index 38e2ac9240..2837f48f2a 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/ui/StateBuilder.kt
@@ -452,8 +452,12 @@ internal class StateBuilder(
             )
             else -> SwapWarning.GeneralWarning(
                 notificationConfig = NotificationConfig(
-                    title = resourceReference(R.string.common_error),
-                    subtitle = if (dataError.code == DataError.UnknownError.code) {
+                    title = if (dataError is DataError.UnknownError) {
+                        resourceReference(R.string.common_error)
+                    } else {
+                        resourceReference(R.string.warning_express_refresh_required_title)
+                    },
+                    subtitle = if (dataError is DataError.UnknownError) {
                         resourceReference(R.string.swapping_generic_error)
                     } else {
                         resourceReference(R.string.generic_error_code, wrappedList(dataError.code.toString()))
diff --git a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
index ac172210c3..b17c398d2e 100644
--- a/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
+++ b/features/swap/presentation/src/main/java/com/tangem/feature/swap/viewmodels/SwapViewModel.kt
@@ -346,9 +346,7 @@ internal class SwapViewModel @Inject constructor(
                 )
             }
             is SwapState.SwapError -> {
-                if (state.error is DataError.UnknownError) {
-                    singleTaskScheduler.cancelTask()
-                }
+                singleTaskScheduler.cancelTask()
                 uiState = stateBuilder.createQuotesErrorState(
                     uiStateHolder = uiState,
                     swapProvider = provider,