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)