Add Proposal tab to table view, fix some style issues

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

Hide file tree

Showing 4 changed files with 17 additions and 18 deletions.
diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -346,7 +346,7 @@
     },
     "collaterals": "Margin Positions",
     "eq_value": "Estimated",
-    "no_price": "Unknown value",
+    "no_price": "--",
     "percent": "Percent of total supply",
     "please_create_account": "Please create an account",
     "create_account": "Create account",

diff --git a/app/components/Account/AccountOverview.jsx b/app/components/Account/AccountOverview.jsx
@@ -340,9 +340,9 @@ class AccountOverview extends React.Component {
                 }
             });
 
-            if (balances.length !== currentIndex) {
-                balances.splice(currentIndex + 1, 0, <tr style={{backgroundColor: "transparent"}} key={"hidden_" + currentIndex} ><td style={{height: 20}} colSpan="11"></td></tr>);
-            }
+            // if (balances.length !== currentIndex) {
+            //     balances.splice(currentIndex + 1, 0, <tr style={{backgroundColor: "transparent"}} key={"hidden_" + currentIndex} ><td style={{height: 20}} colSpan="11"></td></tr>);
+            // }
         }
 
         function sortAlphabetic(a, b) {
@@ -607,6 +607,12 @@ class AccountOverview extends React.Component {
                                     dashboard
                                 />
                             </Tab>
+
+                            {account.get("proposals") && account.get("proposals").size ?
+                            <Tab title="explorer.proposals.title" subText={account.get("proposals") ? account.get("proposals").size : 0}>
+
+                                    <Proposals className="dashboard-table" account={account.get("id")}/>
+                            </Tab> : null}
                         </Tabs>
 
 
@@ -615,14 +621,6 @@ class AccountOverview extends React.Component {
                     </div>
                 </div>
 
-                {account.get("proposals") && account.get("proposals").size ?
-                <div className="content-block">
-                    <div className="block-content-header">
-                        <Translate content="explorer.proposals.title" account={account.get("id")} />
-                    </div>
-                    <Proposals account={account.get("id")}/>
-                </div> : null}
-
                 {/* Deposit Modal */}
                 <SimpleDepositWithdraw
                     ref="deposit_modal"

diff --git a/app/components/Account/Proposals.jsx b/app/components/Account/Proposals.jsx
@@ -132,7 +132,7 @@ class Proposals extends Component {
             });
 
         return (
-            <table className={"table compact"}>
+            <table className={"table compact " + this.props.className}>
                 <thead>
                 <tr>
                     <th><Translate content="account.votes.info" /></th>

diff --git a/app/components/Account/RecentTransactions.jsx b/app/components/Account/RecentTransactions.jsx
@@ -213,10 +213,7 @@ class RecentTransactions extends React.Component {
             }) : [<tr key="no_recent"><td colSpan={compactView ? "2" : "3"}><Translate content="operation.no_recent" /></td></tr>];
         display_history.push(
             <tr className="total-value" key="total_value">
-                <td style={alignLeft}>
-                    {this.props.showFilters ? (
-                        <select data-place="left" data-tip={counterpart.translate("tooltip.filter_ops")} style={{paddingTop: 5}} className="bts-select no-margin" value={this.state.filter} onChange={this._onChangeFilter.bind(this)}>{options}</select>
-                    ) : null}
+                <td>
                 </td>
                 <td style={alignRight}>
                     {historyCount > 0 ?
@@ -261,7 +258,11 @@ class RecentTransactions extends React.Component {
                         <table className={"table" + (compactView ? " compact" : "") + (this.props.dashboard ? " dashboard-table" : "")}>
                             <thead>
                                 <tr>
-                                    {compactView ? null : <th style={alignLeft} className="column-hide-tiny"><Translate content="explorer.block.op" /></th>}
+                                    {compactView ? null : <th style={alignLeft} className="column-hide-tiny">
+                                        {this.props.showFilters ? (
+                                            <select data-place="left" data-tip={counterpart.translate("tooltip.filter_ops")} style={{paddingTop: 5, width: "auto"}} className="bts-select no-margin" value={this.state.filter} onChange={this._onChangeFilter.bind(this)}>{options}</select>
+                                        ) : null}
+                                    </th>}
                                     <th style={alignLeft}><Translate content="account.votes.info" /></th>
                                     <th></th>
                                 </tr>