Adjust final calc

Minimize
PIVX-Labs · Apr 25, 2023 · ff1fc44 · ff1fc44
1 parent 766b314
commit ff1fc44
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 25 deletions.
diff --git a/index.template.html b/index.template.html
@@ -996,7 +996,6 @@ <h4 class="stake-balances" style="background-color: #2c0044; border-radius: 10px
                     </div>
                   </div>
                 </div>
-              </div>
 
                 <br />
 
@@ -1012,6 +1011,7 @@ <h4 class="stake-balances" style="background-color: #2c0044; border-radius: 10px
                   </button>
                 </center>
               </div>
+            </div>
 
               <div id="Settings" class="tabcontent">
                 <label for="currency" data-i18n="settingsCurrency">Choose a display currency:</label>

diff --git a/scripts/global.js b/scripts/global.js
@@ -513,15 +513,16 @@ export async function updateStakingRewardsGUI() {
 
 export async function updateMasternodeRewardsGUI() {
     const network = getNetwork();
-    const masternodeRewards = await network.getMasternodeRewards();
+    const arrMasternodeRewards = await network.getMasternodeRewards();
+
     if (network.areRewardsMasternodeComplete) {
         // Hide the load more button
         doms.domGuiMasternodeLoadMore.style.display = 'none';
     }
 
     //DOMS.DOM-optimised list generation
-    const strList = masternodeRewards
-        .map(
+    const strList = arrMasternodeRewards
+       .map(
             (cReward) =>
                 `<i style="opacity: 0.75; cursor: pointer" onclick="window.open('${
                     cExplorer.url + '/tx/' + cReward.id
@@ -533,7 +534,7 @@ export async function updateMasternodeRewardsGUI() {
         )
         .join('<br>');
     // Calculate total
-    const nRewards = masternodeRewards.reduce(
+    const nRewards = arrMasternodeRewards.reduce(
         (total, reward) => total + reward.amount,
         0
     );

diff --git a/scripts/network.js b/scripts/network.js
@@ -105,7 +105,7 @@ export class ExplorerNetwork extends Network {
         this.blocks = 0;
 
         this.arrRewards = [];
-        this.masternodeRewards = [];
+        this.arrMnRewards = [];
         this.rewardsSyncing = false;
         this.rewardsMasternodeSyncing = false;
     }
@@ -349,35 +349,24 @@ export class ExplorerNetwork extends Network {
      */
     async getMasternodeRewards() {
         if (this.rewardsMasternodeSyncing) {
-            return this.masternodeRewards;
+            return this.arrMnRewards;
         }
         if(localStorage.getItem('masternode')) {
             const cMasternode = new Masternode(
                 JSON.parse(localStorage.getItem('masternode'))
             );
             const cMasternodeData = await cMasternode.getFullData();
             if (this.rewardsMasternodeSyncing) {
-                return this.masternodeRewards;
+                return this.arrMnRewards;
             }
             try {
                 if (!this.enabled || this.areRewardsMasternodeComplete)
-                    return this.masternodeRewards;
+                    return this.arrMnRewards;
                 this.rewardsMasternodeSyncing = true;
-                const nHeight = this.masternodeRewards.length
-                    ? this.masternodeRewards[this.masternodeRewards.length - 1].blockHeight
+                const nHeight = this.arrMnRewards.length
+                    ? this.arrMnRewards[this.arrMnRewards.length - 1].blockHeight
                     : 0;
                 const mapPaths = new Map();
-                const txSum = (v) =>
-                    v.reduce(
-                        (t, s) =>
-                            t +
-                            (s.addresses
-                                .map((strAddr) => mapPaths.get(strAddr))
-                                .filter((v) => v).length && s.addresses.length === 2
-                                ? parseInt(s.value)
-                                : 0),
-                        0
-                    );
                 let cData;
                 cData = await (
                     await fetch(
@@ -391,7 +380,7 @@ export class ExplorerNetwork extends Network {
                 mapPaths.set(cMasternodeData.addr, ':)');
             if (cData && cData.transactions) {
                 // Update rewards
-                this.masternodeRewards = this.masternodeRewards.concat(
+                this.arrMnRewards = this.arrMnRewards.concat(
                     cData.transactions
                         .filter(
                             (tx) => tx.vout[0].addresses[0] === 'CoinStake TX'
@@ -401,7 +390,7 @@ export class ExplorerNetwork extends Network {
                                 id: tx.txid,
                                 time: tx.blockTime,
                                 blockHeight: tx.blockHeight,
-                                amount: txSum(tx.vout.slice(-1)) / COIN,
+                                amount: tx.vout[2].value / COIN,
                             };
                         })
                         .filter((tx) => tx.amount != 0)
@@ -412,7 +401,7 @@ export class ExplorerNetwork extends Network {
                         this.areMasternodeRewardsComplete = true;
                     }
                 }
-                return this.masternodeRewards;
+                return this.arrMnRewards;
             } catch (e) {
                 console.error(e);
             } finally {