UI fixes regarding unconfirmed/confirmed mined transaction updates. R…

…estart transaction broadcast after successful transaction validation. More decimal places for the fee display in the transaction details screen. Bump build number.
tari-project · Feb 26, 2021 · e5ec8e4 · e5ec8e4
1 parent adae21d
commit e5ec8e4
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 6 deletions.
diff --git a/app/src/main/cpp/jniWallet.cpp b/app/src/main/cpp/jniWallet.cpp
@@ -135,7 +135,7 @@ void txMinedUnconfirmedCallback(struct TariCompletedTransaction *pCompletedTrans
             callbackHandler,
             txMinedUnconfirmedCallbackMethodId,
             jpCompletedTransaction,
-            confirmationCount);
+            bytes);
     g_vm->DetachCurrentThread();
 }
 

diff --git a/app/src/main/java/com/tari/android/wallet/ffi/FFIWallet.kt b/app/src/main/java/com/tari/android/wallet/ffi/FFIWallet.kt
@@ -818,7 +818,7 @@ internal class FFIWallet(
         return BigInteger(1, bytes)
     }
 
-    fun restartTxValidation(): BigInteger {
+    fun restartTxBroadcast(): BigInteger {
         val error = FFIError()
         val bytes = jniRestartTxBroadcast(error)
         throwIf(error)

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
@@ -168,6 +168,8 @@ internal class WalletService : Service(), FFIWalletListener, LifecycleObserver {
 
     private lateinit var wallet: FFIWallet
 
+    private var txBroadcastRestarted = false
+
     /**
      * Pairs of <tx id, recipient public key hex>.
      */
@@ -596,6 +598,15 @@ internal class WalletService : Service(), FFIWalletListener, LifecycleObserver {
 
     override fun onTxValidationComplete(responseId: BigInteger, result: BaseNodeValidationResult) {
         checkValidationResult(BaseNodeValidationType.TX, responseId, result)
+        if (!txBroadcastRestarted && result == BaseNodeValidationResult.SUCCESS) {
+            try {
+                wallet.restartTxBroadcast()
+                txBroadcastRestarted = true
+                Logger.i("Transaction broadcast restarted.")
+            } catch (e: Exception) {
+                Logger.e("Error while restarting tx broadcast: " + e.message)
+            }
+        }
     }
 
     /**

diff --git a/app/src/main/java/com/tari/android/wallet/ui/activity/tx/TxDetailsActivity.kt b/app/src/main/java/com/tari/android/wallet/ui/activity/tx/TxDetailsActivity.kt
@@ -347,7 +347,7 @@ internal class TxDetailsActivity : AppCompatActivity(), ServiceConnection {
         ui.feeLabelTextView.visible()
         ui.txFeeTextView.text = string(
             tx_details_fee_value,
-            WalletUtil.amountFormatter.format(fee.tariValue)
+            WalletUtil.feeFormatter.format(fee.tariValue)
         )
     }
 

diff --git a/app/src/main/java/com/tari/android/wallet/ui/fragment/tx/TxListFragment.kt b/app/src/main/java/com/tari/android/wallet/ui/fragment/tx/TxListFragment.kt
@@ -308,6 +308,9 @@ internal class TxListFragment : Fragment(),
         EventBus.subscribe<Event.Wallet.OutboundTxBroadcast>(this) {
             onOutboundTxBroadcast(it.tx)
         }
+        EventBus.subscribe<Event.Wallet.TxMinedUnconfirmed>(this) {
+            onTxMinedUnconfirmed(it.tx, it.confirmationCount)
+        }
         EventBus.subscribe<Event.Wallet.TxMined>(this) {
             onTxMined(it.tx)
         }
@@ -448,13 +451,21 @@ internal class TxListFragment : Fragment(),
         pendingOutboundTxs.firstOrNull { it.id == tx.id }?.status = TxStatus.BROADCAST
     }
 
-    private fun onTxMined(tx: CompletedTx) {
+    private fun onTxMinedUnconfirmed(tx: CompletedTx, confirmationCount: Int) {
         val source = when (tx.direction) {
             Tx.Direction.INBOUND -> pendingInboundTxs
             Tx.Direction.OUTBOUND -> pendingOutboundTxs
         }
         source.find { it.id == tx.id }?.let { source.remove(it) }
-        completedTxs.add(tx)
+        if (completedTxs.find { it.id == tx.id } == null) {
+            completedTxs.add(tx)
+        }
+        // update tx list UI
+        lifecycleScope.launch(Dispatchers.Main) { updateTxListUI() }
+    }
+
+    private fun onTxMined(tx: CompletedTx) {
+        completedTxs.firstOrNull { it.id == tx.id }?.status = TxStatus.MINED_CONFIRMED
         // update tx list UI
         lifecycleScope.launch(Dispatchers.Main) { updateTxListUI() }
     }

diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
     ext.kotlin_version = '1.4.21'
 
     // build & version
-    ext.buildNumber = 152
+    ext.buildNumber = 153
     ext.versionNumber = "0.6.0"
 
     // JNI libs