From 3df021f2b5991369f8b8a9db34689acfd68fe28a Mon Sep 17 00:00:00 2001
From: freak5g <87205099+freak5g@users.noreply.github.com>
Date: Wed, 24 May 2023 15:27:35 +0200
Subject: [PATCH] Add weight_threshold in the authorities tab

* Add weight_threshold in the authorities tab

* Fix missing numbers in Asset info
---
 app/i18n/en.json                             |  3 +-
 app/i18n/zh.json                             |  1 +
 app/sections/accounts/account.html           | 37 ++++++++++++--------
 app/sections/accounts/accounts.controller.js |  6 ++--
 app/sections/assets/asset.html               |  8 ++---
 5 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/app/i18n/en.json b/app/i18n/en.json
index b64549f..473e09a 100644
--- a/app/i18n/en.json
+++ b/app/i18n/en.json
@@ -40,7 +40,8 @@
   "Asset": "Asset",
   "Vesting balances": "Vesting balances",
   "Owner keys": "Owner keys",
-  "Threshold": "Threshold",
+  "Weight": "Weight",
+  "Threshold" : "Threshold",
   "Active keys": "Active keys",
   "Memo key": "Memo key",
   "Issued Assets": "Issued Assets",
diff --git a/app/i18n/zh.json b/app/i18n/zh.json
index 8000652..c0fdb9b 100644
--- a/app/i18n/zh.json
+++ b/app/i18n/zh.json
@@ -40,6 +40,7 @@
     "Asset": "资产",
     "Vesting balances": "待解冻余额",
     "Owner keys": "资金密钥",
+    "Weight": "权重",
     "Threshold": "阈值",
     "Active keys": "账户密钥",
     "Memo key": "备注密钥",
diff --git a/app/sections/accounts/account.html b/app/sections/accounts/account.html
index e2b0d61..d2108d8 100644
--- a/app/sections/accounts/account.html
+++ b/app/sections/accounts/account.html
@@ -233,20 +233,25 @@
                                                     <td class="align-right"><font size="-1">{{ok.threshold}}</font></td>
                                                 </tbody>
                                             </table>
+
                                             <table class="table" ng-if="owner_accounts.length">
-                                                <thead>
+                                              <thead>
                                                 <tr>
-                                                    <th>
-                                                        <span data-translate="Account"></span>
-                                                    </th>
-                                                    <th class="align-right"><span data-translate="Threshold"></span></th>
+                                                  <th>
+                                                    <span data-translate="Account"></span>
+                                                  </th>
+                                                  <th class="align-right"><span data-translate="Weight"></span></th>
                                                 </tr>
-                                                </thead>
-                                                <tbody>
+                                              </thead>
+                                              <tbody>
                                                 <tr data-ng-repeat="oa in owner_accounts">
-                                                    <td align="left"><a href="#/accounts/{{oa.account}}/"><font size="-1">{{oa.account_name}}</font></a></td>
-                                                    <td class="align-right"><font size="-1">{{oa.threshold}}</font></td>
-                                                </tbody>
+                                                  <td align="left"><a href="#/accounts/{{oa.account}}/"><font size="-1">{{oa.account_name}}</font></a></td>
+                                                  <td class="align-right"><font size="-1">{{oa.threshold}}</font></td>
+                                                </tr>
+                                                <tr>
+                                                  <td class="align-right" colspan="2"><font size="-1"><span data-translate="Threshold"></span>: {{account.owner_threshold}}</font></td>
+                                                </tr>
+                                              </tbody>
                                             </table>
                                         </div>
                                     </div>
@@ -278,13 +283,17 @@
                                                     <th>
                                                         <span data-translate="Account"></span>
                                                     </th>
-                                                    <th class="align-right"><span data-translate="Threshold"></span></th>
+                                                    <th class="align-right"><span data-translate="Weight"></span></th>
                                                 </tr>
                                                 </thead>
                                                 <tbody>
-                                                <tr data-ng-repeat="aa in active_accounts">
-                                                    <td align="left"><a href="#/accounts/{{aa.account}}/"><font size="-1">{{aa.account_name}}</font></a></td>
-                                                    <td class="align-right"><font size="-1">{{aa.threshold}}</font></td>
+                                                    <tr data-ng-repeat="aa in active_accounts">
+                                                        <td align="left"><a href="#/accounts/{{aa.account}}/"><font size="-1">{{aa.account_name}}</font></a></td>
+                                                        <td class="align-right"><font size="-1">{{aa.threshold}}</font></td>
+                                                    </tr>
+                                                    <tr>
+                                                        <td class="align-right" colspan="2"><font size="-1"><span data-translate="Threshold"></span>: {{account.active_threshold}}</font></td>
+                                                    </tr>
                                                 </tbody>
                                             </table>
                                         </div>
diff --git a/app/sections/accounts/accounts.controller.js b/app/sections/accounts/accounts.controller.js
index a2c3ba1..82d6828 100644
--- a/app/sections/accounts/accounts.controller.js
+++ b/app/sections/accounts/accounts.controller.js
@@ -69,7 +69,9 @@ import {sha256} from "js-sha256";
                         lifetime_fees_paid: utilities.formatBalance(lifetime_fees_paid, 5),
                         bts_balance: utilities.formatBalance(core_balance, 5),
                         vesting: vesting_balances,
-                        memo_key: fullAccount.account.options.memo_key
+                        memo_key: fullAccount.account.options.memo_key,
+                        owner_threshold: fullAccount.account.owner.weight_threshold,
+                        active_threshold: fullAccount.account.active.weight_threshold
                     };
                     if ($scope.account) {
                         $scope.account = Object.assign(new_account, $scope.account);
@@ -118,7 +120,7 @@ import {sha256} from "js-sha256";
                     accountService.parseAuth(fullAccount.account.active.key_auths, "key", function (returnData) {
                         $scope.active_keys = returnData;
                     });
-
+                    
                     accountService.parseAuth(fullAccount.account.active.account_auths, "account",
                         function (returnData) {
                         $scope.active_accounts = returnData;
diff --git a/app/sections/assets/asset.html b/app/sections/assets/asset.html
index 1843ca1..be496e0 100644
--- a/app/sections/assets/asset.html
+++ b/app/sections/assets/asset.html
@@ -95,7 +95,7 @@ <h2>{{data.symbol}}</h2>
                         <span data-translate="Description"></span>
                     </li>
                     <li class="list-group-item">
-                        <span class="badge" style="background-color: #FFFFFF; color: #000000">{{data.max_supply | number}} {{data.symbol}}</span>
+                        <span class="badge" style="background-color: #FFFFFF; color: #000000">{{data.max_supply}} {{data.symbol}}</span>
                         <span data-translate="Max supply"></span>
                     </li>
                     <li class="list-group-item">
@@ -107,15 +107,15 @@ <h2>{{data.symbol}}</h2>
                         <span data-translate="Precision"></span>
                     </li>
                     <li class="list-group-item">
-                        <span class="badge" style="background-color: #FFFFFF; color: #000000">{{data.fee_pool | number}} {{data.symbol}}</span>
+                        <span class="badge" style="background-color: #FFFFFF; color: #000000">{{data.fee_pool}} {{data.symbol}}</span>
                         <span data-translate="Fee pool"></span>
                     </li>
                     <li class="list-group-item">
-                        <span class="badge" style="background-color: #FFFFFF; color: #000000">{{data.current_supply | number}} {{data.symbol}}</span>
+                        <span class="badge" style="background-color: #FFFFFF; color: #000000">{{data.current_supply}} {{data.symbol}}</span>
                         <span data-translate="Current supply"></span>
                     </li>
                     <li class="list-group-item">
-                        <span class="badge" style="background-color: #FFFFFF; color: #000000">{{data.confidential_supply | number}} {{data.symbol}} </span>
+                        <span class="badge" style="background-color: #FFFFFF; color: #000000">{{data.confidential_supply}} {{data.symbol}} </span>
                         <span data-translate="Confidential supply"></span>
                     </li>
                 </ul>