GiftedHacker/tangem-app-android-audited
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Updated on 2026-08-14

Browse source
This commit is contained in:
Tangem 2020-10-28 11:46:31 +03:00
commit cc0b08522c
5 changed files with 32 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/build.gradle
View file

@ -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"

5
app/src/main/java/com/tangem/tap/features/send/redux/SendScreenAction.kt
View file

@ -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()

18
app/src/main/java/com/tangem/tap/features/wallet/models/PendingTransaction.kt
View file

@ -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<TransactionData>.toPendingTransactions(walletAddress: String): List<PendingTransaction>{
fun List<TransactionData>.toPendingTransactions(walletAddress: String): List<PendingTransaction> {
return this.mapNotNull { it.toPendingTransaction(walletAddress) }
}
fun List<PendingTransaction>.removeUnknownTransactions(): List<PendingTransaction> {
return this.filter { it.type != PendingTransactionType.Unknown }
}

3
app/src/main/java/com/tangem/tap/features/wallet/redux/WalletReducer.kt
View file

@ -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)
)
}

7
app/src/main/java/com/tangem/tap/features/wallet/ui/PendingTransactionsAdapter.kt
View file

@ -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