Merge branch 'development' into indexer-optimize

tari-project · Nov 23, 2023 · 41c7f65 · 41c7f65
2 parents ccf20fa + a209862
commit 41c7f65
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/applications/tari_dan_app_utilities/src/consensus_constants.rs b/applications/tari_dan_app_utilities/src/consensus_constants.rs
@@ -33,7 +33,7 @@ impl ConsensusConstants {
     pub const fn devnet() -> Self {
         Self {
             base_layer_confirmations: 3,
-            committee_size: 1,
+            committee_size: 7,
             hotstuff_rounds: 4,
         }
     }

diff --git a/applications/tari_dan_wallet_web_ui/src/routes/Transactions/TransactionDetails.tsx b/applications/tari_dan_wallet_web_ui/src/routes/Transactions/TransactionDetails.tsx
@@ -73,6 +73,11 @@ export default function TransactionDetails() {
             <span>{result.result.AcceptFeeRejectRest[1].ExecutionFailure}</span>
         );
       }
+      if (result.result.Reject) {
+        return (
+            <span>{Object.keys(result.result.Reject)[0]} - {result.result.Reject[Object.keys(result.result.Reject)[0]]}</span>
+        )
+      }
     } else {
       return (
           <span>In progress</span>

diff --git a/applications/tari_validator_node_web_ui/src/routes/Transactions/TransactionDetails.tsx b/applications/tari_validator_node_web_ui/src/routes/Transactions/TransactionDetails.tsx
@@ -110,6 +110,11 @@ export default function TransactionDetails() {
             <span>{result.finalize.result.AcceptFeeRejectRest[1].ExecutionFailure}</span>
         );
       }
+      if (result.finalize.result.Reject) {
+        return (
+            <span>{Object.keys(result.finalize.result.Reject)[0]} - {result.finalize.result.Reject[Object.keys(result.finalize.result.Reject)[0]]}</span>
+        )
+      }
     } else {
       return (
         <span>In progress</span>