From 70573a3e0eb0b0f75b1f5f260d8feae4d4bc8d05 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 26 Oct 2020 14:31:12 +0300 Subject: [PATCH 1/2] Updated on 2026-08-14 --- app/build.gradle | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4d9c559847..f9cf093569 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -71,8 +71,16 @@ dependencies { coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.10' implementation 'com.tangem:blockchain:1.96.0' - implementation 'com.tangem:core:1.68.0' - implementation 'com.tangem:sdk:1.68.0' + implementation('com.tangem:core') { + version { + strictly '1.73.0' + } + } + implementation('com.tangem:sdk:') { + version { + strictly '1.73.0' + } + } //lifecycle implementation "androidx.lifecycle:lifecycle-runtime:2.2.0" From e012b2859b1a90afb0d3fe9fd6aec7670de6935e Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 26 Oct 2020 14:31:46 +0300 Subject: [PATCH 2/2] Updated on 2026-08-14 --- .../tap/features/send/redux/SendScreenAction.kt | 5 ++--- .../features/wallet/models/PendingTransaction.kt | 16 ++++++++-------- .../wallet/ui/PendingTransactionsAdapter.kt | 3 --- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt b/app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt index e78fb3a81a..911a51af79 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt @@ -2,7 +2,6 @@ package com.tangem.tap.features.send.redux import com.tangem.Message import com.tangem.blockchain.common.Amount -import com.tangem.tangem_sdk_new.ui.animation.VoidCallback import com.tangem.tap.common.redux.ErrorAction import com.tangem.tap.common.redux.ToastNotificationAction import com.tangem.tap.domain.TapError @@ -118,8 +117,8 @@ sealed class SendAction : SendScreenAction { sealed class Dialog : SendAction() { data class ShowTezosWarningDialog( - val reduceCallback: VoidCallback, - val sendAllCallback: VoidCallback, + val reduceCallback: () -> Unit, + val sendAllCallback: () -> Unit, val reduceAmount: BigDecimal, ) : Dialog() object Hide : Dialog() 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 6c56a9be65..715dde0252 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,20 +11,20 @@ data class PendingTransaction( val type: PendingTransactionType ) -enum class PendingTransactionType { Incoming, Outgoing, Unknown } +enum class PendingTransactionType { Incoming, Outgoing } fun TransactionData.toPendingTransaction(walletAddress: String): PendingTransaction? { if (this.status == TransactionStatus.Confirmed) return null val type: PendingTransactionType = when { -// this.sourceAddress == walletAddress -> { -// PendingTransactionType.Outgoing -// } -// this.destinationAddress == walletAddress -> { -// PendingTransactionType.Incoming -// } + this.sourceAddress == walletAddress -> { + PendingTransactionType.Outgoing + } + this.destinationAddress == walletAddress -> { + PendingTransactionType.Incoming + } else -> { - PendingTransactionType.Unknown + return null } } val address = if (this.sourceAddress == walletAddress) { 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 f6290b5eb9..159a4b8f48 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 @@ -43,17 +43,14 @@ class PendingTransactionsAdapter val transactionDescriptionRes = when (transaction.type) { PendingTransactionType.Incoming -> R.string.wallet_pending_tx_receiving 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.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.Outgoing -> R.drawable.ic_arrow_right_20 - PendingTransactionType.Unknown -> return } view.tv_pending_transaction.text = view.context.getString(transactionDescriptionRes)