Etica Release v1.0.1. Fix Consolidate Stakes feature

etica · Apr 5, 2023 · d0bf99a · d0bf99a
1 parent c496c6b
commit d0bf99a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/assets/templates/stakesboard.html b/assets/templates/stakesboard.html
@@ -162,12 +162,22 @@
     <div class="form-group sendTXInfo">
       <i class="fas fa-wallet"></i>
       <label class="nameFieldsConfirmTxs">From address:</label>
-      <label class="valueFieldsConfirmTxs" id="fromClaimAddressInfo"></label>
+      <label class="valueFieldsConfirmTxs" id="fromConsolidateStakesAddressInfo"></label>
+    </div>
+    <div class="form-group sendTXInfo">
+      <i class="fas fa-dollar-sign"></i>
+      <label class="nameFieldsConfirmTxs">New Stakes End date:</label>
+      <label class="valueFieldsConfirmTxs" id="valueConsolidateStakesNewEndDate"></label>
+    </div>
+    <div class="form-group sendTXInfo">
+      <i class="fas fa-dollar-sign"></i>
+      <label class="nameFieldsConfirmTxs">Minimum date for a stake to be affected:</label>
+      <label class="valueFieldsConfirmTxs" id="valueConsolidateStakesMinDate"></label>
     </div>
     <div class="form-group sendTXInfo">
       <i class="fas fa-dollar-sign"></i>
-      <label class="nameFieldsConfirmTxs">Proposal Hash:</label>
-      <label class="valueFieldsConfirmTxs" id="valueOfConsolidateStakesProposalHash"></label>
+      <label class="nameFieldsConfirmTxs">Max stake index to be affected:</label>
+      <label class="valueFieldsConfirmTxs" id="valueConsolidateStakesMaxIndex"></label>
     </div>
     <div class="form-group sendTXInfo">
       <i class="fas fa-dollar-sign"></i>

diff --git a/renderer/stakesboard.js b/renderer/stakesboard.js
@@ -416,6 +416,9 @@ $(document).on("render_stakesboard", function () {
                       $(".sendTXPass").css("display", "none");
                       $(".sendTXdivider").css("display", "none");
                       $("#fromConsolidateStakesAddressInfo").html(stakeaddress);
+                      $("#valueConsolidateStakesNewEndDate").html(_endtimestring);
+                      $("#valueConsolidateStakesMinDate").html(_minlimitstring);
+                      $("#valueConsolidateStakesMaxIndex").html(input_maxindex);
                       $("#feeConsolidateStakesToPayInfo").html(parseFloat(web3Local.utils.fromWei(data.toString(), "ether")));
                       $("#dlgConsolidateStakesWalletPassword").iziModal("open");
                     }
@@ -424,6 +427,9 @@ $(document).on("render_stakesboard", function () {
                       $("#dlgConsolidateStakesWalletPassword").iziModal({width: "70%"});
                       $("#ConsolidateStakeswalletPassword").val("");
                       $("#fromConsolidateStakesAddressInfo").html(stakeaddress);
+                      $("#valueConsolidateStakesNewEndDate").html(_endtimestring);
+                      $("#valueConsolidateStakesMinDate").html(_minlimitstring);
+                      $("#valueConsolidateStakesMaxIndex").html(input_maxindex);
                       $("#feeConsolidateStakesToPayInfo").html(parseFloat(web3Local.utils.fromWei(data.toString(), "ether")));
                       $("#dlgConsolidateStakesWalletPassword").iziModal("open");
                     }
@@ -437,7 +443,7 @@ $(document).on("render_stakesboard", function () {
                          _password = $("#ConsolidateStakeswalletPassword").val();
                       }
 
-                      EticaContract.prepareTransaction_stakescsldt(_password, stakeaddress, input_endtime, input_minlimit, input_maxindex, function (error) {
+                      EticaContract.prepareTransaction_stakescsldt(_password, stakeaddress, _endtime, _minlimit, input_maxindex, function (error) {
                         EticaMainGUI.showGeneralError(error);
                       }, function (data) {
                         EticaBlockchain.sendTransaction(data.raw, function (error) {