From de3d47028aa5db8f173f60addc8f2397e3a60f2e Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 21 Oct 2020 16:01:36 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 app/src/main/java/com/tangem/tap/domain/TapErrors.kt      | 3 ++-
 .../tap/features/send/redux/middlewares/SendMiddleware.kt | 8 +++++---
 app/src/main/res/values/strings.xml                       | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/TapErrors.kt b/app/src/main/java/com/tangem/tap/domain/TapErrors.kt
index 6e5388a40d..35229ce2e6 100644
--- a/app/src/main/java/com/tangem/tap/domain/TapErrors.kt
+++ b/app/src/main/java/com/tangem/tap/domain/TapErrors.kt
@@ -6,7 +6,7 @@ import com.tangem.wallet.R
 
 interface TapErrors
 
-interface ArgError{
+interface ArgError {
     val args: List<Any>?
 }
 
@@ -21,6 +21,7 @@ sealed class TapError(
 ) : Throwable(), TapErrors, ArgError {
 
     object UnknownError : TapError(R.string.send_error_unknown)
+    data class CustomError(val customMessage: String) : TapError(R.string.common_custom_string, listOf(customMessage))
     object PayIdAlreadyCreated : TapError(R.string.wallet_create_payid_error_already_created)
     object PayIdCreatingError : TapError(R.string.wallet_create_payid_error_message)
     object PayIdEmptyField : TapError(R.string.wallet_create_payid_empty)
diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
index aad00d6912..45547fd2bc 100644
--- a/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/send/redux/middlewares/SendMiddleware.kt
@@ -89,7 +89,8 @@ private fun verifyAndSendTransaction(
                             }
                         }
                         is Throwable -> {
-                            val message = (result.error as Throwable).message
+                            val throwable = result.error as Throwable
+                            val message = throwable.message
                             when {
                                 message == null -> {
                                     dispatch(SendAction.SendError(TapError.UnknownError))
@@ -98,8 +99,9 @@ private fun verifyAndSendTransaction(
                                     // user was cancelled the operation by closing the Sdk bottom sheet
                                 }
                                 else -> {
-                                    Timber.e(result.error)
-                                    dispatch(SendAction.SendError(TapError.BlockchainInternalError))
+                                    Timber.e(throwable)
+                                    FirebaseCrashlytics.getInstance().recordException(throwable)
+                                    dispatch(SendAction.SendError(TapError.CustomError(message)))
                                 }
                             }
                         }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8142ff23cc..9af2597610 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -9,6 +9,7 @@
     <string name="common_done">Done</string>
     <string name="common_cancel">Cancel</string>
     <string name="common_accept">Accept</string>
+    <string name="common_custom_string" translatable="false">%s</string>
 
     <string name="common_camera_denied_alert_title">Camera access denied</string>
     <string name="common_camera_denied_alert_message">You have not given access to your camera, please adjust your privacy settings</string>