From 57d7e90fdaaf2228d85214016ca418cc408191db Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 20 Oct 2020 19:42:04 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 2 +- .../wallet/models/PendingTransaction.kt | 16 +++++++++----- .../wallet/ui/PendingTransactionsAdapter.kt | 9 +++++--- build.gradle | 22 ++++++++++++++++++- 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 99b43a1293..491da0a3f7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,7 +67,7 @@ dependencies { implementation 'com.google.android.material:material:1.2.1' coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10' - implementation 'com.tangem:blockchain:1.83.0' + implementation 'com.tangem:blockchain:1.96.0' implementation 'com.tangem:core:1.68.0' implementation 'com.tangem:sdk:1.68.0' diff --git a/app/src/main/java/com/tangem/tap/features/wallet/models/PendingTransaction.kt b/app/src/main/java/com/tangem/tap/features/wallet/models/PendingTransaction.kt index afa8bd8e17..6c56a9be65 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/models/PendingTransaction.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/models/PendingTransaction.kt @@ -11,15 +11,21 @@ data class PendingTransaction( val type: PendingTransactionType ) -enum class PendingTransactionType { Incoming, Outcoming } +enum class PendingTransactionType { Incoming, Outgoing, Unknown } fun TransactionData.toPendingTransaction(walletAddress: String): PendingTransaction? { if (this.status == TransactionStatus.Confirmed) return null - val type: PendingTransactionType = if (this.sourceAddress == walletAddress) { - PendingTransactionType.Outcoming - } else { - PendingTransactionType.Incoming + val type: PendingTransactionType = when { +// this.sourceAddress == walletAddress -> { +// PendingTransactionType.Outgoing +// } +// this.destinationAddress == walletAddress -> { +// PendingTransactionType.Incoming +// } + else -> { + PendingTransactionType.Unknown + } } val address = if (this.sourceAddress == walletAddress) { this.destinationAddress diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/PendingTransactionsAdapter.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/PendingTransactionsAdapter.kt index 66b0a11d9c..f6290b5eb9 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/PendingTransactionsAdapter.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/PendingTransactionsAdapter.kt @@ -42,15 +42,18 @@ class PendingTransactionsAdapter fun bind(transaction: PendingTransaction) { val transactionDescriptionRes = when (transaction.type) { PendingTransactionType.Incoming -> R.string.wallet_pending_tx_receiving - PendingTransactionType.Outcoming -> R.string.wallet_pending_tx_sending + PendingTransactionType.Outgoing -> R.string.wallet_pending_tx_sending + PendingTransactionType.Unknown -> return } val transactionAddressRes = when (transaction.type) { PendingTransactionType.Incoming -> R.string.wallet_pending_tx_receiving_address_format - PendingTransactionType.Outcoming -> R.string.wallet_pending_tx_sending_address_format + PendingTransactionType.Outgoing -> R.string.wallet_pending_tx_sending_address_format + PendingTransactionType.Unknown -> return } val image = when (transaction.type) { PendingTransactionType.Incoming -> R.drawable.ic_arrow_left - PendingTransactionType.Outcoming -> R.drawable.ic_arrow_right_20 + PendingTransactionType.Outgoing -> R.drawable.ic_arrow_right_20 + PendingTransactionType.Unknown -> return } view.tv_pending_transaction.text = view.context.getString(transactionDescriptionRes) diff --git a/build.gradle b/build.gradle index 54ce67f5fc..ca088a1567 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,27 @@ allprojects { google() jcenter() maven { url 'https://jitpack.io' } - maven { url "https://api.bitbucket.org/2.0/repositories/tangem/maven_repository/src/releases" } + def nexusUser = "viewer" + def nexusPass = "smartcash124" + repositories { + google() + jcenter() + maven { + credentials { + username = nexusUser + password = nexusPass + } + url "https://nexus.tangem.com/repository/maven-releases/" + } + maven { + credentials { + username = nexusUser + password = nexusPass + } + url "https://nexus.tangem.com/repository/maven-snapshots/" + } + maven { url 'https://jitpack.io' } + } } }