Minor UI fixes regarding the mined unconfirmed/confirmed difference. …

…A minor fix in the wallet service regarding base node validation sequence.
tari-project · Feb 24, 2021 · cd5cd81 · cd5cd81
1 parent 4c2f717
commit cd5cd81
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
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
@@ -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
@@ -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
@@ -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