Merge pull request bitshares#1310 from gibbsfromncis/450

bitshares#450 Add transaction id to account activity
CryptoBridge · Mar 13, 2018 · 04b92f1 · 04b92f1
2 parents 0c07ccb + 0f51932
commit 04b92f1
Show file tree

Hide file tree

Showing 10 changed files with 30 additions and 0 deletions.
diff --git a/app/assets/locales/locale-de.json b/app/assets/locales/locale-de.json
@@ -119,6 +119,9 @@
     "propose": "vorschlagen",
     "cancel": "abbrechen",
     "account": {
+        "transactions": {
+            "id": "ID"
+        },
         "search": "Search for an account",
         "contacts": "Kontakte",
         "in_open": "This is the amount of %(asset)s you have in open orders.",

diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
@@ -253,6 +253,7 @@
             "blacklist_authorities": "Blacklist authority"
         },
         "transactions": {
+            "id": "ID",
             "type": "Type",
             "info": "Info",
             "time": "Time"

diff --git a/app/assets/locales/locale-es.json b/app/assets/locales/locale-es.json
@@ -168,6 +168,9 @@
     "propose": "Propose",
     "cancel": "Cancel",
     "account": {
+        "transactions": {
+            "id": "ID"
+        },
         "search": "Search for an account",
         "new_user": "Nuevo usuario?",
         "existing_user": "Usuario existente",

diff --git a/app/assets/locales/locale-fr.json b/app/assets/locales/locale-fr.json
@@ -112,6 +112,9 @@
         "done_label": "Fait"
     },
     "account": {
+        "transactions": {
+            "id": "ID"
+        },
         "search": "Search for an account",
         "accounts": "Comptes",
         "contacts": "Contacts",

diff --git a/app/assets/locales/locale-it.json b/app/assets/locales/locale-it.json
@@ -152,6 +152,9 @@
     "propose": "Proponi",
     "cancel": "Annulla",
     "account": {
+        "transactions": {
+            "id": "ID"
+        },
         "search": "Search for an account",
         "new_user": "Nuovo utente?",
         "existing_user": "Utente esistente",

diff --git a/app/assets/locales/locale-ja.json b/app/assets/locales/locale-ja.json
@@ -250,6 +250,7 @@
             "blacklist_authorities": "ブラックリスト権限"
         },
         "transactions": {
+            "id": "ID",
             "type": "種類",
             "info": "情報",
             "time": "時間"

diff --git a/app/assets/locales/locale-ko.json b/app/assets/locales/locale-ko.json
@@ -110,6 +110,9 @@
         "done_label": "완료"
     },
     "account": {
+        "transactions": {
+            "id": "ID"
+        },
         "search": "Search for an account",
         "in_open": "This is the amount of %(asset)s you have in open orders.",
         "in_open_value":

diff --git a/app/assets/locales/locale-zh.json b/app/assets/locales/locale-zh.json
@@ -140,6 +140,9 @@
     "propose": "提议",
     "cancel": "取消",
     "account": {
+        "transactions": {
+            "id": "ID"
+        },
         "search": "Search for an account",
         "new_user": "新用户？",
         "existing_user": "老用户",

diff --git a/app/components/Account/RecentTransactions.jsx b/app/components/Account/RecentTransactions.jsx
@@ -200,6 +200,8 @@ class RecentTransactions extends React.Component {
             .map(o => {
                 return (
                     <Operation
+                        includeOperationId={true}
+                        operationId={o.id}
                         style={alignLeft}
                         key={o.id}
                         op={o.op}
@@ -268,6 +270,7 @@ class RecentTransactions extends React.Component {
                         <table className={"table table-striped " + (compactView ? "compact" : "") + (this.props.dashboard ? " dashboard-table table-hover" : "")}>
                             <thead>
                                 <tr>
+                                    <th className="column-hide-tiny" style={alignLeft}><Translate content="account.transactions.id" /></th>
                                     <th className="column-hide-tiny" style={alignLeft}><Translate content="account.transactions.type" /></th>
                                     <th style={alignLeft}><Translate content="account.transactions.info" /></th>
                                     <th style={alignLeft}><Translate content="account.transactions.time" /></th>

diff --git a/app/components/Blockchain/Operation.jsx b/app/components/Blockchain/Operation.jsx
@@ -98,6 +98,11 @@ class Row extends React.Component {
 
         return (
             <tr>
+                {this.props.includeOperationId ? (
+                    <td style={{textAlign: "left"}}>
+                        {this.props.operationId}
+                    </td>
+                ) : null}
                 {hideOpLabel ? null : (
                     <td
                         style={{textAlign: "left"}}
@@ -1302,6 +1307,8 @@ class Operation extends React.Component {
 
         line = column ? (
             <Row
+                operationId={this.props.operationId}
+                includeOperationId={this.props.includeOperationId}
                 block={block}
                 type={op[0]}
                 color={color}