From 88e5d2c423f6d1062ce6344d60d9b3623bc55e54 Mon Sep 17 00:00:00 2001 From: Tangem Date: Thu, 11 Feb 2021 20:54:06 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 6 +++--- app/src/main/java/com/tangem/tap/domain/TapErrors.kt | 4 ++++ .../tap/features/send/redux/middlewares/SendMiddleware.kt | 5 +++++ app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 7 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1ea7808851..f0431b15cf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -71,9 +71,9 @@ dependencies { implementation 'com.google.android.material:material:1.2.1' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.1' - implementation 'com.tangem:blockchain:1.130.0' - implementation 'com.tangem:core:1.99.0' - implementation 'com.tangem:sdk:1.99.0' + implementation 'com.tangem:blockchain:1.140.0' + implementation 'com.tangem:core:1.100.0' + implementation 'com.tangem:sdk:1.100.0' // WebView implementation "androidx.browser:browser:1.3.0" 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 35229ce2e6..37f159fdb8 100644 --- a/app/src/main/java/com/tangem/tap/domain/TapErrors.kt +++ b/app/src/main/java/com/tangem/tap/domain/TapErrors.kt @@ -38,6 +38,10 @@ sealed class TapError( object DustChange : TapError(R.string.send_error_dust_change) data class CreateAccountUnderfunded(override val args: List) : TapError(R.string.send_error_no_target_account) + sealed class XmlError { + object AssetAccountNotCreated: TapError(R.string.send_error_no_account_xlm) + } + data class ValidateTransactionErrors( override val errorList: List, override val builder: (List) -> String 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 65b9f4d9e6..2af762a25c 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 @@ -140,6 +140,11 @@ private fun sendTransaction( message.contains("50002") -> { // user was cancelled the operation by closing the Sdk bottom sheet } + // make it easier latter by handling an appropriate enumError or, like on iOS, + // accept a string identifier of the error message + message.contains("Target account is not created. To create account send 1+ XLM.")-> { + dispatch(SendAction.SendError(TapError.XmlError.AssetAccountNotCreated)) + } else -> { Timber.e(throwable) FirebaseCrashlytics.getInstance().recordException(throwable) diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ae4aa7218f..df6ab33618 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -73,6 +73,7 @@ %s %s und %s %s werden gesendet Bilanz: %s %s Die Transaktion wurde erfolgreich signiert und an den Blockchain-Knoten gesendet. Die Walletbilanz wird aktualisiert + Um ein Konto zu erstellen, senden Sie 1+ XLM an diese Adresse Details KartenID Emittent diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 043edee6a3..ffbe678287 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -74,6 +74,7 @@ Sera envoyé %s %s et %s %s Solde : %s %s La transaction a été signée avec succès et envoyée au nœud de blockchain. Le solde du portefeuille sera mis à jour après un certain temps + Pour créer un compte, envoyez 1+ XLM à cette adresse Référénces ID de la carte Emetteur diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 1d53fde617..7c683849f7 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -71,6 +71,7 @@ Sarà inviato %1$s %2$s e %1$s %2$s Saldo: %1$s %2$s La transazione è stata firmata con successo e inviata al nodo blockchain. Il saldo del portafoglio verrà aggiornato dopo un po\' di tempo + Per creare un account, invia 1+ XLM a questo indirizzo Requisiti ID carta Emittente diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05ea986b66..690be865b5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -188,6 +188,7 @@ Invalid Fee Minimum amount is %s Change is too small + To create account send 1+ XLM to this address Address was copied to clipboard