Move some utility components

murilob · Oct 5, 2017 · 0065607 · 0065607
1 parent c054979
commit 0065607
Show file tree

Hide file tree

Showing 19 changed files with 39 additions and 29 deletions.
diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -475,7 +475,8 @@
     "asset_issue": "Issue {amount} to {to} using {account}",
     "asset_reserve": "Reserve (burn) {amount} using {account}",
     "vesting_balance_withdraw": "Withdraw {amount} from vesting balance of {account}",
-    "feed_producer": "Update the feed producers for the asset {asset} using the account {account}"
+    "feed_producer": "Update the feed producers for the asset {asset} using the account {account}",
+    "call_order_update": "Change {account} {debtSymbol} debt by {debt} and collateral by {collateral}"
   },
   "transaction": {
     "confirm": "Please confirm the transaction",

diff --git a/app/components/Account/AccountOverview.jsx b/app/components/Account/AccountOverview.jsx
@@ -18,6 +18,7 @@ import {Link} from "react-router/es";
 import ChainTypes from "../Utility/ChainTypes";
 import FormattedAsset from "../Utility/FormattedAsset";
 import BindToChainState from "../Utility/BindToChainState";
+import LinkToAssetById from "../Utility/LinkToAssetById";
 import utils from "common/utils";
 import BorrowModal from "../Modal/BorrowModal";
 import ReactTooltip from "react-tooltip";
@@ -207,7 +208,9 @@ class AccountOverview extends React.Component {
             }
             balances.push(
                 <tr key={asset.get("symbol")} style={{maxWidth: "100rem"}}>
-                    <td><AssetName name={asset.get("symbol")} /></td>
+                    <td>
+                        <LinkToAssetById asset={asset.get("id")} />
+                    </td>
                     <td style={{textAlign: "right"}}>
                         {hasBalance || hasOnOrder ? <BalanceComponent balance={balance} hide_asset /> : null}
                     </td>
@@ -300,7 +303,7 @@ class AccountOverview extends React.Component {
                     if (includeAsset && visible || !includeAsset && !visible) balances.push(
                         <tr key={"zz" + a} style={{maxWidth: "100rem"}}>
                             <td>
-                                <AssetName name={a} />
+                                <LinkToAssetById asset={asset.get("id")} />
                             </td>
                             <td colSpan="3"></td>
                             <td style={{textAlign: "center"}}>

diff --git a/app/components/Account/AccountVotingProxy.jsx b/app/components/Account/AccountVotingProxy.jsx
@@ -5,7 +5,7 @@ import BindToChainState from "../Utility/BindToChainState";
 import ChainTypes from "../Utility/ChainTypes";
 import Translate from "react-translate-component";
 import AccountImage from "../Account/AccountImage";
-import LinkToAccountById from "../Blockchain/LinkToAccountById";
+import LinkToAccountById from "../Utility/LinkToAccountById";
 import {List} from "immutable";
 
 class AccountVotingProxy extends React.Component {

diff --git a/app/components/Account/AccountWhitelist.jsx b/app/components/Account/AccountWhitelist.jsx
@@ -6,7 +6,7 @@ import Immutable from "immutable";
 import Translate from "react-translate-component";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
-import LinkToAccountById from "../Blockchain/LinkToAccountById";
+import LinkToAccountById from "../Utility/LinkToAccountById";
 import WalletApi from "api/WalletApi";
 import WalletDb from "stores/WalletDb.js";
 

diff --git a/app/components/Account/NestedApprovalState.jsx b/app/components/Account/NestedApprovalState.jsx
@@ -3,7 +3,7 @@ import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import utils from "common/utils";
 import Icon from "../Icon/Icon";
-import LinkToAccountById from "../Blockchain/LinkToAccountById";
+import LinkToAccountById from "../Utility/LinkToAccountById";
 import pu from "common/permission_utils";
 import {cloneDeep} from "lodash";
 import {ChainStore} from "bitsharesjs/es";

diff --git a/app/components/Account/VotingAccountsList.jsx b/app/components/Account/VotingAccountsList.jsx
@@ -6,7 +6,7 @@ import {ChainStore} from "bitsharesjs/es";
 import ChainTypes from "../Utility/ChainTypes";
 import FormattedAsset from "../Utility/FormattedAsset";
 import BindToChainState from "../Utility/BindToChainState";
-import LinkToAccountById from "../Blockchain/LinkToAccountById";
+import LinkToAccountById from "../Utility/LinkToAccountById";
 import counterpart from "counterpart";
 
 function getWitnessOrCommittee(type, acct) {

diff --git a/app/components/Account/WorkerApproval.jsx b/app/components/Account/WorkerApproval.jsx
@@ -5,7 +5,7 @@ import utils from "common/utils";
 import ChainTypes from "../Utility/ChainTypes";
 import FormattedAsset from "../Utility/FormattedAsset";
 import VestingBalance from "../Utility/VestingBalance";
-import LinkToAccountById from "../Blockchain/LinkToAccountById";
+import LinkToAccountById from "../Utility/LinkToAccountById";
 import BindToChainState from "../Utility/BindToChainState";
 import {EquivalentValueComponent} from "../Utility/EquivalentValueComponent";
 import Icon from "components/Icon/Icon";

diff --git a/app/components/Blockchain/Asset.jsx b/app/components/Blockchain/Asset.jsx
@@ -1,7 +1,7 @@
 import React from "react";
 import {Link} from "react-router/es";
 import Translate from "react-translate-component";
-import LinkToAccountById from "./LinkToAccountById";
+import LinkToAccountById from "../Utility/LinkToAccountById";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import FormattedAsset from "../Utility/FormattedAsset";

diff --git a/app/components/Blockchain/Block.jsx b/app/components/Blockchain/Block.jsx
@@ -7,7 +7,7 @@ import Transaction from "./Transaction";
 import Translate from "react-translate-component";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
-import LinkToWitnessById from "./LinkToWitnessById";
+import LinkToWitnessById from "../Utility/LinkToWitnessById";
 
 class TransactionList extends React.Component {
 

diff --git a/app/components/Blockchain/Operation.jsx b/app/components/Blockchain/Operation.jsx
@@ -6,8 +6,8 @@ import Translate from "react-translate-component";
 import counterpart from "counterpart";
 import utils from "common/utils";
 import BlockTime from "./BlockTime";
-import LinkToAccountById from "../Blockchain/LinkToAccountById";
-import LinkToAssetById from "../Blockchain/LinkToAssetById";
+import LinkToAccountById from "../Utility/LinkToAccountById";
+import LinkToAssetById from "../Utility/LinkToAssetById";
 import BindToChainState from "../Utility/BindToChainState";
 import ChainTypes from "../Utility/ChainTypes";
 import TranslateWithLinks from "../Utility/TranslateWithLinks";

diff --git a/app/components/Blockchain/ProposedOperation.jsx b/app/components/Blockchain/ProposedOperation.jsx
@@ -6,8 +6,8 @@ import Translate from "react-translate-component";
 import counterpart from "counterpart";
 import market_utils from "common/market_utils";
 import utils from "common/utils";
-import LinkToAccountById from "../Blockchain/LinkToAccountById";
-import LinkToAssetById from "../Blockchain/LinkToAssetById";
+import LinkToAccountById from "../Utility/LinkToAccountById";
+import LinkToAssetById from "../Utility/LinkToAssetById";
 import BindToChainState from "../Utility/BindToChainState";
 import FormattedPrice from "../Utility/FormattedPrice";
 import {ChainStore, ChainTypes as grapheneChainTypes} from "bitsharesjs/es";
@@ -203,9 +203,15 @@ class ProposedOperation extends React.Component {
                 color = "warning";
                 column = (
                     <span>
-                        {this.linkToAccount(op[1].funding_account)}&nbsp;
-                        <Translate component="span" content="proposal.call_order_update" />
-                        &nbsp;{this.linkToAsset(op[1].delta_debt.asset_id)}
+                        <TranslateWithLinks
+                            string="proposal.call_order_update"
+                            keys={[
+                                {type: "account", value: op[1].funding_account, arg: "account"},
+                                {type: "asset", value: op[1].delta_debt.asset_id, arg: "debtSymbol"},
+                                {type: "amount", value: op[1].delta_debt, arg: "debt"},
+                                {type: "amount", value: op[1].delta_collateral, arg: "collateral"}
+                            ]}
+                        />
                     </span>
                 );
                 break;

diff --git a/app/components/Blockchain/Transaction.jsx b/app/components/Blockchain/Transaction.jsx
@@ -8,8 +8,8 @@ import classNames from "classnames";
 import {FormattedDate} from "react-intl";
 import Inspector from "react-json-inspector";
 import utils from "common/utils";
-import LinkToAccountById from "../Blockchain/LinkToAccountById";
-import LinkToAssetById from "../Blockchain/LinkToAssetById";
+import LinkToAccountById from "../Utility/LinkToAccountById";
+import LinkToAssetById from "../Utility/LinkToAssetById";
 import FormattedPrice from "../Utility/FormattedPrice";
 import account_constants from "chain/account_constants";
 import Icon from "../Icon/Icon";

diff --git a/app/components/DepositWithdraw/blocktrades/BlockTradesGatewayDepositRequest.jsx b/app/components/DepositWithdraw/blocktrades/BlockTradesGatewayDepositRequest.jsx
@@ -10,7 +10,7 @@ import ZfApi from "react-foundation-apps/src/utils/foundation-api";
 import AccountBalance from "../../Account/AccountBalance";
 import BlockTradesDepositAddressCache from "common/BlockTradesDepositAddressCache";
 import AssetName from "components/Utility/AssetName";
-import LinkToAccountById from "components/Blockchain/LinkToAccountById";
+import LinkToAccountById from "components/Utility/LinkToAccountById";
 import {requestDepositAddress} from "common/blockTradesMethods";
 import { blockTradesAPIs } from "api/apiConfig";
 

diff --git a/app/components/Explorer/Assets.jsx b/app/components/Explorer/Assets.jsx
@@ -5,7 +5,7 @@ import SettingsActions from "actions/SettingsActions";
 import {Link} from "react-router/es";
 import Immutable from "immutable";
 import Translate from "react-translate-component";
-import LinkToAccountById from "../Blockchain/LinkToAccountById";
+import LinkToAccountById from "../Utility/LinkToAccountById";
 import assetUtils from "common/asset_utils";
 import counterpart from "counterpart";
 import FormattedAsset from "../Utility/FormattedAsset";

diff --git a/app/components/Explorer/Blocks.jsx b/app/components/Explorer/Blocks.jsx
@@ -4,7 +4,7 @@ import BlockchainActions from "actions/BlockchainActions";
 import Translate from "react-translate-component";
 import {FormattedDate} from "react-intl";
 import Operation from "../Blockchain/Operation";
-import LinkToWitnessById from "../Blockchain/LinkToWitnessById";
+import LinkToWitnessById from "../Utility/LinkToWitnessById";
 import ChainTypes from "../Utility/ChainTypes";
 import BindToChainState from "../Utility/BindToChainState";
 import TransactionChart from "./TransactionChart";

diff --git a/...mponents/Blockchain/LinkToAccountById.jsx → app/components/Utility/LinkToAccountById.jsx b/...mponents/Blockchain/LinkToAccountById.jsx → app/components/Utility/LinkToAccountById.jsx
@@ -1,7 +1,7 @@
 import React from "react";
 import {Link} from "react-router/es";
-import ChainTypes from "../Utility/ChainTypes";
-import BindToChainState from "../Utility/BindToChainState";
+import ChainTypes from "./ChainTypes";
+import BindToChainState from "./BindToChainState";
 
 class LinkToAccountById extends React.Component {
 

diff --git a/...components/Blockchain/LinkToAssetById.jsx → app/components/Utility/LinkToAssetById.jsx b/...components/Blockchain/LinkToAssetById.jsx → app/components/Utility/LinkToAssetById.jsx
@@ -1,8 +1,8 @@
 import React from "react";
 import {Link} from "react-router/es";
-import ChainTypes from "../Utility/ChainTypes";
-import BindToChainState from "../Utility/BindToChainState";
-import AssetName from "../Utility/AssetName";
+import ChainTypes from "./ChainTypes";
+import BindToChainState from "./BindToChainState";
+import AssetName from "./AssetName";
 
 class LinkToAssetById extends React.Component {
     static propTypes = {

diff --git a/...mponents/Blockchain/LinkToWitnessById.jsx → app/components/Utility/LinkToWitnessById.jsx b/...mponents/Blockchain/LinkToWitnessById.jsx → app/components/Utility/LinkToWitnessById.jsx
diff --git a/app/components/Utility/TranslateWithLinks.jsx b/app/components/Utility/TranslateWithLinks.jsx
@@ -1,8 +1,8 @@
 import React from "react";
 import counterpart from "counterpart";
 import utils from "common/utils";
-import LinkToAccountById from "../Blockchain/LinkToAccountById";
-import LinkToAssetById from "../Blockchain/LinkToAssetById";
+import LinkToAccountById from "../Utility/LinkToAccountById";
+import LinkToAssetById from "../Utility/LinkToAssetById";
 import {Link} from "react-router/es";
 import FormattedAsset from "../Utility/FormattedAsset";
 import FormattedPrice from "../Utility/FormattedPrice";