diff --git a/app/src/main/java/com/tari/android/wallet/service/WalletService.kt b/app/src/main/java/com/tari/android/wallet/service/WalletService.kt index 7316a3fc0..ed6e8f4b5 100644 --- a/app/src/main/java/com/tari/android/wallet/service/WalletService.kt +++ b/app/src/main/java/com/tari/android/wallet/service/WalletService.kt @@ -572,6 +572,7 @@ internal class WalletService : Service(), FFIWalletListener, LifecycleObserver { type.name + " Validation [$responseId] complete. Result: $result." + " Request id [${currentStatus.first}] mismatch. Ignoring." ) + return } Logger.d(type.name + " Validation [$responseId] complete. Result: $result.") baseNodeValidationStatusMap[type] = Pair( diff --git a/app/src/main/java/com/tari/android/wallet/ui/fragment/tx/adapter/TxViewHolder.kt b/app/src/main/java/com/tari/android/wallet/ui/fragment/tx/adapter/TxViewHolder.kt index 4e9424dfd..b9fdb94af 100644 --- a/app/src/main/java/com/tari/android/wallet/ui/fragment/tx/adapter/TxViewHolder.kt +++ b/app/src/main/java/com/tari/android/wallet/ui/fragment/tx/adapter/TxViewHolder.kt @@ -54,7 +54,7 @@ import com.tari.android.wallet.R.string.* import com.tari.android.wallet.databinding.HomeTxListItemBinding import com.tari.android.wallet.extension.applyFontStyle import com.tari.android.wallet.model.* -import com.tari.android.wallet.model.TxStatus.MINED_CONFIRMED +import com.tari.android.wallet.model.TxStatus.MINED_UNCONFIRMED import com.tari.android.wallet.model.TxStatus.PENDING import com.tari.android.wallet.ui.component.CustomFont import com.tari.android.wallet.ui.component.EmojiIdSummaryViewController @@ -209,6 +209,14 @@ class TxViewHolder( color(R.color.home_tx_value_pending), drawable(R.drawable.home_tx_value_pending_bg)!! ) + tx is CompletedTx && tx.status == MINED_UNCONFIRMED -> Triple( + when (tx.direction) { + Tx.Direction.OUTBOUND -> "-$amount" + Tx.Direction.INBOUND -> "+$amount" + }, + color(R.color.home_tx_value_pending), + drawable(R.drawable.home_tx_value_pending_bg)!! + ) tx.direction == Tx.Direction.INBOUND -> Triple( "+$amount", color(R.color.home_tx_value_positive), @@ -265,7 +273,7 @@ class TxViewHolder( ) is CompletedTx -> { when (tx.status) { - MINED_CONFIRMED -> showStatusTextView(tx_detail_completing_final_processing) + MINED_UNCONFIRMED -> showStatusTextView(tx_detail_completing_final_processing) else -> ui.statusTextView.gone() } } diff --git a/build.gradle b/build.gradle index bba5118e0..c1a82d175 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { ext.kotlin_version = '1.4.21' // build & version - ext.buildNumber = 150 + ext.buildNumber = 151 ext.versionNumber = "0.6.0" // JNI libs