diff --git a/app/build.gradle b/app/build.gradle index 4d9c559847..a54de48953 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -70,9 +70,17 @@ 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:core:1.68.0' - implementation 'com.tangem:sdk:1.68.0' + implementation 'com.tangem:blockchain:1.98.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" 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..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 @@ -17,12 +17,12 @@ fun TransactionData.toPendingTransaction(walletAddress: String): PendingTransact 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 } @@ -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 f6290b5eb9..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,11 +36,15 @@ 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