From 70573a3e0eb0b0f75b1f5f260d8feae4d4bc8d05 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 26 Oct 2020 14:31:12 +0300 Subject: [PATCH 1/4] 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/4] 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) From bdbe22797bc192faea275a216472cfa68fdcd2fa Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 27 Oct 2020 10:10:14 +0300 Subject: [PATCH 3/4] Updated on 2026-08-14 --- .../tap/features/wallet/models/PendingTransaction.kt | 10 +++++++--- .../tangem/tap/features/wallet/redux/WalletReducer.kt | 3 ++- .../features/wallet/ui/PendingTransactionsAdapter.kt | 10 +++++++++- 3 files changed, 18 insertions(+), 5 deletions(-) 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 715dde0252..21cdc9d649 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,7 +11,7 @@ data class PendingTransaction( val type: PendingTransactionType ) -enum class PendingTransactionType { Incoming, Outgoing } +enum class PendingTransactionType { Incoming, Outgoing, Unknown } fun TransactionData.toPendingTransaction(walletAddress: String): PendingTransaction? { if (this.status == TransactionStatus.Confirmed) return null @@ -24,7 +24,7 @@ fun TransactionData.toPendingTransaction(walletAddress: String): PendingTransact PendingTransactionType.Incoming } else -> { - return null + PendingTransactionType.Unknown } } val address = if (this.sourceAddress == walletAddress) { @@ -41,6 +41,10 @@ fun TransactionData.toPendingTransaction(walletAddress: String): PendingTransact ) } -fun List.toPendingTransactions(walletAddress: String): List{ +fun List.toPendingTransactions(walletAddress: String): List { return this.mapNotNull { it.toPendingTransaction(walletAddress) } +} + +fun List.removeUnknownTransactions(): List { + return this.filter { it.type != PendingTransactionType.Unknown } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt index b8f66e0aeb..326d692604 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt @@ -11,6 +11,7 @@ import com.tangem.tap.common.extensions.toFormattedString import com.tangem.tap.common.extensions.toQrCode import com.tangem.tap.common.redux.AppState import com.tangem.tap.domain.TapError +import com.tangem.tap.features.wallet.models.removeUnknownTransactions import com.tangem.tap.features.wallet.models.toPendingTransactions import com.tangem.tap.features.wallet.ui.BalanceStatus import com.tangem.tap.features.wallet.ui.BalanceWidgetData @@ -244,7 +245,7 @@ private fun onWalletLoaded(wallet: Wallet, walletState: WalletState): WalletStat token = tokenData, fiatAmount = fiatAmount ), - pendingTransactions = pendingTransactions, + pendingTransactions = pendingTransactions.removeUnknownTransactions(), mainButton = WalletMainButton.SendButton(sendButtonEnabled) ) } \ No newline at end of file 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 159a4b8f48..93e0202458 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 @@ -7,6 +7,7 @@ import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.ListAdapter import androidx.recyclerview.widget.RecyclerView import com.tangem.tap.common.extensions.getDrawableCompat +import com.tangem.tap.common.extensions.hide import com.tangem.tap.features.wallet.models.PendingTransaction import com.tangem.tap.features.wallet.models.PendingTransactionType import com.tangem.wallet.R @@ -35,22 +36,29 @@ class PendingTransactionsAdapter ) = oldItem == newItem } - class TransactionsViewHolder(val view: View) : RecyclerView.ViewHolder(view) { fun bind(transaction: PendingTransaction) { + + if (transaction.type == PendingTransactionType.Unknown) { + view.hide() + } + 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) From d8f89bcd1c204963b2d0a82ebd9583b02f15e63e Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 27 Oct 2020 08:35:31 +0000 Subject: [PATCH 4/4] Updated on 2026-08-14 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index f9cf093569..a54de48953 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -70,7 +70,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.96.0' + implementation 'com.tangem:blockchain:1.98.0' implementation('com.tangem:core') { version { strictly '1.73.0'