Merge pull request #2704 from blockchainprojects/2499_Clearly_render_…

…proposal_contents Clearly render proposal contents
bitshares · May 21, 2019 · 0edb222 · 0edb222
2 parents 9742fb7 + 5376c5b
commit 0edb222
Show file tree

Hide file tree

Showing 93 changed files with 3,484 additions and 3,105 deletions.
diff --git a/app/api/ApplicationApi.js b/app/api/ApplicationApi.js
@@ -169,8 +169,8 @@ const ApplicationApi = {
                                       memo
                                   )
                                 : Buffer.isBuffer(memo)
-                                    ? memo.toString("utf-8")
-                                    : memo
+                                ? memo.toString("utf-8")
+                                : memo
                         };
                     }
                 }
@@ -391,8 +391,8 @@ const ApplicationApi = {
                               memo
                           )
                         : Buffer.isBuffer(memo)
-                            ? memo.toString("utf-8")
-                            : memo
+                        ? memo.toString("utf-8")
+                        : memo
                 };
             }
 
@@ -688,8 +688,8 @@ const ApplicationApi = {
                               memo
                           )
                         : Buffer.isBuffer(memo)
-                            ? memo.toString("utf-8")
-                            : memo
+                        ? memo.toString("utf-8")
+                        : memo
                 };
             }
         }

diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -1516,7 +1516,7 @@
         "transfer": "{from} sent {amount} to {to}",
         "transfer_account": "{account} ownership transferred to {to}",
         "unlisted_by": "{lister} unlisted the account {listee}",
-        "update_account": "{account} updated their account data",
+        "update_account": "{account} updated their account data {change}",
         "vesting_balance_withdraw": "{account} withdrew vesting balance of {amount}",
         "whitelisted_by": "{lister} whitelisted the account {listee}",
         "witness_create": "{account} was upgraded to become a witness",
@@ -1551,14 +1551,24 @@
         "asset_settle": "Request a settlement of {amount} for {account}",
         "asset_update": "Update the asset {asset} using the account {account}",
         "call_order_update": "Change {account} {debtSymbol} debt by {debt} and collateral by {collateral}",
+        "changes_to_active": "Changes to active",
+        "changes_to_owner": "Changes to owner",
+        "changes_to_memo": "Changes to memo",
         "committee_member_update_global_parameters": "Update committee global parameters by {account}",
         "delete": "Permanently reject",
+        "danger_operation": "Dangerous operation",
+        "set_threshold": "Set threshold to %(threshold)s",
+        "add": "Add",
+        "remove": "Remove",
+        "add_vote": "Add vote for",
+        "remove_vote": "Remove vote for",
         "expires": "Expires",
         "feed_producer": "Update the feed producers for the asset {asset} using the account {account}",
         "limit_order_buy": "Place an order to buy {amount} at {price} for {account}",
         "limit_order_create": "Place an order to buy %(buy_amount)s for %(sell_amount)s for %(account)s",
         "limit_order_sell": "Place an order to sell {amount} at {price} for {account}",
         "override_transfer": "Transfer {amount} from {from} to {to} by authority of {issuer}",
+        "permission_changes": "Permission changes",
         "proposals": "Proposals",
         "reject": "Reject",
         "status": "Status",
@@ -1571,7 +1581,7 @@
             "owner_approvals_to_add": "Owner approvals to add",
             "owner_approvals_to_remove": "Owner approvals to remove"
         },
-        "update_account": "Update account data for {account}",
+        "update_account": "Update account data for {account} {change}",
         "updated": {
             "active_approvals_to_add": "Active approval(s) added",
             "active_approvals_to_remove": "Active approval(s) removed",
@@ -1580,7 +1590,8 @@
             "owner_approvals_to_add": "Owner approval(s) added",
             "owner_approvals_to_remove": "Owner approval(s) removed"
         },
-        "vesting_balance_withdraw": "Withdraw {amount} from vesting balance of {account}"
+        "vesting_balance_withdraw": "Withdraw {amount} from vesting balance of {account}",
+        "votes": "Votes"
     },
     "proposal_create": {
         "expiration_time": "Expiration time",

diff --git a/app/components/Account/AccountPortfolioList.jsx b/app/components/Account/AccountPortfolioList.jsx
@@ -334,8 +334,8 @@ class AccountPortfolioList extends React.Component {
                 [action === "bridge_modal"
                     ? "bridgeAsset"
                     : action === "deposit_modal"
-                    ? "depositAsset"
-                    : "withdrawAsset"]: asset,
+                        ? "depositAsset"
+                        : "withdrawAsset"]: asset,
                 fiatModal
             },
             () => {

diff --git a/app/components/Account/Proposals.jsx b/app/components/Account/Proposals.jsx
@@ -153,14 +153,14 @@ class Proposals extends Component {
 
         touchedAccounts.push(proposer);
 
-        if (__DEV__) {
+        /* if (__DEV__) {
             console.log(
                 "Proposed transactions: ",
                 proposal,
                 " touching accounts ",
                 touchedAccounts
             );
-        }
+        } */
 
         touchedAccounts.forEach(_account => {
             if (accountUtils.isKnownScammer(_account)) {
@@ -272,6 +272,7 @@ class Proposals extends Component {
                             proposal={true}
                             id={id}
                             proposer={proposer}
+                            collapsed={false}
                         />
                     );
                 })

diff --git a/app/components/Account/RecentTransactions.jsx b/app/components/Account/RecentTransactions.jsx
@@ -86,7 +86,6 @@ class RecentTransactions extends React.Component {
         this.useCustom = counterpart.translate(
             "account.export_modal.use_custom"
         );
-
         // https://eswrapper.bitshares.eu/ is not alive
         // https://wrapper.elasticsearch.bitshares.ws/ is not alive
         // http://bts-es.clockwork.gr:5000/ is alive

diff --git a/app/components/Blockchain/Asset.jsx b/app/components/Blockchain/Asset.jsx
@@ -356,8 +356,8 @@ class Asset extends React.Component {
         let preferredMarket = description.market
             ? description.market
             : core_asset
-                ? core_asset.get("symbol")
-                : "BTS";
+            ? core_asset.get("symbol")
+            : "BTS";
         if ("bitasset" in asset && asset.bitasset.is_prediction_market) {
             preferredMarket = ChainStore.getAsset(
                 asset.bitasset.options.short_backing_asset